From 50bd69020437d9c8178f239633b18b98698ca0b9 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Mon, 13 Feb 2023 16:34:38 +0100 Subject: [PATCH] Revert signature changes of public methods that caused crashes (#74) * restore previous public method signature to prevent crash * don't register the event if vanilla config * revert signature changes * Restore original calculation logic --------- Co-authored-by: OneEyeMaker --- src/main/java/tconstruct/TConstruct.java | 6 +++--- .../java/tconstruct/library/tools/AbilityHelper.java | 12 ++++++------ .../java/tconstruct/tools/entity/DaggerEntity.java | 2 +- .../java/tconstruct/util/config/PHConstruct.java | 5 +++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 19d678a1..048644d4 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -185,7 +185,9 @@ public class TConstruct { MinecraftForge.EVENT_BUS.register(playerTracker); NetworkRegistry.INSTANCE.registerGuiHandler(TConstruct.instance, proxy); - if (PHConstruct.globalDespawn != 6000) MinecraftForge.EVENT_BUS.register(new Spawntercepter()); + if (PHConstruct.globalDespawn != 6000 && PHConstruct.globalDespawn != 0) { + MinecraftForge.EVENT_BUS.register(new Spawntercepter()); + } pulsar.preInit(event); @@ -286,8 +288,6 @@ public class TConstruct { @SubscribeEvent public void onEntitySpawn(EntityJoinWorldEvent event) { - // return if config is zero to keep vanilla functionality - if (PHConstruct.globalDespawn == 0) return; if (event.entity instanceof EntityItem) { EntityItem ourGuy = (EntityItem) event.entity; if (ourGuy.lifespan == 6000) { diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 9b9fc8af..3820cc7f 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -62,7 +62,7 @@ public class AbilityHelper { } public static boolean onLeftClickEntity(ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool, - double damageFactor) { + int baseDamage) { if (entity != null && player != null && entity.canAttackWithItem() && stack.hasTagCompound()) { if (!entity.hitByEntity(player)) // can't attack this entity { @@ -75,8 +75,8 @@ public class AbilityHelper { float stoneboundDamage = (float) Math.log(durability / 72f + 1) * -2 * stonebound; - int damage = calcDamage(player, entity, stack, tool, toolTags, damageFactor); - float knockback = calcKnockback(player, entity, stack, tool, toolTags); + int damage = calcDamage(player, entity, stack, tool, toolTags, baseDamage); + float knockback = calcKnockback(player, entity, stack, tool, toolTags, baseDamage); float enchantDamage = 0; @@ -196,7 +196,7 @@ public class AbilityHelper { } public static int calcDamage(Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, - double damageFactor) { + int baseDamage) { EntityLivingBase living = user instanceof EntityLivingBase ? (EntityLivingBase) user : null; int damage = toolTags.getInteger("Attack"); @@ -241,13 +241,13 @@ public class AbilityHelper { } damage += modDamage; - damage *= damageFactor; + damage += baseDamage; return damage; } public static float calcKnockback(Entity user, Entity entity, ItemStack stack, ToolCore tool, - NBTTagCompound toolTags) { + NBTTagCompound toolTags, int baseDamage) { if (user == null) return 0; float knockback = 0; diff --git a/src/main/java/tconstruct/tools/entity/DaggerEntity.java b/src/main/java/tconstruct/tools/entity/DaggerEntity.java index 4031dd8b..04d9bec5 100644 --- a/src/main/java/tconstruct/tools/entity/DaggerEntity.java +++ b/src/main/java/tconstruct/tools/entity/DaggerEntity.java @@ -60,7 +60,7 @@ public class DaggerEntity extends ProjectileBase { (EntityPlayer) shootingEntity, movingobjectposition.entityHit, (ToolCore) returnStack.getItem(), - PHConstruct.daggerThrowMultiplier); + PHConstruct.daggerAdditionalThrowDamage); // super.onHitEntity(movingobjectposition); } diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index a8b5fe2e..0ac2db7c 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -78,7 +78,8 @@ public class PHConstruct { 0, "Changes the despawn time of all items, 0 is vanilla behavior").getInt(0); dropCanisters = config.get("Difficulty Changes", "Drop heart canisters on death", false).getBoolean(false); - daggerThrowMultiplier = config.get("Difficulty Changes", "Thrown dagger output multiplier", 1).getDouble(1); + daggerAdditionalThrowDamage = config.get("Difficulty Changes", "Additional throw damage of dagger", 0) + .getInt(0); naturalSlimeSpawn = config.get("Mobs", "Blue Slime spawn chance", 1, "Set to 0 to disable").getInt(1); @@ -438,7 +439,7 @@ public class PHConstruct { public static boolean indestructible; public static int globalDespawn; public static boolean dropCanisters; - public static double daggerThrowMultiplier; + public static int daggerAdditionalThrowDamage; // Smeltery Output Modification public static double ingotsPerOre;