From 3dd99fd1cd4f2f34f63fc95693cb014583c0ac58 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Tue, 13 Sep 2022 22:36:55 +0200 Subject: Fix time in NEI --- src/main/java/kubatech/loaders/MobRecipeLoader.java | 7 +++---- .../GT_MetaTileEntity_ExtremeExterminationChamber.java | 10 +++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java index ed1e55e05b..85702af08a 100644 --- a/src/main/java/kubatech/loaders/MobRecipeLoader.java +++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java @@ -21,7 +21,7 @@ package kubatech.loaders; import static kubatech.api.utils.ModUtils.isClientSided; import static kubatech.api.utils.ModUtils.isDeobfuscatedEnvironment; -import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.MobNameToRecipeMap; +import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.*; import atomicstryker.infernalmobs.common.InfernalMobsCore; import atomicstryker.infernalmobs.common.MobModifier; @@ -207,9 +207,8 @@ public class MobRecipeLoader { if (o.damages != null) for (int v : o.damages.values()) maxdamagechance += v; } mMaxDamageChance = maxdamagechance; - // Powered spawner with octadic capacitor spawns ~22/min ~= 0.366/sec ~= 2.72s/spawn ~= 54.54t/spawn maxEntityHealth = e.getMaxHealth(); - mDuration = 55 + (int) (maxEntityHealth * 10); + mDuration = Math.max(MOB_SPAWN_INTERVAL, (int) ((maxEntityHealth / DIAMOND_SPIKES_DAMAGE) * 10d)); entity = e; } @@ -233,7 +232,7 @@ public class MobRecipeLoader { int lootinglevel, boolean preferInfernalDrops) { MTE.mEUt = mEUt; - MTE.mMaxProgresstime = Math.max(55, (int) ((maxEntityHealth / attackDamage) * 10d)); + MTE.mMaxProgresstime = Math.max(MOB_SPAWN_INTERVAL, (int) ((maxEntityHealth / attackDamage) * 10d)); ArrayList stacks = new ArrayList<>(mOutputs.size()); for (MobDrop o : mOutputs) { int chance = o.chance; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java index f128bb660f..267b1a6ef3 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java @@ -95,6 +95,9 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber implements CustomTileEntityPacketHandler { public static final HashMap MobNameToRecipeMap = new HashMap<>(); + public static final double DIAMOND_SPIKES_DAMAGE = 9d; + // Powered spawner with octadic capacitor spawns ~22/min ~= 0.366/sec ~= 2.72s/spawn ~= 54.54t/spawn + public static final int MOB_SPAWN_INTERVAL = 55; public final Random rand = new FastRandom(); @SuppressWarnings("unused") @@ -474,7 +477,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber this.mOutputFluids = new FluidStack[] {FluidRegistry.getFluidStack("xpjuice", 5000)}; this.mOutputItems = recipe.generateOutputs(rand, this, 3, 0, mIsProducingInfernalDrops); } else { - double attackDamage = 9d; // damage from spikes + double attackDamage = DIAMOND_SPIKES_DAMAGE; // damage from spikes GT_MetaTileEntity_Hatch_InputBus inputbus = this.mInputBusses.size() == 0 ? null : this.mInputBusses.get(0); if (inputbus != null && !isValidMetaTileEntity(inputbus)) inputbus = null; ItemStack lootingholder = inputbus == null ? null : inputbus.getStackInSlot(0); @@ -595,8 +598,9 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber if (weaponCache.isValid) { info.add("Weapon attack damage: " + EnumChatFormatting.YELLOW + weaponCache.attackdamage); info.add("Weapon looting level: " + EnumChatFormatting.YELLOW + weaponCache.looting); - info.add("Total attack damage: " + EnumChatFormatting.YELLOW + (9 + weaponCache.attackdamage)); - } else info.add("Total attack damage: " + EnumChatFormatting.YELLOW + 9); + info.add("Total attack damage: " + EnumChatFormatting.YELLOW + + (DIAMOND_SPIKES_DAMAGE + weaponCache.attackdamage)); + } else info.add("Total attack damage: " + EnumChatFormatting.YELLOW + DIAMOND_SPIKES_DAMAGE); } return info.toArray(new String[0]); } -- cgit