aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items/ItemComb.java
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/items/ItemComb.java
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/items/ItemComb.java')
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java93
1 files changed, 48 insertions, 45 deletions
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),