From b62504bb15bf639a250549c932e228083a2357da Mon Sep 17 00:00:00 2001 From: OldSerpskiStalker Date: Sun, 20 Oct 2024 21:46:27 +0500 Subject: [PATCH] Renaming class EntityThrowableWeb --- .../ai/spider/entityaibase/WebAttackTask.java | 5 ++--- .../util/attackweb/WebSlingerCapability.java | 4 ++-- .../gameplay/items/DSCWeb.java | 4 ++-- .../throwingobjects/DSCThrowItemWeb.java} | 17 +++++++---------- .../technical/customlibrary/ObjectHandler.java | 6 +++--- 5 files changed, 16 insertions(+), 20 deletions(-) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{ai/spider/util/attackweb/EntityThrowableWeb.java => gameplay/throwingobjects/DSCThrowItemWeb.java} (88%) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java index e48d3f4..0729325 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java @@ -4,10 +4,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.ai.spider.util.attackweb.EntityThrowableWeb; +import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb; import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; import org.imesense.dynamicspawncontrol.technical.config.spiderattackweb.DataSpiderAttackWeb; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; /** * @@ -86,7 +85,7 @@ public void updateTask() if (this.attackTimer >= DataSpiderAttackWeb.ConfigDataSpiderAttackWeb.instance.getSlingCoolDown()) { - EntityThrowableWeb.sling(world, this.parentEntity); + DSCThrowItemWeb.sling(world, this.parentEntity); double coolDown = DataSpiderAttackWeb.ConfigDataSpiderAttackWeb.instance.getSlingCoolDown() + diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java index 5926286..085848e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java @@ -18,8 +18,8 @@ import org.imesense.dynamicspawncontrol.ProjectStructure; import org.imesense.dynamicspawncontrol.ai.spider.entityaibase.WebAttackTask; import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb; import org.imesense.dynamicspawncontrol.technical.config.spiderattackweb.DataSpiderAttackWeb; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.customlibrary.thing.EntityThingBase; import org.imesense.dynamicspawncontrol.technical.customlibrary.thing.IThingBase; @@ -191,7 +191,7 @@ private static void tryAttack(Entity immediateSource, Entity source, Entity targ } BlockPos pos = new BlockPos(target.posX, target.posY, target.posZ); - EntityThrowableWeb.onHit(world, pos, source, target); + DSCThrowItemWeb.onHit(world, pos, source, target); } } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCWeb.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCWeb.java index b9c5897..75233ec 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCWeb.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCWeb.java @@ -9,7 +9,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.ai.spider.util.attackweb.EntityThrowableWeb; +import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb; import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; import org.imesense.dynamicspawncontrol.technical.customlibrary.ObjectHandler; @@ -51,7 +51,7 @@ public ActionResult onItemRightClick(@Nonnull World worldIn, EntityPl itemstack.shrink(1); } - EntityThrowableWeb.sling(worldIn, playerIn); + DSCThrowItemWeb.sling(worldIn, playerIn); playerIn.addStat(Objects.requireNonNull(StatList.getObjectUseStats(this))); return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/EntityThrowableWeb.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobjects/DSCThrowItemWeb.java similarity index 88% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/EntityThrowableWeb.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobjects/DSCThrowItemWeb.java index 654681d..5ad619c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/EntityThrowableWeb.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobjects/DSCThrowItemWeb.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.ai.spider.util.attackweb; +package org.imesense.dynamicspawncontrol.gameplay.throwingobjects; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -13,19 +13,16 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; import org.imesense.dynamicspawncontrol.technical.config.spiderattackweb.DataSpiderAttackWeb; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.customlibrary.ObjectHandler; import org.imesense.dynamicspawncontrol.technical.network.PlayerInWebMessage; /** * */ -public final class EntityThrowableWeb extends EntityThrowable +public final class DSCThrowItemWeb extends EntityThrowable { /** * @@ -36,7 +33,7 @@ public final class EntityThrowableWeb extends EntityThrowable * * @param worldIn */ - public EntityThrowableWeb(World worldIn) + public DSCThrowItemWeb(World worldIn) { super(worldIn); @@ -48,7 +45,7 @@ public EntityThrowableWeb(World worldIn) * @param worldIn * @param throwerIn */ - public EntityThrowableWeb(World worldIn, EntityLivingBase throwerIn) + public DSCThrowItemWeb(World worldIn, EntityLivingBase throwerIn) { super(worldIn, throwerIn); @@ -112,16 +109,16 @@ protected void onImpact(RayTraceResult result) * @param entityIn * @return */ - public static EntityThrowableWeb sling(World worldIn, EntityLivingBase entityIn) + public static DSCThrowItemWeb sling(World worldIn, EntityLivingBase entityIn) { - EntityThrowableWeb entity = null; + DSCThrowItemWeb entity = null; float pitch = 1.0f / (entityIn.getRNG().nextFloat() * 0.4f + 0.8f); entityIn.playSound(ObjectHandler.WEBBING_SHOOT, 1.0f, pitch); if (!worldIn.isRemote) { - entity = new EntityThrowableWeb(worldIn, entityIn); + entity = new DSCThrowItemWeb(worldIn, entityIn); Float inaccuracy = DataSpiderAttackWeb.ConfigDataSpiderAttackWeb.instance.getSlingInaccuracy(); entity.shoot(entityIn, entityIn.rotationPitch, entityIn.rotationYaw, 0.0f, 1.1f, inaccuracy); worldIn.spawnEntity(entity); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ObjectHandler.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ObjectHandler.java index 99442fe..f0b0777 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ObjectHandler.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ObjectHandler.java @@ -18,7 +18,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.registries.IForgeRegistry; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.ai.spider.util.attackweb.EntityThrowableWeb; +import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb; import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; import org.imesense.dynamicspawncontrol.gameplay.items.DSCWeb; import org.imesense.dynamicspawncontrol.technical.customlibrary.registrationhelpers.RegistrationHelpers; @@ -89,7 +89,7 @@ public static void registerRenders(ModelRegistryEvent event) { registerRender(ObjectHandler.webbing); - RenderingRegistry.registerEntityRenderingHandler(EntityThrowableWeb.class, (manager) -> + RenderingRegistry.registerEntityRenderingHandler(DSCThrowItemWeb.class, (manager) -> new RenderSnowball<>(manager, ObjectHandler.webbing, Minecraft.getMinecraft().getRenderItem())); } @@ -110,7 +110,7 @@ public static void entityRegistration(Register event) protected static void registerEntity(IForgeRegistry registry) { EntityEntry entry = - EntityEntryBuilder.create().entity(EntityThrowableWeb.class).id( + EntityEntryBuilder.create().entity(DSCThrowItemWeb.class).id( new ResourceLocation("dynamicspawncontrol", "webbing"), ObjectHandler.entityID++).name("webbing").tracker(64, 10, true).build();