aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2023-04-02 00:02:47 +0800
committerGitHub <noreply@github.com>2023-04-01 18:02:47 +0200
commit6b77557e0e87cf5afd9ebd3985323ff1249e615c (patch)
tree36474042ef39f863aedc007eab81a9b09cc7aa78 /src/main/java/gregtech/common
parent655cc902d3df19a1ac2bfaa38cc928ed629d0171 (diff)
downloadGT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.tar.gz
GT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.tar.bz2
GT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.zip
Recipe Adder v2 (#1770)
* add everything * fixes * migrate plasma forge recipes * syntax update * make chances array length differ a fatal error * time constants + long eut overload * migrate extruder recipes * migrate electromagnetic separator recipes * migrate wiremill recipes * migrate forming press recipes * migrate bender recipes * add doc to clarify the three itemInputs * migrate alloy smelter recipes * migrate arc furnace recipes * added ModIDs enum * sort ModIDs * migrate autoclave recipes * migrated some assembler recipes * split a bit more assembler recipes * migrate canner recipes * migrate brewing recipes * ic2 mod check in canner recipes * use some loops to reduce the amount of recipes to migrate * add requested helper methods * migrate vacuum freezer recipes * migrate thermal centrifuge recipes * format smelter recipes only, doesn't go through normal GT recipe * migrated slicer recipes * migrated sifter recipes * Use proper enum now * remove more constants * cleaning cutting recipes before migration * remove tons of dead commented recipes * migrate pyrolyse recipes * use ModIDs enum more * migrate printer recipes * add a less confusing way to specify value of specialItem * migrate pulverizer recipes * less confusing special item specification * even more ModIDs enum usage * fix auto * import confusing Minecraft enum value with Minecraft client object * migrated blast furnace recipes * migrated Centrifuge recipes * migrated assembler recipes * migrated implosion compressor recipes * migrated extractor recipes * migrated mixer recipes * remove useless code * mgrate universal chemical recipes * refactor chemical recipes * migrate single block only chem reactor recipes * migrate chem reactor recipes * reworked circuit assembler recipes before migrating them * migrated circuit assembler recipes * fix merge conflict for assembler recipes * remove leftover of the merge conflicts * fix weird translation glitch * example of assembly line recipe using RA2 * bugfixes for assline * remove specialValue usage in blast furnace recipes * fix more bugs * add nooptimize to where it make sense * add recipe descriptions * Materials.Superconductor -> Materials.SuperconductorUHV * remove useless Object creations * remove explicit long casts * migrate assemblyline recipes * migrate chemical bath recipes * migrate compressor recipes * move smelting recipe where it belongs * migrated cutting machine recipes * migrated fermenter recipes (unhide alcohol) * remove explicit long casts * migrate fluid canner recipes * migrate fluid heater recipes * migrated fusion recipes * migrated lathe recipes * migrated laser engraver recipes * migrated packager recipes * migrated forge hammer recipes * migrated TPM recipes * exit early and reduced indents * migrated fluid extractor recipes * migrated fluid solidifier recipes * migrated electrolyzer recipes * migrated crop processing recipes * migrated default polymerization recipes * migrate distillery recipes * migrate matter amplifier recipes * add metadata identifier for fusion ignition threshold * migrate fuel recipes * update bs (cherry picked from commit c2d931c9b6caa0376e9d50591894cd849021104d) * spotless (cherry picked from commit 1060f5357fb95e28bfae1f052025f55dabc21a0f) * guard against null itemstacks * wrong translation * fix empty arrays being accessed * add 0 duration and 0 EU/t for fuel recipes * fix typo in matter amplifier recipes * spotless apply --------- Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Client.java4
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java121
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java27
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Metal.java5
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java5
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java4
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java93
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java8
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java28
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java7
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Scoop.java6
14 files changed, 177 insertions, 152 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index e7189811a0..351a1aac16 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -7,6 +7,7 @@ package gregtech.common;
import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
import static gregtech.api.enums.GT_Values.calculateMaxPlasmaTurbineEfficiency;
+import static gregtech.api.enums.ModIDs.Forestry;
import static org.lwjgl.opengl.GL11.GL_LINE_LOOP;
import java.net.URL;
@@ -49,7 +50,6 @@ import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.network.FMLNetworkEvent;
@@ -561,7 +561,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
for (GT_MetaGenerated_Item item : GT_MetaGenerated_Item.sInstances.values()) {
metaGeneratedItemRenderer.registerItem(item);
}
- if (Loader.isModLoaded(GT_Values.MOD_ID_FR)) {
+ if (Forestry.isModLoaded()) {
metaGeneratedItemRenderer.registerItem(GT_Bees.combs);
}
new GT_MetaGenerated_Tool_Renderer();
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 3f50da2230..401b1395d5 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -6,12 +6,9 @@ import static gregtech.api.enums.FluidState.LIQUID;
import static gregtech.api.enums.FluidState.MOLTEN;
import static gregtech.api.enums.FluidState.PLASMA;
import static gregtech.api.enums.GT_Values.MOD_ID;
-import static gregtech.api.enums.GT_Values.MOD_ID_RC;
-import static gregtech.api.enums.GT_Values.MOD_ID_TC;
-import static gregtech.api.enums.GT_Values.MOD_ID_TE;
-import static gregtech.api.enums.GT_Values.MOD_ID_TF;
import static gregtech.api.enums.GT_Values.W;
import static gregtech.api.enums.GT_Values.debugEntityCramming;
+import static gregtech.api.enums.ModIDs.*;
import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY;
import java.io.File;
@@ -787,34 +784,34 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
}
}
GT_Log.out.println("GT_Mod: Getting required Items of other Mods.");
- ItemList.TE_Slag.set(GT_ModHandler.getModItem(MOD_ID_TE, "slag", 1L));
- ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem(MOD_ID_TE, "slagRich", 1L));
- ItemList.TE_Rockwool.set(GT_ModHandler.getModItem(MOD_ID_TE, "rockwool", 1L));
- ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem(MOD_ID_TE, "glassHardened", 1L));
-
- ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(MOD_ID_RC, "machine.delta", 1L, 0));
- ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(MOD_ID_RC, "frame", 1L, 0));
- ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.rail", 1L, 0));
- ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.rail", 1L, 1));
- ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.rail", 1L, 2));
- ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.rail", 1L, 3));
- ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.rail", 1L, 4));
- ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.rail", 1L, 5));
- ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.tie", 1L, 0));
- ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.tie", 1L, 1));
- ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.railbed", 1L, 0));
- ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.railbed", 1L, 1));
- ItemList.RC_Rebar.set(GT_ModHandler.getModItem(MOD_ID_RC, "part.rebar", 1L));
- ItemList.TC_Thaumometer.set(GT_ModHandler.getModItem(MOD_ID_TC, "ItemThaumometer", 1L, 0));
- ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem(MOD_ID_RC, "tool.steel.sword", 1L));
- ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem(MOD_ID_RC, "tool.steel.pickaxe", 1L));
- ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem(MOD_ID_RC, "tool.steel.shovel", 1L));
- ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem(MOD_ID_RC, "tool.steel.axe", 1L));
- ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem(MOD_ID_RC, "tool.steel.hoe", 1L));
-
- ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem(MOD_ID_TF, "item.liveRoot", 1L, 0));
- ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem(MOD_ID_TF, "item.fieryBlood", 1L));
- ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem(MOD_ID_TF, "item.fieryTears", 1L));
+ ItemList.TE_Slag.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "slag", 1L));
+ ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "slagRich", 1L));
+ ItemList.TE_Rockwool.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "rockwool", 1L));
+ ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "glassHardened", 1L));
+
+ ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(Railcraft.modID, "machine.delta", 1L, 0));
+ ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(Railcraft.modID, "frame", 1L, 0));
+ ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 0));
+ ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 1));
+ ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 2));
+ ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 3));
+ ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 4));
+ ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 5));
+ ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem(Railcraft.modID, "part.tie", 1L, 0));
+ ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem(Railcraft.modID, "part.tie", 1L, 1));
+ ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem(Railcraft.modID, "part.railbed", 1L, 0));
+ ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem(Railcraft.modID, "part.railbed", 1L, 1));
+ ItemList.RC_Rebar.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rebar", 1L));
+ ItemList.TC_Thaumometer.set(GT_ModHandler.getModItem(Thaumcraft.modID, "ItemThaumometer", 1L, 0));
+ ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.sword", 1L));
+ ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.pickaxe", 1L));
+ ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.shovel", 1L));
+ ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.axe", 1L));
+ ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.hoe", 1L));
+
+ ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.liveRoot", 1L, 0));
+ ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.fieryBlood", 1L));
+ ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.fieryTears", 1L));
ItemList.FR_Lemon.set(GT_ModHandler.getModItem(aTextForestry, "fruits", 1L, 3));
ItemList.FR_Mulch.set(GT_ModHandler.getModItem(aTextForestry, "mulch", 1L));
@@ -963,22 +960,36 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767));
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767));
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_RC, "part.turbine.disk", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_RC, "part.turbine.blade", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_RC, "part.turbine.rotor", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_RC, "borehead.diamond", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_RC, "borehead.steel", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_RC, "borehead.iron", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.plateNaga", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.legsNaga", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.arcticHelm", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.arcticPlate", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.arcticLegs", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.arcticBoots", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.yetiHelm", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.yetiPlate", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.yetiLegs", 1L, 32767));
- GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(MOD_ID_TF, "item.yetiBoots", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.steel", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.iron", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767));
+ GT_ModHandler.sNonReplaceableItems
+ .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767));
GT_ModHandler.sNonReplaceableItems
.add(GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767));
GT_ModHandler.sNonReplaceableItems
@@ -1024,25 +1035,25 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0));
// Clay buckets, which don't get registered until Iguana Tweaks pre-init
- if (Loader.isModLoaded("IguanaTweaksTConstruct")) {
+ if (IguanaTweaksTinkerConstruct.isModLoaded()) {
OrePrefixes.bucketClay.mContainerItem = GT_ModHandler
- .getModItem("IguanaTweaksTConstruct", "clayBucketFired", 1L, 0);
+ .getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketFired", 1L, 0);
GT_OreDictUnificator.set(
OrePrefixes.bucketClay,
Materials.Empty,
- GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketFired", 1L, 0));
+ GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketFired", 1L, 0));
GT_OreDictUnificator.set(
OrePrefixes.bucketClay,
Materials.Water,
- GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketWater", 1L, 0));
+ GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketWater", 1L, 0));
GT_OreDictUnificator.set(
OrePrefixes.bucketClay,
Materials.Lava,
- GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketLava", 1L, 0));
+ GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketLava", 1L, 0));
GT_OreDictUnificator.set(
OrePrefixes.bucketClay,
Materials.Milk,
- GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketMilk", 1L, 0));
+ GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketMilk", 1L, 0));
FluidContainerRegistry.registerFluidContainer(
new FluidContainerRegistry.FluidContainerData(
@@ -2887,7 +2898,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
this.mOreDictActivated = true;
ProgressManager.ProgressBar progressBar = ProgressManager.push("Register materials", mEvents.size());
- if (Loader.isModLoaded("betterloadingscreen")) {
+ if (BetterLoadingScreen.isModLoaded()) {
GT_Values.cls_enabled = true;
try {
GT_CLS_Compat.stepMaterialsCLS(mEvents, progressBar);
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 486035c206..0e4c6e8c9a 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -1,7 +1,8 @@
package gregtech.common;
import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.MOD_ID_GTPP;
+import static gregtech.api.enums.ModIDs.GTPlusPlus;
+import static gregtech.api.enums.ModIDs.Railcraft;
import java.util.ArrayList;
import java.util.Arrays;
@@ -19,7 +20,6 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
@@ -299,8 +299,8 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
for (ItemStack item : itemInputs) {
if (item != null) {
- if (GT_Utility.getFluidForFilledItem(aInput1, true) != null || GT_Utility.isCellEmpty(item)
- || GT_Utility.checkIfSameIntegratedCircuit(item)) {
+ if (GT_Utility.getFluidForFilledItem(item, true) != null || GT_Utility.isCellEmpty(item)
+ || GT_Utility.isAnyIntegratedCircuit(item)) {
fluidInputs[iNumber + 1] = GT_Utility.convertCellToFluid(item);
itemInputs[iNumber] = null;
}
@@ -636,7 +636,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
0,
0);
}
- if (Loader.isModLoaded("Railcraft")) {
+ if (Railcraft.isModLoaded()) {
GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe(
true,
new ItemStack[] { aInput1, aInput2, RailcraftToolItems.getCoalCoke(aCoalAmount / 2) },
@@ -649,11 +649,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
0,
0);
}
- if (Loader.isModLoaded(MOD_ID_GTPP)) {
+ if (GTPlusPlus.isModLoaded()) {
GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe(
true,
new ItemStack[] { aInput1, aInput2,
- GT_ModHandler.getModItem(MOD_ID_GTPP, "itemCactusCoke", (aCoalAmount * 2L)) },
+ GT_ModHandler.getModItem(GTPlusPlus.modID, "itemCactusCoke", (aCoalAmount * 2L)) },
new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) },
null,
null,
@@ -665,7 +665,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe(
true,
new ItemStack[] { aInput1, aInput2,
- GT_ModHandler.getModItem(MOD_ID_GTPP, "itemSugarCoke", (aCoalAmount * 2L)) },
+ GT_ModHandler.getModItem(GTPlusPlus.modID, "itemSugarCoke", (aCoalAmount * 2L)) },
new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) },
null,
null,
@@ -706,7 +706,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
0,
0);
}
- if (Loader.isModLoaded("Railcraft")) {
+ if (Railcraft.isModLoaded()) {
GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe(
true,
new ItemStack[] { aInput1, aInput2, EnumCube.COKE_BLOCK.getItem(aCoalAmount / 2) },
@@ -2812,7 +2812,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
if ((aDuration = GregTech_API.sRecipeFile.get("cracking", aInput.getUnlocalizedName(), aDuration)) <= 0) {
return false;
}
- GT_Recipe.GT_Recipe_Map.sCrakingRecipes.addRecipe(
+ GT_Recipe.GT_Recipe_Map.sCrackingRecipes.addRecipe(
false,
new ItemStack[] { GT_Utility.getIntegratedCircuit(circuitConfig) },
null,
@@ -2926,7 +2926,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
Comparator
.<ItemStack, String>comparing(
s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId)
- .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId)
+ .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).name)
.thenComparingInt(Items.feather::getDamage).thenComparingInt(s -> s.stackSize));
int tAmount = ((Number) objs[1]).intValue();
List<ItemStack> uList = new ArrayList<>();
@@ -3174,4 +3174,9 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
}
return itemsNull && fluidsNull;
}
+
+ @Override
+ public GT_RecipeBuilder stdBuilder() {
+ return GT_RecipeBuilder.builder();
+ }
}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
index b33a43e821..7f78fe0bda 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
@@ -1,10 +1,11 @@
package gregtech.common.blocks;
+import static gregtech.api.enums.ModIDs.NotEnoughItems;
+
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
-import cpw.mods.fml.common.Loader;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.interfaces.IIconContainer;
@@ -17,7 +18,7 @@ public class GT_Block_Metal extends GT_Block_Storage {
public OrePrefixes mPrefix;
public IIconContainer[] mBlockIcons;
public boolean mHideBlocks;
- public static boolean mNEIisLoaded = Loader.isModLoaded("NotEnoughItems");
+ public static boolean mNEIisLoaded = NotEnoughItems.isModLoaded();
public GT_Block_Metal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
super(GT_Item_Storage.class, aName, Material.iron);
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index 66acc22a22..fbe0516e6c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -1,5 +1,7 @@
package gregtech.common.blocks;
+import static gregtech.api.enums.ModIDs.NotEnoughItems;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -24,7 +26,6 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.GT_Mod;
@@ -54,7 +55,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
this.isBlockContainer = true;
setStepSound(soundTypeStone);
setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);
- tHideOres = Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres;
+ tHideOres = NotEnoughItems.isModLoaded() && GT_Mod.gregtechproxy.mHideUnusedOres;
if (aOreMetaCount > 8 || aOreMetaCount < 0) aOreMetaCount = 8;
for (int i = 0; i < 16; i++) {
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index f63a535555..9950b2581f 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -1,5 +1,6 @@
package gregtech.common.items;
+import static gregtech.api.enums.ModIDs.GalacticraftMars;
import static gregtech.api.enums.Textures.BlockIcons.*;
import static gregtech.client.GT_TooltipHandler.Tier.*;
import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
@@ -21,7 +22,6 @@ import net.minecraft.potion.Potion;
import net.minecraft.util.MathHelper;
import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.Loader;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
@@ -1268,7 +1268,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
256,
256);
- if (Loader.isModLoaded("GalacticraftMars")) {
+ if (GalacticraftMars.isModLoaded()) {
ItemList.Ingot_Heavy1
.set(addItem(tLastID = 462, "Heavy Duty Alloy Ingot T1", "Used to make Heavy Duty Plates T1"));
ItemList.Ingot_Heavy2
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index d7f009dd38..b1146e8db6 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -1,6 +1,7 @@
package gregtech.common.items;
import static gregtech.api.enums.GT_Values.*;
+import static gregtech.api.enums.ModIDs.*;
import java.util.Arrays;
import java.util.List;
@@ -17,7 +18,6 @@ import net.minecraftforge.fluids.FluidStack;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -228,7 +228,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
addCentrifugeToItemStack(
CombType.LAPOTRON,
new ItemStack[] { GT_Bees.drop.getStackForType(DropType.LAPIS),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.LapotronDust", 1, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LapotronDust", 1, 0),
GT_ModHandler.getModItem("MagicBees", "wax", 1, 2) },
new int[] { 20 * 100, 15 * 100, 40 * 100 },
Voltage.HV,
@@ -1186,35 +1186,38 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
addCentrifugeToItemStack(
CombType.NAGA,
new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 4),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.NagaScaleChip", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.NagaScaleFragment", 1L, 0), ItemList.FR_Wax.get(1) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleChip", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleFragment", 1L, 0),
+ ItemList.FR_Wax.get(1) },
new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
Voltage.MV);
addCentrifugeToItemStack(
CombType.LICH,
new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 5),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.LichBoneChip", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.LichBoneFragment", 1L, 0), ItemList.FR_Wax.get(1) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneChip", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneFragment", 1L, 0),
+ ItemList.FR_Wax.get(1) },
new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
Voltage.HV);
addCentrifugeToItemStack(
CombType.HYDRA,
new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 1),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.FieryBloodDrop", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.FieryBloodDrop", 1L, 0),
GT_Bees.drop.getStackForType(DropType.HYDRA), ItemList.FR_Wax.get(1) },
new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
Voltage.HV);
addCentrifugeToItemStack(
CombType.URGHAST,
new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CarminiteChip", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CarminiteFragment", 1L, 0), ItemList.FR_Wax.get(1) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CarminiteChip", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CarminiteFragment", 1L, 0),
+ ItemList.FR_Wax.get(1) },
new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
Voltage.EV);
addCentrifugeToItemStack(
CombType.SNOWQUEEN,
new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.SnowQueenBloodDrop", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.SnowQueenBloodDrop", 1L, 0),
GT_Bees.drop.getStackForType(DropType.SNOW_QUEEN), ItemList.FR_Wax.get(1) },
new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
Voltage.EV);
@@ -1283,17 +1286,17 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
addCentrifugeToItemStack(
CombType.RUNEI,
new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.RuneOfPowerFragment", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.RuneOfAgilityFragment", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.RuneOfVigorFragment", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.RuneOfDefenseFragment", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.RuneOfMagicFragment", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfPowerFragment", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfAgilityFragment", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfVigorFragment", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfDefenseFragment", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfMagicFragment", 1L, 0) },
new int[] { 25 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100 },
Voltage.IV);
addCentrifugeToItemStack(
CombType.RUNEII,
new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.RuneOfVoidFragment", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfVoidFragment", 1L, 0) },
new int[] { 50 * 100, (int) (2.5 * 100) },
Voltage.IV);
addCentrifugeToItemStack(
@@ -1304,7 +1307,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
new int[] { 30 * 100, (int) (7.5 * 100), 20 * 100 },
Voltage.IV);
// Walrus Recipe
- if (Loader.isModLoaded("ae2fc")) {
+ if (AE2FluidCraft.isModLoaded()) {
addCentrifugeToItemStack(
CombType.WALRUS,
new ItemStack[] { GT_ModHandler.getModItem("ae2fc", "walrus", 1L, 0) },
@@ -1316,7 +1319,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
CombType.SPACE,
new ItemStack[] { ItemList.FR_Wax.get(1L), ItemList.FR_RefractoryWax.get(1L),
GT_Bees.drop.getStackForType(DropType.OXYGEN),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CoinSpace", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CoinSpace", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 15 * 100, 5 * 100 },
Voltage.HV);
addProcessGT(CombType.METEORICIRON, new Materials[] { Materials.MeteoricIron }, Voltage.HV);
@@ -1418,24 +1421,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
addCentrifugeToItemStack(
CombType.MOON,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.MoonStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MoonStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100 },
Voltage.MV,
300);
addCentrifugeToItemStack(
CombType.MARS,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.MarsStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MarsStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100 },
Voltage.HV,
300);
addCentrifugeToItemStack(
CombType.JUPITER,
- new ItemStack[] { GT_ModHandler.getModItem(MOD_ID_DC, "item.IoStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaIceDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.GanymedeStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoStoneDust", 1L, 0),
+ new ItemStack[] { GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1L, 0),
GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.CallistoIce, 1L),
ItemList.FR_Wax.get(1L) },
new int[] { 30 * 100, 30 * 100, 30 * 100, 30 * 100, 30 * 100, 5 * 100, 50 * 100 },
@@ -1444,95 +1447,95 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
addCentrifugeToItemStack(
CombType.MERCURY,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.MercuryCoreDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.MercuryStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MercuryCoreDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MercuryStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 30 * 100 },
Voltage.EV,
300);
addCentrifugeToItemStack(
CombType.VENUS,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.VenusStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VenusStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100 },
Voltage.EV,
300);
addCentrifugeToItemStack(
CombType.SATURN,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.TitanStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitanStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 30 * 100 },
Voltage.IV,
300);
addCentrifugeToItemStack(
CombType.URANUS,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.MirandaStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.OberonStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 30 * 100 },
Voltage.IV,
300);
addCentrifugeToItemStack(
CombType.NEPTUN,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.ProteusStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.TritonStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 30 * 100 },
Voltage.IV,
300);
addCentrifugeToItemStack(
CombType.PLUTO,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoIceDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoIceDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 30 * 100 },
Voltage.LuV,
300);
addCentrifugeToItemStack(
CombType.HAUMEA,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.HaumeaStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.HaumeaStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100 },
Voltage.LuV,
300);
addCentrifugeToItemStack(
CombType.MAKEMAKE,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.MakeMakeStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MakeMakeStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100 },
Voltage.LuV,
300);
addCentrifugeToItemStack(
CombType.CENTAURI,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriASurfaceDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriAStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriASurfaceDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriAStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 30 * 100 },
Voltage.ZPM,
300);
addCentrifugeToItemStack(
CombType.TCETI,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100 },
Voltage.ZPM,
300);
addCentrifugeToItemStack(
CombType.BARNARDA,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaEStoneDust", 1L, 0),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaFStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaEStoneDust", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaFStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100, 30 * 100 },
Voltage.ZPM,
300);
addCentrifugeToItemStack(
CombType.VEGA,
new ItemStack[] { ItemList.FR_Wax.get(1L),
- GT_ModHandler.getModItem(MOD_ID_DC, "item.VegaBStoneDust", 1L, 0) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1L, 0) },
new int[] { 50 * 100, 30 * 100 },
Voltage.ZPM,
300);
- if (Loader.isModLoaded("GalaxySpace")) {
+ if (GalaxySpace.isModLoaded()) {
addCentrifugeToItemStack(
CombType.SEAWEED,
new ItemStack[] { ItemList.FR_Wax.get(1L),
diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java
index 4887e47722..4b615b9f6e 100644
--- a/src/main/java/gregtech/common/items/ItemDrop.java
+++ b/src/main/java/gregtech/common/items/ItemDrop.java
@@ -1,7 +1,8 @@
package gregtech.common.items;
import static gregtech.api.enums.GT_Values.MOD_ID;
-import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+import static gregtech.api.enums.ModIDs.HardcoreEnderExpansion;
+import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod;
import java.util.List;
@@ -13,7 +14,6 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -141,7 +141,7 @@ public class ItemDrop extends Item {
addProcessMV(
tDrop,
Materials.FierySteel.getFluid(200L),
- GT_ModHandler.getModItem(MOD_ID_DC, "SnowQueenBloodDrop", 1L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "SnowQueenBloodDrop", 1L, 0),
1500,
48);
tDrop = getStackForType(DropType.LAPIS);
@@ -180,7 +180,7 @@ public class ItemDrop extends Item {
GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2),
30);
tDrop = getStackForType(DropType.ENDERGOO);
- if (Loader.isModLoaded("HardcoreEnderExpansion"))
+ if (HardcoreEnderExpansion.isModLoaded())
addProcessHV(tDrop, new FluidStack(FluidRegistry.getFluid("endergoo"), 500), GT_Values.NI, 1000);
}
diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java
index c2d46a8249..657c6ef99a 100644
--- a/src/main/java/gregtech/common/items/ItemPropolis.java
+++ b/src/main/java/gregtech/common/items/ItemPropolis.java
@@ -1,7 +1,7 @@
package gregtech.common.items;
import static gregtech.api.enums.GT_Values.MOD_ID;
-import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod;
import java.util.List;
@@ -84,9 +84,9 @@ public class ItemPropolis extends Item {
tPropolis = getStackForType(PropolisType.Stardust);
addProcessHV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "stardust", 1, 0));
tPropolis = getStackForType(PropolisType.Ectoplasma);
- addProcessEV(tPropolis, GT_ModHandler.getModItem(MOD_ID_DC, "item.EctoplasmaChip", 1, 0));
+ addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EctoplasmaChip", 1, 0));
tPropolis = getStackForType(PropolisType.Arcaneshard);
- addProcessEV(tPropolis, GT_ModHandler.getModItem(MOD_ID_DC, "item.ArcaneShardChip", 1, 0));
+ addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ArcaneShardChip", 1, 0));
tPropolis = getStackForType(PropolisType.Dragonessence);
addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "essence", 16, 0));
tPropolis = getStackForType(PropolisType.Enderman);
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
index 3e2a3e69cc..d197c264c7 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
@@ -1,8 +1,8 @@
package gregtech.common.tileentities.generators;
import static gregtech.api.enums.ConfigCategories.machineconfig;
-import static gregtech.api.enums.GT_Values.MOD_ID_TC;
import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.ModIDs.Thaumcraft;
import static gregtech.api.enums.Textures.BlockIcons.*;
import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
import static net.minecraft.util.EnumChatFormatting.GRAY;
@@ -46,7 +46,6 @@ import thaumcraft.api.visnet.VisNetHandler;
import com.google.common.base.Enums;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
@@ -72,7 +71,7 @@ interface MagicalEnergyBBListener {
public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_BasicGenerator
implements MagicalEnergyBBListener {
- private static final boolean THAUMCRAFT_LOADED = Loader.isModLoaded(MOD_ID_TC);
+ private static final boolean THAUMCRAFT_LOADED = Thaumcraft.isModLoaded();
private static final ConcurrentHashMap<UUID, GT_MetaTileEntity_MagicalEnergyAbsorber> sSubscribedCrystals = new ConcurrentHashMap<>(
4);
private static final List<Aspect> sPrimalAspects = (THAUMCRAFT_LOADED) ? Aspect.getPrimalAspects()
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
index bc6f50fde6..595953c06f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -1,6 +1,6 @@
package gregtech.common.tileentities.machines.basic;
-import static gregtech.api.enums.GT_Values.MOD_ID_RC;
+import static gregtech.api.enums.ModIDs.Railcraft;
import static gregtech.api.enums.Textures.BlockIcons.*;
import java.util.*;
@@ -137,9 +137,11 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi
addBlacklist(Materials.Graphene.getDust(1));
addBlacklist(ItemList.Circuit_Parts_Vacuum_Tube.get(1L));
addBlacklist(ItemList.Schematic.get(1L));
- addBlacklist(GT_ModHandler.getModItem(MOD_ID_RC, "track", 1L, 0));
- addBlacklist(GT_ModHandler.getModItem(MOD_ID_RC, "track", 1L, 736));
- addBlacklist(GT_ModHandler.getModItem(MOD_ID_RC, "track", 1L, 816));
+ if (Railcraft.isModLoaded()) {
+ addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 0));
+ addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 736));
+ addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 816));
+ }
addBlacklist(IC2Items.getItem("mixedMetalIngot"));
addBlacklist(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 14));
// region transformer
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 20b42e7bb4..3f37effffa 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -1,6 +1,8 @@
package gregtech.common.tileentities.machines.basic;
import static gregtech.api.enums.GT_Values.*;
+import static gregtech.api.enums.ModIDs.GalacticraftCore;
+import static gregtech.api.enums.ModIDs.GalacticraftMars;
import static gregtech.api.enums.Textures.BlockIcons.*;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes;
@@ -228,36 +230,38 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
int stackItemID = Item.getIdFromItem(aStack.getItem());
int stackItemDamage = aStack.getItemDamage();
if (stackItemID == Item.getIdFromItem(
- Objects.requireNonNull(GT_ModHandler.getModItem(MOD_ID_GC_CORE, "item.schematic", 1L, 0))
+ Objects.requireNonNull(
+ GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0))
.getItem())) {
if (stackItemDamage == 0 && aStack.toString().equals(
Objects.requireNonNull(
- GT_ModHandler.getModItem(MOD_ID_GC_CORE, "item.schematic", 1L, 0)).copy()
- .toString()))
+ GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0))
+ .copy().toString()))
sTier = "100";
else if (stackItemDamage == 1 && aStack.toString().equals(
Objects.requireNonNull(
- GT_ModHandler.getModItem(MOD_ID_GC_CORE, "item.schematic", 1L, 1)).copy()
- .toString()))
+ GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 1))
+ .copy().toString()))
sTier = "2";
} else {
if (stackItemID == Item.getIdFromItem(
Objects.requireNonNull(
- GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 0)).getItem())) {
+ GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0))
+ .getItem())) {
if (stackItemDamage == 0 && aStack.toString().equals(
Objects.requireNonNull(
- GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 0)).copy()
- .toString()))
+ GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0))
+ .copy().toString()))
sTier = "3";
else if (stackItemDamage == 1 && aStack.toString().equals(
Objects.requireNonNull(
- GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 1)).copy()
- .toString()))
+ GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 1))
+ .copy().toString()))
sTier = "101";
else if (stackItemDamage == 2 && aStack.toString().equals(
Objects.requireNonNull(
- GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 2)).copy()
- .toString()))
+ GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 2))
+ .copy().toString()))
sTier = "102";
} else if (aStack.getUnlocalizedName().matches(".*\\d+.*"))
sTier = aStack.getUnlocalizedName().split("(?<=\\D)(?=\\d)")[1].substring(0, 1);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
index 6d0b194612..a1e85f9b25 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
@@ -5,7 +5,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUn
import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE_GLOW;
@@ -23,7 +23,6 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
-import cpw.mods.fml.common.Loader;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.HeatingCoilLevel;
@@ -50,8 +49,8 @@ public class GT_MetaTileEntity_PyrolyseOven extends
private static final IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> STRUCTURE_DEFINITION = createStructureDefinition();
private static IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> createStructureDefinition() {
- IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = Loader.isModLoaded(MOD_ID_DC)
- ? ofBlockUnlocalizedName(MOD_ID_DC, "gt.blockcasingsNH", 2)
+ IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = NewHorizonsCoreMod.isModLoaded()
+ ? ofBlockUnlocalizedName(NewHorizonsCoreMod.modID, "gt.blockcasingsNH", 2)
: ofBlock(GregTech_API.sBlockCasings1, 0);
return StructureDefinition.<GT_MetaTileEntity_PyrolyseOven>builder()
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
index f0ad65d838..df6a5ef668 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
@@ -1,5 +1,7 @@
package gregtech.common.tools;
+import static gregtech.api.enums.ModIDs.Forestry;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
@@ -8,8 +10,6 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.items.GT_MetaGenerated_Tool;
@@ -110,7 +110,7 @@ public class GT_Tool_Scoop extends GT_Tool {
@Override
public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
- if (Loader.isModLoaded(GT_Values.MOD_ID_FR)) {
+ if (Forestry.isModLoaded()) {
aItem.addItemBehavior(aID, new Behaviour_Scoop(200));
} else {
aItem.addItemBehavior(aID, new Behaviour_None());