diff options
author | boubou19 <miisterunknown@gmail.com> | 2024-09-19 22:21:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-19 20:21:11 +0000 |
commit | 0a5c7ecc004444a089edbed28f4ecb136bc21f1f (patch) | |
tree | 34412bd3edef575d1564a452515bf9e40fa16a27 /src/main/java/tectech/thing | |
parent | f4abde3ab05502b587ce114837459e3d1eca3e5f (diff) | |
download | GT5-Unofficial-0a5c7ecc004444a089edbed28f4ecb136bc21f1f.tar.gz GT5-Unofficial-0a5c7ecc004444a089edbed28f4ecb136bc21f1f.tar.bz2 GT5-Unofficial-0a5c7ecc004444a089edbed28f4ecb136bc21f1f.zip |
TecTech config migration to GTNHLib (#3207)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/tectech/thing')
8 files changed, 59 insertions, 154 deletions
diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java index d3cfb21c29..e226162312 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java @@ -29,7 +29,7 @@ import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.objects.GTRenderedTexture; import tectech.Reference; import tectech.TecTech; -import tectech.loader.TecTechConfig; +import tectech.loader.ConfigHandler; import tectech.util.CommonValues; import tectech.util.TTUtility; @@ -220,7 +220,7 @@ public class MTEHatchCapacitor extends MTEHatch implements IAddUIWidgets { this.current = current; this.energyMax = energyMax; componentBinds.put(unlocalizedName, this); - if (TecTechConfig.DEBUG_MODE) { + if (ConfigHandler.debug.DEBUG_MODE) { TecTech.LOGGER.info("Tesla Capacitor registered: " + unlocalizedName); } } diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java index 03e11cc4f1..0d98f12742 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java @@ -41,7 +41,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.objects.GTRenderedTexture; import tectech.TecTech; -import tectech.loader.TecTechConfig; +import tectech.loader.ConfigHandler; import tectech.thing.gui.TecTechUITextures; import tectech.util.CommonValues; import tectech.util.TTUtility; @@ -391,7 +391,7 @@ public class MTEHatchRack extends MTEHatch implements IAddGregtechLogo, IAddUIWi this.maxHeat = maxHeat; this.subZero = subZero; componentBinds.put(unlocalizedName, this); - if (TecTechConfig.DEBUG_MODE) { + if (ConfigHandler.debug.DEBUG_MODE) { TecTech.LOGGER.info("Component registered: " + unlocalizedName); } } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java index b52069fe96..cdc4b07a56 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java @@ -32,7 +32,7 @@ import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import tectech.Reference; import tectech.TecTech; -import tectech.loader.TecTechConfig; +import tectech.loader.ConfigHandler; import tectech.thing.casing.BlockGTCasingsTT; import tectech.thing.casing.TTCasingsContainer; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; @@ -120,7 +120,7 @@ public class MTEEnergyInfuser extends TTMultiblockBase implements IConstructable } return remove; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) { + if (ConfigHandler.debug.DEBUG_MODE) { e.printStackTrace(); } } @@ -139,7 +139,7 @@ public class MTEEnergyInfuser extends TTMultiblockBase implements IConstructable } return RF; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) { + if (ConfigHandler.debug.DEBUG_MODE) { e.printStackTrace(); } } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java index d55bf32e90..4ced494b05 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java @@ -100,7 +100,7 @@ import gregtech.common.tileentities.machines.MTEHatchInputBusME; import gregtech.common.tileentities.machines.MTEHatchInputME; import gregtech.common.tileentities.machines.MTEHatchOutputBusME; import tectech.TecTech; -import tectech.loader.TecTechConfig; +import tectech.loader.ConfigHandler; import tectech.thing.block.BlockGodforgeGlass; import tectech.thing.block.TileEntityForgeOfGods; import tectech.thing.gui.TecTechUITextures; @@ -183,8 +183,6 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, private static final ItemStack STELLAR_FUEL = Avaritia.isModLoaded() ? getModItem(Avaritia.ID, "Resource", 1, 8) : GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 1); - private final boolean debugMode = TecTechConfig.DEBUG_MODE; - public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) { int realBudget = elementBudget >= 1000 ? elementBudget : Math.min(1000, elementBudget * 5); // 1000 blocks max per placement. @@ -489,7 +487,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, determineCompositionMilestoneLevel(); checkInversionStatus(); determineMilestoneProgress(); - if (!debugMode) { + if (!ConfigHandler.debug.DEBUG_MODE) { determineGravitonShardAmount(); } if (upgrades[30] && gravitonShardEjection) { @@ -703,7 +701,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, @Override public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (!debugMode) return; + if (!ConfigHandler.debug.DEBUG_MODE) return; if (isRenderActive) { destroyRenderer(); isRenderActive = false; @@ -1880,7 +1878,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, } }) .setPos(282, 4)); - if (debugMode) { + if (ConfigHandler.debug.DEBUG_MODE) { builder.widget(new MultiChildWidget().addChild(new ButtonWidget().setOnClick((clickData, widget) -> { upgrades = new boolean[31]; materialPaidUpgrades = new boolean[7]; diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java index fc160411e4..b47a755203 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java @@ -61,7 +61,7 @@ import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.util.IGTHatchAdder; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReason; -import tectech.TecTech; +import tectech.loader.ConfigHandler; import tectech.loader.NetworkDispatcher; import tectech.mechanics.spark.RendererMessage; import tectech.mechanics.spark.ThaumSpark; @@ -90,32 +90,6 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc private final HashSet<ThaumSpark> sparkList = new HashSet<>(); private int sparkCount = 10; - // region variables - private static final int transferRadiusTowerFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_TOWER; // Default - // is 32 - private static final int transferRadiusTransceiverFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_TRANSCEIVER; // Default - // is - // 16 - private static final int transferRadiusCoverUltimateFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_COVER; // Default - // is - // 16 - private static final int plasmaRangeMultiT1 = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1; // Default - // is 2 - private static final int plasmaRangeMultiT2 = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2; // Default - // is 4 - private static final int heliumUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM; // Default is - // 100 - private static final int nitrogenUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN; // Default - // is 50 - private static final int radonUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON; // Default is 50 - private static final boolean visualEffect = TecTech.configTecTech.TESLA_VISUAL_EFFECT; // Default is true - // Default is {1, 1, 1} - private static final int[] plasmaTierLoss = new int[] { TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T0, - TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T1, TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T2 }; - private static final float overDriveLoss = TecTech.configTecTech.TESLA_MULTI_LOSS_FACTOR_OVERDRIVE; // Default is - // 0.25F; - private static final boolean doFluidOutput = TecTech.configTecTech.TESLA_MULTI_GAS_OUTPUT; // Default is false - // Face icons private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; @@ -295,8 +269,8 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc if (Double.isNaN(value)) return LedStatus.STATUS_WRONG; value = (int) value; if (value < 0) return LedStatus.STATUS_TOO_LOW; - if (value > transferRadiusTowerFromConfig) return LedStatus.STATUS_HIGH; - if (value < transferRadiusTowerFromConfig) return LedStatus.STATUS_LOW; + if (value > ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_TOWER) return LedStatus.STATUS_HIGH; + if (value < ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_TOWER) return LedStatus.STATUS_LOW; return LedStatus.STATUS_OK; }; private static final IStatusFunction<MTETeslaTower> TRANSFER_RADIUS_TRANSCEIVER_STATUS = (base, p) -> { @@ -304,8 +278,8 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc if (Double.isNaN(value)) return LedStatus.STATUS_WRONG; value = (int) value; if (value < 0) return LedStatus.STATUS_TOO_LOW; - if (value > transferRadiusTransceiverFromConfig) return LedStatus.STATUS_HIGH; - if (value < transferRadiusTransceiverFromConfig) return LedStatus.STATUS_LOW; + if (value > ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_TRANSCEIVER) return LedStatus.STATUS_HIGH; + if (value < ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_TRANSCEIVER) return LedStatus.STATUS_LOW; return LedStatus.STATUS_OK; }; private static final IStatusFunction<MTETeslaTower> TRANSFER_RADIUS_COVER_ULTIMATE_STATUS = (base, p) -> { @@ -313,8 +287,8 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc if (Double.isNaN(value)) return LedStatus.STATUS_WRONG; value = (int) value; if (value < 0) return LedStatus.STATUS_TOO_LOW; - if (value > transferRadiusCoverUltimateFromConfig) return LedStatus.STATUS_HIGH; - if (value < transferRadiusCoverUltimateFromConfig) return LedStatus.STATUS_LOW; + if (value > ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_COVER) return LedStatus.STATUS_HIGH; + if (value < ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_COVER) return LedStatus.STATUS_LOW; return LedStatus.STATUS_OK; }; private static final IStatusFunction<MTETeslaTower> OUTPUT_VOLTAGE_OR_CURRENT_STATUS = (base, p) -> { @@ -394,10 +368,10 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc int plasmaBoost; switch (plasmaTier) { case 2: - plasmaBoost = plasmaRangeMultiT2; + plasmaBoost = ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2; break; case 1: - plasmaBoost = plasmaRangeMultiT1; + plasmaBoost = ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1; break; default: plasmaBoost = 1; @@ -421,27 +395,24 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc for (MTEHatchInput fluidHatch : mInputHatches) { if (fluidHatch.mFluid != null) { if (fluidHatch.mFluid.isFluidEqual(Materials.Helium.getPlasma(1)) - && fluidHatch.mFluid.amount >= heliumUse) { - fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - heliumUse; - if (doFluidOutput) { - mOutputFluidsQueue = new FluidStack[] { Materials.Helium.getGas(heliumUse) }; - } + && fluidHatch.mFluid.amount >= ConfigHandler.TeslaTweaks.TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM) { + fluidHatch.mFluid.amount = fluidHatch.mFluid.amount + - ConfigHandler.TeslaTweaks.TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM; + plasmaTier = 1; return; - } else if (fluidHatch.mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) - && fluidHatch.mFluid.amount >= nitrogenUse) { - fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - nitrogenUse; - if (doFluidOutput) { - mOutputFluidsQueue = new FluidStack[] { Materials.Nitrogen.getGas(nitrogenUse) }; - } + } else if (fluidHatch.mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && fluidHatch.mFluid.amount + >= ConfigHandler.TeslaTweaks.TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN) { + fluidHatch.mFluid.amount = fluidHatch.mFluid.amount + - ConfigHandler.TeslaTweaks.TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN; + plasmaTier = 1; return; - } else if (fluidHatch.mFluid.isFluidEqual(Materials.Radon.getPlasma(1)) - && fluidHatch.mFluid.amount >= radonUse) { - fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - radonUse; - if (doFluidOutput) { - mOutputFluidsQueue = new FluidStack[] { Materials.Radon.getGas(radonUse) }; - } + } else if (fluidHatch.mFluid.isFluidEqual(Materials.Radon.getPlasma(1)) && fluidHatch.mFluid.amount + >= ConfigHandler.TeslaTweaks.TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON) { + fluidHatch.mFluid.amount = fluidHatch.mFluid.amount + - ConfigHandler.TeslaTweaks.TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON; + plasmaTier = 2; return; } @@ -653,18 +624,18 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc popogaSetting = hatch_1.makeInParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); transferRadiusTowerSetting = hatch_2.makeInParameter( 0, - transferRadiusTowerFromConfig, + ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_TOWER, TRANSFER_RADIUS_TOWER_SETTING_NAME, TRANSFER_RADIUS_TOWER_STATUS); popogaSetting = hatch_2.makeInParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); transferRadiusTransceiverSetting = hatch_3.makeInParameter( 0, - transferRadiusTransceiverFromConfig, + ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_TRANSCEIVER, TRANSFER_RADIUS_TRANSCEIVER_SETTING_NAME, TRANSFER_RADIUS_TRANSCEIVER_STATUS); transferRadiusCoverUltimateSetting = hatch_3.makeInParameter( 1, - transferRadiusCoverUltimateFromConfig, + ConfigHandler.TeslaTweaks.TESLA_MULTI_RANGE_COVER, TRANSFER_RADIUS_COVER_ULTIMATE_SETTING_NAME, TRANSFER_RADIUS_COVER_ULTIMATE_STATUS); outputVoltageSetting = hatch_4 @@ -775,7 +746,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc outputMaxDisplay.set(Math.max(outputCurrentDisplay.get(), outputMaxDisplay.get())); // TODO Encapsulate the spark sender sparkCount--; - if (sparkCount == 0 && visualEffect) { + if (sparkCount == 0 && ConfigHandler.teslaTweaks.TESLA_VISUAL_EFFECT) { IGregTechTileEntity mte = getBaseMetaTileEntity(); sparkCount = 10; if (!sparkList.isEmpty()) { @@ -910,12 +881,18 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc @Override public int getTeslaEnergyLossPerBlock() { - return plasmaTierLoss[plasmaTier]; + + return switch (plasmaTier) { + case 0 -> ConfigHandler.TeslaTweaks.TESLA_MULTI_LOSS_PER_BLOCK_T0; + case 1 -> ConfigHandler.TeslaTweaks.TESLA_MULTI_LOSS_PER_BLOCK_T1; + case 2 -> ConfigHandler.TeslaTweaks.TESLA_MULTI_LOSS_PER_BLOCK_T2; + default -> throw new IllegalStateException(); + }; } @Override public float getTeslaOverdriveLossCoefficient() { - return overDriveLoss; + return ConfigHandler.TeslaTweaks.TESLA_MULTI_LOSS_FACTOR_OVERDRIVE; } @Override diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index 2a0c10f303..fdc3f9f826 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -33,7 +33,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; import org.lwjgl.opengl.GL11; -import com.google.common.collect.Iterables; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.IAlignment; import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider; @@ -69,7 +68,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.modularui.IBindPlayerInventoryUI; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.BaseTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.metatileentity.implementations.MTEHatchDynamo; @@ -89,11 +87,10 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReason; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gregtech.api.util.shutdown.SimpleShutDownReason; -import gregtech.common.Pollution; import gregtech.common.tileentities.machines.IDualInputHatch; import tectech.Reference; import tectech.TecTech; -import tectech.loader.TecTechConfig; +import tectech.loader.ConfigHandler; import tectech.thing.gui.TecTechUITextures; import tectech.thing.metaTileEntity.hatch.MTEHatchDataConnector; import tectech.thing.metaTileEntity.hatch.MTEHatchDataInput; @@ -566,7 +563,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT explodeMultiblock(); } } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) { + if (ConfigHandler.debug.DEBUG_MODE) { e.printStackTrace(); } } @@ -1490,9 +1487,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT if (allowProduction && euFlow > 0) { addEnergyOutput_EM(getPowerFlow() * (long) mEfficiency / getMaxEfficiency(aStack), eAmpereFlow); } else if (euFlow < 0) { - if (TecTechConfig.POWERLESS_MODE) { - return true; - } if (!drainEnergyInput_EM( getPowerFlow(), getPowerFlow() * getMaxEfficiency(aStack) / Math.max(1000L, mEfficiency), @@ -1509,9 +1503,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT if (allowProduction && euFlow > 0) { addEnergyOutput_EM(getPowerFlow() * (long) mEfficiency / getMaxEfficiency(aStack), eAmpereFlow); } else if (euFlow < 0) { - if (TecTechConfig.POWERLESS_MODE) { - return true; - } if (!drainEnergyInput( getPowerFlow() * getMaxEfficiency(aStack) / Math.max(1000L, mEfficiency), eAmpereFlow)) { @@ -1625,7 +1616,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT // - 1) / maxEUinputMin // + 1 = 1! //if // not too much A - if (TecTechConfig.DEBUG_MODE) { + if (ConfigHandler.debug.DEBUG_MODE) { TecTech.LOGGER.debug("L1 " + EUuse + ' ' + getEUVar() + ' ' + (EUuse > getEUVar())); TecTech.LOGGER.debug("L2 " + EUtEffective + ' ' + maxEUinputMax + ' ' + (EUtEffective > maxEUinputMax)); TecTech.LOGGER.debug("L3 " + Amperes + ' ' + getMaxInputEnergy()); @@ -1748,70 +1739,13 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT return false; } + // empty body to prevent any explosion @Override - public final void explodeMultiblock() { - if (explodedThisTick) { - return; - } - explodedThisTick = true; - if (!TecTech.configTecTech.BOOM_ENABLE) { - TecTech.proxy.broadcast( - "Multi Explode BOOM! " + getBaseMetaTileEntity().getXCoord() - + ' ' - + getBaseMetaTileEntity().getYCoord() - + ' ' - + getBaseMetaTileEntity().getZCoord()); - StackTraceElement[] ste = Thread.currentThread() - .getStackTrace(); - TecTech.proxy.broadcast("Multi Explode BOOM! " + ste[2].toString()); - return; - } - extraExplosions_EM(); - Pollution.addPollution(getBaseMetaTileEntity(), 600000); - mInventory[1] = null; - @SuppressWarnings("unchecked") - Iterable<MetaTileEntity> allHatches = Iterables.concat( - mInputBusses, - mOutputBusses, - mInputHatches, - mOutputHatches, - mDynamoHatches, - mMufflerHatches, - mEnergyHatches, - mMaintenanceHatches, - eParamHatches, - eEnergyMulti, - eUncertainHatches, - eDynamoMulti, - eInputData, - eOutputData); - for (MetaTileEntity tTileEntity : allHatches) { - if (tTileEntity != null && tTileEntity.getBaseMetaTileEntity() != null) { - tTileEntity.getBaseMetaTileEntity() - .doExplosion(V[9]); - } - } - getBaseMetaTileEntity().doExplosion(V[15]); - } + public final void explodeMultiblock() {} + // empty body to prevent any explosion @Override - public void doExplosion(long aExplosionPower) { - if (!TecTech.configTecTech.BOOM_ENABLE) { - TecTech.proxy.broadcast( - "Multi DoExplosion BOOM! " + getBaseMetaTileEntity().getXCoord() - + ' ' - + getBaseMetaTileEntity().getYCoord() - + ' ' - + getBaseMetaTileEntity().getZCoord()); - StackTraceElement[] ste = Thread.currentThread() - .getStackTrace(); - TecTech.proxy.broadcast("Multi DoExplosion BOOM! " + ste[2].toString()); - return; - } - explodeMultiblock(); - super.doExplosion(aExplosionPower); - } // Redirecting to explodemultiblock - // endregion + public void doExplosion(long aExplosionPower) {} // region adder methods @Override diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java index e0c2e8965c..8a66736726 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java @@ -43,7 +43,7 @@ import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; -import tectech.loader.TecTechConfig; +import tectech.loader.ConfigHandler; import tectech.recipe.TecTechRecipeMaps; import tectech.util.CommonValues; @@ -51,7 +51,6 @@ public class MTEPlasmaModule extends MTEBaseModule { private long EUt = 0; private int currentParallel = 0; - private boolean debug = TecTechConfig.DEBUG_MODE; private int inputMaxParallel = 0; public MTEPlasmaModule(int aID, String aName, String aNameRegional) { @@ -126,7 +125,7 @@ public class MTEPlasmaModule extends MTEBaseModule { @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); - if (debug) { + if (ConfigHandler.debug.DEBUG_MODE) { builder.widget(createTestButton(builder)) .widget(createTestButton2()) .widget(createTestButton3()); diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTETeslaCoil.java b/src/main/java/tectech/thing/metaTileEntity/single/MTETeslaCoil.java index b053cd656c..c5db932041 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTETeslaCoil.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTETeslaCoil.java @@ -27,7 +27,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTEBasicBatteryBuffer; -import tectech.TecTech; +import tectech.loader.ConfigHandler; import tectech.loader.NetworkDispatcher; import tectech.mechanics.spark.RendererMessage; import tectech.mechanics.spark.ThaumSpark; @@ -46,10 +46,7 @@ public class MTETeslaCoil extends MTEBasicBatteryBuffer implements ITeslaConnect private final HashSet<ThaumSpark> sparkList = new HashSet<>(); private int sparkCount = 10; - private static final int transferRadiusMax = TecTech.configTecTech.TESLA_SINGLE_RANGE; // Default is 20 - private static final int perBlockLoss = TecTech.configTecTech.TESLA_SINGLE_LOSS_PER_BLOCK; // Default is 1 - private static final float overDriveLoss = TecTech.configTecTech.TESLA_SINGLE_LOSS_FACTOR_OVERDRIVE; // Default is - // 0.25F + private static final int transferRadiusMax = ConfigHandler.TeslaTweaks.TESLA_SINGLE_RANGE; private static final int transferRadiusMin = 4; // Minimum user configurable private int transferRadius = transferRadiusMax; // Default transferRadius setting @@ -333,12 +330,12 @@ public class MTETeslaCoil extends MTEBasicBatteryBuffer implements ITeslaConnect @Override public int getTeslaEnergyLossPerBlock() { - return perBlockLoss; + return ConfigHandler.TeslaTweaks.TESLA_SINGLE_LOSS_PER_BLOCK; } @Override public float getTeslaOverdriveLossCoefficient() { - return overDriveLoss; + return ConfigHandler.TeslaTweaks.TESLA_SINGLE_LOSS_FACTOR_OVERDRIVE; } @Override |