diff options
author | glowredman <35727266+glowredman@users.noreply.github.com> | 2023-04-18 21:38:23 +0200 |
---|---|---|
committer | glowredman <35727266+glowredman@users.noreply.github.com> | 2023-04-18 21:38:23 +0200 |
commit | add08df72fecfd3752ab542772929d243e673ba4 (patch) | |
tree | 3100bf54c0480e9f844d411f122d2f171612e8bf /src/main | |
parent | 516d886ab1824a568c8b56e437b5e29917926919 (diff) | |
download | GT5-Unofficial-add08df72fecfd3752ab542772929d243e673ba4.tar.gz GT5-Unofficial-add08df72fecfd3752ab542772929d243e673ba4.tar.bz2 GT5-Unofficial-add08df72fecfd3752ab542772929d243e673ba4.zip |
Remove dead code
Diffstat (limited to 'src/main')
12 files changed, 3 insertions, 240 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java index 26e70e095b..3e2181d041 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java @@ -32,10 +32,6 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate { this(true, new EMConstantStackMap(aspects)); } - private EMComplexAspectDefinition(boolean check, EMDefinitionStack... aspects) throws EMException { - this(check, new EMConstantStackMap(aspects)); - } - public EMComplexAspectDefinition(EMConstantStackMap aspects) throws EMException { this(true, aspects); } diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 61336f0c51..4fcfd42b05 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -9,9 +9,6 @@ import static com.github.technus.tectech.TecTech.proxy; import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat; import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; -import static gregtech.api.enums.GT_Values.W; -import static gregtech.api.enums.Mods.ElectroMagicTools; -import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TwilightForest; @@ -20,7 +17,6 @@ import java.util.Collection; import java.util.HashMap; import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -49,7 +45,6 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -167,78 +162,6 @@ public final class MainLoader { ProgressManager.pop(progressBarPostLoad); } - private static void registerExtraHazmats() { - ItemStack EMT_iqC = GT_ModHandler.getModItem(ElectroMagicTools.ID, "itemArmorQuantumChestplate", 1, W); - ItemStack GRAVI_gC = GT_ModHandler.getModItem(GraviSuite.ID, "graviChestPlate", 1, W); - ItemStack GRAVI_anC = GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, W); - - ItemStack IC2_qH = GT_ModHandler.getIC2Item("quantumHelmet", 1L, W); - ItemStack IC2_qC = GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, W); - ItemStack IC2_qL = GT_ModHandler.getIC2Item("quantumLeggings", 1L, W); - ItemStack IC2_qB = GT_ModHandler.getIC2Item("quantumBoots", 1L, W); - - ItemStack IC2_nH = GT_ModHandler.getIC2Item("nanoHelmet", 1L, W); - ItemStack IC2_nC = GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, W); - ItemStack IC2_nL = GT_ModHandler.getIC2Item("nanoLeggings", 1L, W); - ItemStack IC2_nB = GT_ModHandler.getIC2Item("nanoBoots", 1L, W); - - GregTech_API.sFrostHazmatList.add(EMT_iqC); - GregTech_API.sFrostHazmatList.add(GRAVI_gC); - GregTech_API.sFrostHazmatList.add(IC2_qH); - GregTech_API.sFrostHazmatList.add(IC2_qC); - GregTech_API.sFrostHazmatList.add(IC2_qL); - GregTech_API.sFrostHazmatList.add(IC2_qB); - - GregTech_API.sHeatHazmatList.add(EMT_iqC); - GregTech_API.sHeatHazmatList.add(GRAVI_gC); - GregTech_API.sHeatHazmatList.add(IC2_qH); - GregTech_API.sHeatHazmatList.add(IC2_qC); - GregTech_API.sHeatHazmatList.add(IC2_qL); - GregTech_API.sHeatHazmatList.add(IC2_qB); - - GregTech_API.sBioHazmatList.add(EMT_iqC); - GregTech_API.sBioHazmatList.add(GRAVI_gC); - GregTech_API.sBioHazmatList.add(IC2_qH); - GregTech_API.sBioHazmatList.add(IC2_qC); - GregTech_API.sBioHazmatList.add(IC2_qL); - GregTech_API.sBioHazmatList.add(IC2_qB); - - GregTech_API.sBioHazmatList.add(GRAVI_anC); - GregTech_API.sBioHazmatList.add(IC2_nH); - GregTech_API.sBioHazmatList.add(IC2_nC); - GregTech_API.sBioHazmatList.add(IC2_nL); - GregTech_API.sBioHazmatList.add(IC2_nB); - - GregTech_API.sGasHazmatList.add(EMT_iqC); - GregTech_API.sGasHazmatList.add(GRAVI_gC); - GregTech_API.sGasHazmatList.add(IC2_qH); - GregTech_API.sGasHazmatList.add(IC2_qC); - GregTech_API.sGasHazmatList.add(IC2_qL); - GregTech_API.sGasHazmatList.add(IC2_qB); - - GregTech_API.sGasHazmatList.add(GRAVI_anC); - GregTech_API.sGasHazmatList.add(IC2_nH); - GregTech_API.sGasHazmatList.add(IC2_nC); - GregTech_API.sGasHazmatList.add(IC2_nL); - GregTech_API.sGasHazmatList.add(IC2_nB); - - GregTech_API.sRadioHazmatList.add(EMT_iqC); - GregTech_API.sRadioHazmatList.add(GRAVI_gC); - GregTech_API.sRadioHazmatList.add(IC2_qH); - GregTech_API.sRadioHazmatList.add(IC2_qC); - GregTech_API.sRadioHazmatList.add(IC2_qL); - GregTech_API.sRadioHazmatList.add(IC2_qB); - - GregTech_API.sElectroHazmatList.add(EMT_iqC); - GregTech_API.sElectroHazmatList.add(GRAVI_gC); - GregTech_API.sElectroHazmatList.add(IC2_qH); - GregTech_API.sElectroHazmatList.add(IC2_qC); - GregTech_API.sElectroHazmatList.add(IC2_qL); - GregTech_API.sElectroHazmatList.add(IC2_qB); - - // todo add GC GS stuff - } - public static void addAfterGregTechPostLoadRunner() { GregTech_API.sAfterGTPostload.add(() -> { if (TecTech.configTecTech.NERF_FUSION) { diff --git a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java index 637ac7b181..0768592d03 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java @@ -1,9 +1,9 @@ package com.github.technus.tectech.loader.gui; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.github.technus.tectech.thing.item.gui.ProgrammerScreen; import com.github.technus.tectech.thing.item.gui.ScanDisplayScreen; import cpw.mods.fml.common.network.IGuiHandler; @@ -25,7 +25,7 @@ public class ModGuiHandler implements IGuiHandler { if (ID == SCAN_DISPLAY_SCREEN_ID) { return new ScanDisplayScreen(player); } else if (ID == PROGRAMMER_DISPLAY_SCREEN_ID) { - return new ProgrammerScreen(player); + return new GuiScreen(); } return null; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java index 29f2045b8e..24c397dc2e 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java @@ -197,10 +197,6 @@ public class EMAtomDefinition extends EMComplexTemplate { this(true, new EMConstantStackMap(things)); } - private EMAtomDefinition(boolean check, EMDefinitionStack... things) throws EMException { - this(check, new EMConstantStackMap(things)); - } - public EMAtomDefinition(EMConstantStackMap things) throws EMException { this(true, things); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java index cae4a3a876..f86dc9c96a 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java @@ -7,7 +7,6 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.TreeMap; public final class EMNuclideIAEA { @@ -276,16 +275,6 @@ public final class EMNuclideIAEA { } } - private static HashSet<String> decays = new HashSet<>(); - - private static boolean add(String s) { - if (decays.add(s)) { - System.out.println(s); - return true; - } - return false; - } - private static iaeaDecay[] getDecaysFixed(String decay1, double chance1, String decay2, double chance2, String decay3, double chance3) { boolean do1, do2, do3; diff --git a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java index 78b027f801..033882609b 100644 --- a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java +++ b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java @@ -31,10 +31,6 @@ public class IMCForNEI { FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); } - private static void sendHandler(String aName, String aBlock) { - sendHandler(aName, aBlock, 2); - } - private static void sendCatalyst(String aName, String aStack, int aPriority) { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handlerID", aName); diff --git a/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java b/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java deleted file mode 100644 index 3b9267ca85..0000000000 --- a/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.technus.tectech.thing.item.gui; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - -public class ProgrammerScreen extends GuiScreen { - - private NBTTagCompound tag; - - public ProgrammerScreen(EntityPlayer player) { - tag = player.getHeldItem().getTagCompound(); - } -} diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index ec1a9a441d..3821701300 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -3,8 +3,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_INGOT_MASS_DIFF; -import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_MASS_TO_EU_INSTANT; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; @@ -38,14 +36,6 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; - // todo CHECK VALUES - private static final double NEUTRONIUM_BLOCK_MASS = 4.1E17; - private static final double NEUTRONIUM_BLOCK_ATOM_COUNT = 2.4478671E44; - private static final double NEUTRONIUM_BLOCK_TO_EU_INSTANT = URANIUM_MASS_TO_EU_INSTANT * NEUTRONIUM_BLOCK_MASS - / (URANIUM_INGOT_MASS_DIFF * 1.78266191e-36); // ~ 5.314e40 - private static final double NEUTRON_TO_EU_INSTANT = NEUTRONIUM_BLOCK_TO_EU_INSTANT / NEUTRONIUM_BLOCK_ATOM_COUNT; // ~ - // 0.00021708694 - public boolean glassDome = false; // endregion @@ -1231,111 +1221,6 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E super(aName); } - /** - * Black hole event horizon radius calculator - * - * @param massKg mass in kg - * @return radius in meters - */ - private static double getSchwarzschildRadius(double massKg) { - return massKg * 1.48523238761875E-27; - } - - /** - * Black hole event horizon surface area calculator - * - * @param massKg mass in kg - * @return area in meters^2 - */ - private static double getSchwarzschildArea(double massKg) { - return Math.pow(getSchwarzschildRadius(massKg), 2) * 12.566370614359172; - } - - /** - * Black hole event horizon temperature calculator - * - * @param massKg mass in kg - * @return temperature in K - */ - private static double getTemperature(double massKg) { - return 2.841438513199716E-9 / (2.3159488515170722E-32 * massKg); - } - - /** - * Black hole luminosity calculator - * - * @param massKg mass in kg - * @return luminosity in watts - */ - private static double getLuminosity(double massKg) { - return getSchwarzschildArea(massKg) * 5.670373e-8 * Math.pow(getTemperature(massKg), 4); - } - - /** - * Black hole acretion disk luminosity calculator - * - * @param massKgPer1s mass injection kg per s - * @return luminosity in watts - */ - private static double getAcretionDiskLuminosity(double massKgPer1s) { - return massKgPer1s * 7.48962648947348E15; - } - - /** - * Black hole gravity field calculator, should be used for gravity blasting - * - * @param massKg mass in kg - * @param distanceSq distance squared in meters - * @return gravity field - */ - private static double getGravityField(double massKg, double distanceSq) { - return massKg * 6.6743015e-11 / distanceSq; - } - - /** - * Black hole containment force calculator - * - * @param massKg mass in kg - * @param radiusSq radius squared in meters - * @return force in newtons - */ - private static double getContainmentForce(double massKg, double radiusSq) { - return Math.pow(massKg, 2) * 6.6743015e-11 / radiusSq; - } - - /** - * Black hole containment pressure calculator F/s, should be used for bhg initial release explosion? - * - * @param massKg mass in kg - * @param radiusSq radius squared in meters - * @return pressure in pascals - */ - private static double getContainmentPressure(double massKg, double radiusSq) { - return getContainmentForce(massKg, radiusSq) / (12.566370614359172 * radiusSq); - } - - /** - * Black hole containment energy calculator, assuming F*s, and 100% efficient gravity force field - * - * @param massKg mass in kg - * @return power in watts - */ - private static double getContainmentPower(double massKg) { - return Math.pow(massKg, 2) * 8.387174624097334E-10; - } - - /** - * Black hole power balance, zero at mass ~= 2.5525e10 (T~=4.8067e12) - * - * @param massKg mass in kg - * @param massKgPer1s mass injection kg per s - * @return power in watts - */ - @Deprecated - private static double getContainmentPowerBalance(double massKg, double massKgPer1s) { - return getLuminosity(massKg) + getAcretionDiskLuminosity(massKgPer1s) - getContainmentPower(massKg); - } - // todo compaction energy 8 * Long.MAx_VALUE? // todo neutronium decay gen? 0.0007186885 mass diff - actually compute hydrogen amount... diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index 6a25a3779c..f4f5917d01 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -459,7 +459,6 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public void construct(ItemStack stackSize, boolean hintsOnly) { - IGregTechTileEntity igt = getBaseMetaTileEntity(); structureBuild_EM("front", 1, 2, 0, stackSize, hintsOnly); structureBuild_EM("cap", 1, 2, -1, stackSize, hintsOnly); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 6f7fc069ac..ab584e72ec 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -940,10 +940,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock return false; } - private boolean addFrameToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - return aTileEntity != null && aTileEntity.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame; - } - @Override public IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> getStructure_EM() { return STRUCTURE_DEFINITION; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java index 4a687723b1..7e3d360e2e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java @@ -41,7 +41,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo private static Textures.BlockIcons.CustomIcon EMpipe; public byte connectionCount = 0; - private boolean active, lastActive; + private boolean active; public GT_MetaTileEntity_Pipe_Energy(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); diff --git a/src/main/java/com/github/technus/tectech/util/XSTR.java b/src/main/java/com/github/technus/tectech/util/XSTR.java index 9379702527..c739eb2e3e 100644 --- a/src/main/java/com/github/technus/tectech/util/XSTR.java +++ b/src/main/java/com/github/technus/tectech/util/XSTR.java @@ -20,9 +20,6 @@ public class XSTR extends Random { private static final long serialVersionUID = 6208727693524452904L; private long seed; - private static final long GAMMA = 0x9e3779b97f4a7c15L; - private static final int PROBE_INCREMENT = 0x9e3779b9; - private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL; private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53) private static final float FLOAT_UNIT = 0x1.0p-24f; // 1.0f / (1 << 24) private static final AtomicLong seedUniquifier = new AtomicLong(8682522807148012L); |