diff --git a/src/main/java/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/bartworks/common/loaders/ArtificialMicaLine.java index 2a33d44bb3c..70aa9e68797 100644 --- a/src/main/java/bartworks/common/loaders/ArtificialMicaLine.java +++ b/src/main/java/bartworks/common/loaders/ArtificialMicaLine.java @@ -181,7 +181,7 @@ public static void runArtificialMicaRecipe() { GTValues.RA.stdBuilder() .itemInputs(WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1)) .circuit(1) - .itemOutputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4)) + .itemOutputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MicaInsulatorFoil", 4)) .duration(10 * TICKS) .eut(600) .addTo(benderRecipes); diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java index ece0f0a35d4..c105131ce54 100644 --- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java @@ -1218,7 +1218,7 @@ private static boolean isInBlackList(ItemStack stack, List ITEMLIST_V } } if (NewHorizonsCoreMod.isModLoaded()) { - if (stack.getItem() == GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IndustryFrame", 1L) + if (stack.getItem() == GTModHandler.getModItem(NewHorizonsCoreMod.ID, "IndustryFrame", 1L) .getItem()) { return true; } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 8c182b6d9b9..c8d973d1639 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1072,7 +1072,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), GGMaterial.signalium.get(OrePrefixes.bolt, 32), @@ -1087,7 +1087,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), GGMaterial.signalium.get(OrePrefixes.bolt, 32), diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java index 0963d580165..5b29332834a 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader2.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java @@ -1044,7 +1044,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), GTModHandler.getIC2Item("reactorVentCore", 1L, 1)) .itemOutputs(ItemRefer.HiC_T2.get(1)) @@ -1060,7 +1060,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 2)) .itemOutputs(ItemRefer.HiC_T2.get(1)) @@ -1108,7 +1108,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), GTModHandler.getIC2Item("reactorVentGold", 1L, 1)) .itemOutputs(ItemRefer.HiC_T4.get(1)) @@ -1124,7 +1124,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), GTOreDictUnificator.get(OrePrefixes.rotor, Materials.EnergeticAlloy, 2)) .itemOutputs(ItemRefer.HiC_T4.get(1)) @@ -1140,7 +1140,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), Ic2Items.reactorVentSpread) .itemOutputs(ItemRefer.HiC_T5.get(1)) @@ -1156,7 +1156,7 @@ public static void RecipeLoad() { GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), GTOreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenCarbide, 2)) .itemOutputs(ItemRefer.HiC_T5.get(1)) diff --git a/src/main/java/gregtech/api/enums/StoneType.java b/src/main/java/gregtech/api/enums/StoneType.java index 36dceba6093..156102cbae2 100644 --- a/src/main/java/gregtech/api/enums/StoneType.java +++ b/src/main/java/gregtech/api/enums/StoneType.java @@ -108,7 +108,7 @@ public enum StoneType implements IStoneType { Mercury(StoneBuilder.galaxySpace("Mercury", 2, 1)), AlphaCentauri(new StoneBuilder() .setStoneNoCobble(GalaxySpace, "acentauribbsubgrunt", 0) - .setDust(NewHorizonsCoreMod, "item.CentauriASurfaceDust")), + .setDust(NewHorizonsCoreMod, "CentauriASurfaceDust")), TCetiE(StoneBuilder.galaxySpace("TCetiE", 2, 1)), VegaB(StoneBuilder.galaxySpace("VegaB", "subgrunt", 0)), BarnardaE(new StoneBuilder() @@ -146,13 +146,13 @@ public enum StoneType implements IStoneType { Deepslate(new StoneBuilder() .setStoneNoCobble(Mods.EtFuturumRequiem, "deepslate", WILDCARD) - .setDust(NewHorizonsCoreMod, "item.DeepslateDust") + .setDust(NewHorizonsCoreMod, "DeepslateDust") .setCategory(StoneCategory.Stone) .addAllowedDimensions(DimNames.OW)), Tuff(new StoneBuilder() .setStoneNoCobble(Mods.EtFuturumRequiem, "tuff", 0) - .setDust(NewHorizonsCoreMod, "item.TuffDust") + .setDust(NewHorizonsCoreMod, "TuffDust") .setCategory(StoneCategory.Stone) .addAllowedDimensions(DimNames.OW)), @@ -486,7 +486,7 @@ public StoneBuilder addOtherStone(Mods owner, BlockSupplier block, int meta) { public StoneBuilder setCoremodDust(String name) { if (NewHorizonsCoreMod.isModLoaded()) { - pureDust = impureDust = new LazyItem(NewHorizonsCoreMod, "item." + name + "StoneDust"); + pureDust = impureDust = new LazyItem(NewHorizonsCoreMod, name + "StoneDust"); } return this; diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 170fc786b81..d46e38d8e54 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -239,7 +239,7 @@ public void initCombsRecipes() { addCentrifugeToItemStack( CombType.LAPOTRON, new ItemStack[] { GTBees.drop.getStackForType(DropType.LAPIS), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LapotronDust", 1, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "LapotronDust", 1, 0), GTModHandler.getModItem(MagicBees.ID, "wax", 1, 2) }, new int[] { 20 * 100, 100 * 100, 40 * 100 }, Voltage.HV, @@ -627,38 +627,35 @@ public void initCombsRecipes() { addCentrifugeToItemStack( CombType.NAGA, new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 4), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleChip", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleFragment", 1L, 0), - ItemList.FR_Wax.get(1) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "NagaScaleChip", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "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[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 5), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneChip", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneFragment", 1L, 0), - ItemList.FR_Wax.get(1) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "LichBoneChip", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "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[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 1), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.FieryBloodDrop", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "FieryBloodDrop", 1L, 0), GTBees.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[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteChip", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteFragment", 1L, 0), - ItemList.FR_Wax.get(1) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CarminiteChip", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "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[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "SnowQueenBloodDrop", 1L, 0), GTBees.drop.getStackForType(DropType.SNOW_QUEEN), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.EV); @@ -718,17 +715,17 @@ public void initCombsRecipes() { addCentrifugeToItemStack( CombType.RUNEI, new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfPowerFragment", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfAgilityFragment", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVigorFragment", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfDefenseFragment", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfMagicFragment", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RuneOfPowerFragment", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RuneOfAgilityFragment", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RuneOfVigorFragment", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RuneOfDefenseFragment", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RuneOfMagicFragment", 1L, 0) }, new int[] { 25 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100 }, Voltage.IV); addCentrifugeToItemStack( CombType.RUNEII, new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVoidFragment", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RuneOfVoidFragment", 1L, 0) }, new int[] { 50 * 100, (int) (2.5 * 100) }, Voltage.IV); addCentrifugeToItemStack( @@ -760,7 +757,7 @@ public void initCombsRecipes() { CombType.SPACE, new ItemStack[] { ItemList.FR_Wax.get(1L), ItemList.FR_RefractoryWax.get(1L), GTBees.drop.getStackForType(DropType.OXYGEN), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CoinSpace", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CoinSpace", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 15 * 100, 5 * 100 }, Voltage.HV); addProcessGT(CombType.METEORICIRON, new Materials[] { Materials.MeteoricIron }, Voltage.HV); @@ -797,24 +794,24 @@ public void initCombsRecipes() { addCentrifugeToItemStack( CombType.MOON, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MoonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.MV, 300); addCentrifugeToItemStack( CombType.MARS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MarsStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.HV, 300); addCentrifugeToItemStack( CombType.JUPITER, - new ItemStack[] { GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1L, 0), + new ItemStack[] { GTModHandler.getModItem(NewHorizonsCoreMod.ID, "IoStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EuropaIceDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EuropaStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "GanymedeStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CallistoStoneDust", 1L, 0), GTOreDictUnificator.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 }, Voltage.HV, @@ -822,91 +819,91 @@ public void initCombsRecipes() { addCentrifugeToItemStack( CombType.MERCURY, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryCoreDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MercuryCoreDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MercuryStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.EV, 300); addCentrifugeToItemStack( CombType.VENUS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "VenusStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.EV, 300); addCentrifugeToItemStack( CombType.SATURN, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EnceladusStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TitanStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.URANUS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MirandaStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "OberonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.NEPTUNE, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "ProteusStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TritonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.PLUTO, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PlutoStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PlutoIceDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.HAUMEA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HaumeaStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.MAKEMAKE, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MakeMakeStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.CENTAURI, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CentauriASurfaceDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CentauriAStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.TCETI, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TCetiEStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.BARNARDA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1L, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "BarnardaEStoneDust", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "BarnardaFStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.VEGA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1L, 0) }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "VegaBStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.ZPM, 300); diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index bfdd7f1cf83..fbd2c4849df 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -131,7 +131,7 @@ public void initDropsRecipes() { addProcessMV( tDrop, Materials.FierySteel.getFluid(200L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "SnowQueenBloodDrop", 1L, 0), 1500, 48); tDrop = getStackForType(DropType.LAPIS); diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 830d6c50df6..d2e935c5c03 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -89,9 +89,9 @@ public void initPropolisRecipes() { tPropolis = getStackForType(PropolisType.Stardust); addProcessHV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "stardust", 1, 0)); tPropolis = getStackForType(PropolisType.Ectoplasma); - addProcessEV(tPropolis, GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EctoplasmaChip", 1, 0)); + addProcessEV(tPropolis, GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EctoplasmaChip", 1, 0)); tPropolis = getStackForType(PropolisType.Arcaneshard); - addProcessEV(tPropolis, GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneShardChip", 1, 0)); + addProcessEV(tPropolis, GTModHandler.getModItem(NewHorizonsCoreMod.ID, "ArcaneShardChip", 1, 0)); tPropolis = getStackForType(PropolisType.Dragonessence); addProcessIV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 0)); tPropolis = getStackForType(PropolisType.Enderman); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAirFilterBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAirFilterBase.java index d51dc7c582f..2fdc5ac0b18 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAirFilterBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAirFilterBase.java @@ -376,7 +376,7 @@ public CheckRecipeResult checkProcessing() { private ItemStack getCleanFilter() { if (cleanFilter == null) { if (Mods.NewHorizonsCoreMod.isModLoaded()) { - cleanFilter = GTModHandler.getModItem(Mods.NewHorizonsCoreMod.ID, "item.AdsorptionFilter", 1, 0); + cleanFilter = GTModHandler.getModItem(Mods.NewHorizonsCoreMod.ID, "AdsorptionFilter", 1, 0); } if (cleanFilter == null) { // fallback for dev environment @@ -389,7 +389,7 @@ private ItemStack getCleanFilter() { private ItemStack getDirtyFilter() { if (dirtyFilter == null) { if (Mods.NewHorizonsCoreMod.isModLoaded()) { - dirtyFilter = GTModHandler.getModItem(Mods.NewHorizonsCoreMod.ID, "item.AdsorptionFilterDirty", 1, 0); + dirtyFilter = GTModHandler.getModItem(Mods.NewHorizonsCoreMod.ID, "AdsorptionFilterDirty", 1, 0); } if (dirtyFilter == null) { // fallback for dev environment diff --git a/src/main/java/gregtech/crossmod/ae2/AE2Compat.java b/src/main/java/gregtech/crossmod/ae2/AE2Compat.java index fa1a53f7bbe..39c67921b68 100644 --- a/src/main/java/gregtech/crossmod/ae2/AE2Compat.java +++ b/src/main/java/gregtech/crossmod/ae2/AE2Compat.java @@ -97,10 +97,10 @@ private static void registerBlockingModeIgnoreItems() { // GT lenses are registered by ProcessingLens registry.register(WerkstoffLoader.items.get(OrePrefixes.lens)); if (NewHorizonsCoreMod.isModLoaded()) { - registry.register(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassLense")); - registry.register(getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens")); - registry.register(getModItem(NewHorizonsCoreMod.ID, "item.RadoxPolymerLens")); - registry.register(getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens")); + registry.register(getModItem(NewHorizonsCoreMod.ID, "ReinforcedGlassLense")); + registry.register(getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens")); + registry.register(getModItem(NewHorizonsCoreMod.ID, "RadoxPolymerLens")); + registry.register(getModItem(NewHorizonsCoreMod.ID, "ChromaticLens")); } } } diff --git a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java index 9c9051f2435..b317b94b0be 100644 --- a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java @@ -1920,7 +1920,7 @@ public void accept(GTBeeDefinition dis) { MOON(GTBranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MOON), 0.35f); if (NewHorizonsCoreMod.isModLoaded()) - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MoonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -1934,7 +1934,7 @@ public void accept(GTBeeDefinition dis) { }), MARS(GTBranchDefinition.PLANET, "Mars", false, new Color(0x220D05), new Color(0x3A1505), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MARS), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MarsStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1948,8 +1948,8 @@ public void accept(GTBeeDefinition dis) { }), PHOBOS(GTBranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MARS), 0.25f); - if (NewHorizonsCoreMod.isModLoaded()) beeSpecies - .addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1, 0), 0.10f); + if (NewHorizonsCoreMod.isModLoaded()) + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PhobosStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1961,7 +1961,7 @@ public void accept(GTBeeDefinition dis) { }), DEIMOS(GTBranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MARS), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "DeimosStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1973,7 +1973,7 @@ public void accept(GTBeeDefinition dis) { }), CERES(GTBranchDefinition.PLANET, "Ceres", true, new Color(0x3ca5b7), new Color(0x1e7267), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CeresStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1985,12 +1985,12 @@ public void accept(GTBeeDefinition dis) { }), JUPITER(GTBranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CallistoStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty(Materials.CallistoIce.getDust(1), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "IoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EuropaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EuropaIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "GanymedeStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -2003,7 +2003,7 @@ public void accept(GTBeeDefinition dis) { }), IO(GTBranchDefinition.PLANET, "IO", true, new Color(0x734B2E), new Color(0xe5701b), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "IoStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2014,8 +2014,8 @@ public void accept(GTBeeDefinition dis) { }), EUROPA(GTBranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EuropaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EuropaIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -2028,7 +2028,7 @@ public void accept(GTBeeDefinition dis) { }), GANYMEDE(GTBranchDefinition.PLANET, "Ganymede", true, new Color(0x3d1b10), new Color(0x190c07), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "GanymedeStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2039,7 +2039,7 @@ public void accept(GTBeeDefinition dis) { }), CALLISTO(GTBranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CallistoStoneDust", 1, 0), 0.10f); beeSpecies.addSpecialty(Materials.CallistoIce.getDust(1), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); @@ -2052,9 +2052,9 @@ public void accept(GTBeeDefinition dis) { }), SATURN(GTBranchDefinition.PLANET, "Saturn", false, new Color(0xD2A472), new Color(0xF8C37B), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SATURN), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TitanStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EnceladusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EnceladusIceDust", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); @@ -2066,8 +2066,8 @@ public void accept(GTBeeDefinition dis) { }), ENCELADUS(GTBranchDefinition.PLANET, "Enceladus", true, new Color(0xD2A472), new Color(0x193fa0), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SATURN), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EnceladusStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EnceladusIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); @@ -2079,7 +2079,7 @@ public void accept(GTBeeDefinition dis) { }), TITAN(GTBranchDefinition.PLANET, "Titan", true, new Color(0xa0641b), new Color(0x7c1024), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SATURN), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TitanStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2090,8 +2090,8 @@ public void accept(GTBeeDefinition dis) { }), URANUS(GTBranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.URANUS), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MirandaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "OberonStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); @@ -2103,7 +2103,7 @@ public void accept(GTBeeDefinition dis) { }), MIRANDA(GTBranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MirandaStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -2115,7 +2115,7 @@ public void accept(GTBeeDefinition dis) { }), OBERON(GTBranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "OberonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2126,8 +2126,8 @@ public void accept(GTBeeDefinition dis) { }), NEPTUNE(GTBranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEPTUNE), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "ProteusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TritonStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -2140,7 +2140,7 @@ public void accept(GTBeeDefinition dis) { }), PROTEUS(GTBranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEPTUNE), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "ProteusStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -2152,7 +2152,7 @@ public void accept(GTBeeDefinition dis) { }), TRITON(GTBranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEPTUNE), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TritonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -2164,8 +2164,8 @@ public void accept(GTBeeDefinition dis) { }), PLUTO(GTBranchDefinition.PLANET, "Pluto", false, new Color(0x34271E), new Color(0x69503D), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.PLUTO), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PlutoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PlutoIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -2178,7 +2178,7 @@ public void accept(GTBeeDefinition dis) { }), HAUMEA(GTBranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.HAUMEA), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HaumeaStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2189,7 +2189,7 @@ public void accept(GTBeeDefinition dis) { }), MAKEMAKE(GTBranchDefinition.PLANET, "MakeMake", false, new Color(0x301811), new Color(0x120A07), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MAKEMAKE), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MakeMakeStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2200,8 +2200,7 @@ public void accept(GTBeeDefinition dis) { }), CENTAURI(GTBranchDefinition.PLANET, "Centauri", false, new Color(0x2F2A14), new Color(0xB06B32), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CENTAURI), 0.35f); - beeSpecies - .addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CentauriASurfaceDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); beeSpecies.setHasEffect(); @@ -2213,8 +2212,7 @@ public void accept(GTBeeDefinition dis) { }), ACENTAURI(GTBranchDefinition.PLANET, "aCentauri", false, new Color(0x2F2A14), new Color(0xa01e14), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CENTAURI), 0.25f); - beeSpecies - .addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CentauriASurfaceDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), new Consumer<>() { @@ -2229,7 +2227,7 @@ public void accept(GTBeeDefinition dis) { }), TCETI(GTBranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TCETI), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TCetiEStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); @@ -2242,7 +2240,7 @@ public void accept(GTBeeDefinition dis) { }), TCETIE(GTBranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TCETI), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TCetiEStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); @@ -2255,7 +2253,7 @@ public void accept(GTBeeDefinition dis) { // Parents: TCETI and TCETIE, 25% combchance, needs Damp Humidity and Normal temperature. Is Mycophilic SEAWEED(GTBranchDefinition.PLANET, "SeaWeed", true, new Color(0xCBCBCB), new Color(0x83FF83), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SEAWEED), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.15f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "TCetiEStoneDust", 1, 0), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); @@ -2275,8 +2273,8 @@ public void accept(GTBeeDefinition dis) { BARNARDA(GTBranchDefinition.PLANET, "Barnarda", false, new Color(0x0D5A0D), new Color(0xE6C18D), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BARNARDA), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "BarnardaEStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "BarnardaFStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setHasEffect(); @@ -2302,7 +2300,7 @@ public void accept(GTBeeDefinition dis) { }), BARNARDAE(GTBranchDefinition.PLANET, "BarnardaE", false, new Color(0x0D5A0D), new Color(0x4c1f0a), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BARNARDA), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "BarnardaEStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2314,7 +2312,7 @@ public void accept(GTBeeDefinition dis) { }), BARNARDAF(GTBranchDefinition.PLANET, "BarnardaF", false, new Color(0x0D5A0D), new Color(0x1e0b49), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BARNARDA), 0.25f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "BarnardaFStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2326,7 +2324,7 @@ public void accept(GTBeeDefinition dis) { }), VEGA(GTBranchDefinition.PLANET, "Vega", false, new Color(0x1A2036), new Color(0xB5C0DE), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.VEGA), 0.35f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "VegaBStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); @@ -2341,7 +2339,7 @@ public void accept(GTBeeDefinition dis) { VEGAB(GTBranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.VEGA), 0.35f); if (NewHorizonsCoreMod.isModLoaded()) - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "VegaBStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 6733cc07d3e..fad813b19e1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -269,7 +269,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic .itemInputs( GTOreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), GTUtility.copyAmount(0, aStack)) - .itemOutputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0)) + .itemOutputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EtchedLowVoltageWiring", 1L, 0)) .duration(10 * SECONDS) .eut(16) .addTo(laserEngraverRecipes); diff --git a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java index d81acf784c0..7f8d610e490 100644 --- a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java @@ -29,9 +29,9 @@ public class NaniteChain { public static void run() { - ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0); - ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0); - ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.RadoxPolymerLens", 0); + ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0); + ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.ID, "ChromaticLens", 0); + ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.ID, "RadoxPolymerLens", 0); ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0); ItemStack aUMVTierLens = GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false); @@ -182,7 +182,7 @@ public static void run() { GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better // naming Materials.WhiteDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 32), ItemList.Circuit_Parts_Crystal_Chip_Wetware.get(64)) .itemOutputs(Materials.WhiteDwarfMatter.getNanite(4)) .fluidInputs( @@ -202,7 +202,7 @@ public static void run() { GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better // naming Materials.BlackDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 32), ItemList.Circuit_Parts_Crystal_Chip_Wetware.get(64)) .itemOutputs(Materials.BlackDwarfMatter.getNanite(4)) .fluidInputs( @@ -222,7 +222,7 @@ public static void run() { // Quantum Anomaly, couldn't find any better naming. GregtechItemList.Laser_Lens_Special.get(0), Materials.Universium.getBlocks(8), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 32), ItemList.Circuit_Parts_Chip_Bioware.get(64)) .itemOutputs(Materials.Universium.getNanite(2)) .fluidInputs( @@ -242,7 +242,7 @@ public static void run() { GregtechItemList.Laser_Lens_Special.get(0), Materials.TranscendentMetal.getNanite(1), Materials.Eternity.getBlocks(8), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 32), ItemList.Timepiece.get(4)) .itemOutputs(Materials.Eternity.getNanite(4)) .fluidInputs( @@ -261,7 +261,7 @@ public static void run() { GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcillium, 0, false), Materials.Universium.getNanite(1), Materials.MagMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 64), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1)) .itemOutputs(Materials.MagMatter.getNanite(1)) .fluidInputs( diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 71f2ebbd08f..e8f8d2680af 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -1377,7 +1377,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0), + getModItem(NewHorizonsCoreMod.ID, "ArtificialLeather", 1L, 0), new ItemStack(Items.lead, 1, 32767)) .itemOutputs(new ItemStack(Items.name_tag, 1, 0)) .fluidInputs(Materials.Glue.getFluid(1 * HALF_INGOTS)) @@ -1653,7 +1653,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), - getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0)) + getModItem(NewHorizonsCoreMod.ID, "ArtificialLeather", 1L, 0)) .itemOutputs(new ItemStack(Items.book, 1, 0)) .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) @@ -1681,7 +1681,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( ItemList.Paper_Printed_Pages.get(1), - getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0)) + getModItem(NewHorizonsCoreMod.ID, "ArtificialLeather", 1L, 0)) .itemOutputs(new ItemStack(Items.written_book, 1, 0)) .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) @@ -6139,7 +6139,7 @@ private void withRailcraft() { ItemList.FR_Casing_Sturdy.get(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1)) .circuit(1) - .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "EngineCore", 1L, 0)) .fluidInputs(Materials.SeedOil.getFluid(250)) .duration(5 * SECONDS) .eut(16) @@ -6151,7 +6151,7 @@ private void withRailcraft() { ItemList.FR_Casing_Sturdy.get(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1)) .circuit(1) - .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "EngineCore", 1L, 0)) .fluidInputs(Materials.Lubricant.getFluid(125)) .duration(5 * SECONDS) .eut(16) @@ -6169,7 +6169,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "EngineCore", 1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10)) .circuit(10) .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 7)) @@ -6179,7 +6179,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "EngineCore", 1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10)) .circuit(10) .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 8)) @@ -6189,7 +6189,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "EngineCore", 1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10)) .circuit(10) .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 9)) @@ -6278,7 +6278,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2), - getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "SteelBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .duration(20 * SECONDS) @@ -6316,7 +6316,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Polyethylene, 2), - getModItem(NewHorizonsCoreMod.ID, "item.AluminiumBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "AluminiumBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .duration(40 * SECONDS) @@ -6354,7 +6354,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2), - getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "StainlessSteelBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .duration(20 * SECONDS) @@ -6392,7 +6392,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2), - getModItem(NewHorizonsCoreMod.ID, "item.TitaniumBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "TitaniumBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .duration(40 * SECONDS) @@ -6430,7 +6430,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2), - getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "TungstenSteelBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .duration(20 * SECONDS) @@ -6468,7 +6468,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2), - getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "ChromeBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .duration(40 * SECONDS) @@ -6506,7 +6506,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2), - getModItem(NewHorizonsCoreMod.ID, "item.IridiumBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "IridiumBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .duration(20 * SECONDS) @@ -6544,7 +6544,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2), - getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "OsmiumBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .duration(40 * SECONDS) @@ -6582,7 +6582,7 @@ private void withRailcraft() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2), - getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 2)) + getModItem(NewHorizonsCoreMod.ID, "NeutroniumBars", 2)) .circuit(22) .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .duration(20 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index d4aa1de047d..203146dd4ee 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -845,7 +845,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 16), new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, NewHorizonsCoreMod.isModLoaded() - ? GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4) + ? GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier3", 4) : ItemList.Casing_Firebox_TungstenSteel.get(16), ItemList.Large_Fluid_Cell_Osmium.get(1), GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.MysteriousCrystal, 1), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 6ab3508c629..609a51286bd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -1289,7 +1289,7 @@ public void registerBoth() { GTValues.RA.stdBuilder() .itemInputs( Materials.CobaltIINitrate.getDust(9), - getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6L, 0)) + getModItem(NewHorizonsCoreMod.ID, "PotassiumHydroxideDust", 6L, 0)) .itemOutputs(Materials.CobaltIIHydroxide.getDust(5), Materials.Saltpeter.getDust(10)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index 580c2503331..415c6d213ac 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -181,7 +181,7 @@ public void registerForestryRecipes() { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L), - getModItem(NewHorizonsCoreMod.ID, "item.LongObsidianRod", 2L, 0), + getModItem(NewHorizonsCoreMod.ID, "LongObsidianRod", 2L, 0), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 3e8ba614434..8fa23e011d5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -178,14 +178,14 @@ public void run() { .addTo(fluidExtractionRecipes); GTValues.RA.stdBuilder() - .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0)) + .itemInputs(getModItem(NewHorizonsCoreMod.ID, "ReinforcedGlassPlate", 1L, 0)) .fluidOutputs(Materials.ReinforcedGlass.getMolten(1 * HALF_INGOTS)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) .addTo(fluidExtractionRecipes); GTValues.RA.stdBuilder() - .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassLense", 1L, 0)) + .itemInputs(getModItem(NewHorizonsCoreMod.ID, "ReinforcedGlassLense", 1L, 0)) .fluidOutputs(Materials.ReinforcedGlass.getMolten(54)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index 21da442f669..82142055c9f 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -126,7 +126,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemStandarParticleBase, 1, 24), - getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0), + getModItem(NewHorizonsCoreMod.ID, "ChromaticLens", 0), new ItemStack(huiCircuit, 0, 4)) .fluidInputs(Materials.ExcitedDTRC.getFluid(92), Materials.Duranium.getMolten(1 * INGOTS)) .itemOutputs(GregtechItemList.Laser_Lens_Special.get(1)) diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java b/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java index 216ca67b161..cc012a970ef 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java @@ -158,25 +158,25 @@ public void run() { ImmutableMap.of( NewHorizonsCoreMod.ID, ImmutableMap.builder() - .put("item.AluminiumBars", Materials.Aluminium) - .put("item.ChromeBars", Materials.Chrome) - .put("item.ConductiveIronBars", Materials.ConductiveIron) - .put("item.ElectricalSteelBars", Materials.ElectricalSteel) - .put("item.EnderiumBars", Materials.Enderium) - .put("item.EnderiumBaseBars", Materials.EnderiumBase) - .put("item.EnergeticAlloyBars", Materials.EnergeticAlloy) - .put("item.IridiumBars", Materials.Iridium) - .put("item.NeutroniumBars", Materials.Neutronium) - .put("item.OsmiumBars", Materials.Osmium) - .put("item.PulsatingIronBars", Materials.PulsatingIron) - .put("item.RedstoneAlloyBars", Materials.RedstoneAlloy) - .put("item.SoulariumBars", Materials.Soularium) - .put("item.StainlessSteelBars", Materials.StainlessSteel) - .put("item.SteelBars", Materials.Steel) - .put("item.TitaniumBars", Materials.Titanium) - .put("item.TungstenBars", Materials.Tungsten) - .put("item.TungstenSteelBars", Materials.TungstenSteel) - .put("item.VibrantAlloyBars", Materials.VibrantAlloy) + .put("AluminiumBars", Materials.Aluminium) + .put("ChromeBars", Materials.Chrome) + .put("ConductiveIronBars", Materials.ConductiveIron) + .put("ElectricalSteelBars", Materials.ElectricalSteel) + .put("EnderiumBars", Materials.Enderium) + .put("EnderiumBaseBars", Materials.EnderiumBase) + .put("EnergeticAlloyBars", Materials.EnergeticAlloy) + .put("IridiumBars", Materials.Iridium) + .put("NeutroniumBars", Materials.Neutronium) + .put("OsmiumBars", Materials.Osmium) + .put("PulsatingIronBars", Materials.PulsatingIron) + .put("RedstoneAlloyBars", Materials.RedstoneAlloy) + .put("SoulariumBars", Materials.Soularium) + .put("StainlessSteelBars", Materials.StainlessSteel) + .put("SteelBars", Materials.Steel) + .put("TitaniumBars", Materials.Titanium) + .put("TungstenBars", Materials.Tungsten) + .put("TungstenSteelBars", Materials.TungstenSteel) + .put("VibrantAlloyBars", Materials.VibrantAlloy) .build(), EnderIO.ID, ImmutableMap.builder() diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java index 7bd4d9fb71c..a86e9ec9e01 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java @@ -303,63 +303,63 @@ public void run() { GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.ULV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitULV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.LV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitLV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.MV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitMV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.HV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitHV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitHV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.EV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitEV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.IV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitIV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.LuV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitLuV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.ZPM, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitZPM", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.UV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitUV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.UHV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitUHV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.UEV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitUEV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.UIV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitUIV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.UMV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitUMV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.UXV, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitUXV", 1L)); GTOreDictUnificator.registerOre( OrePrefixes.circuit, Materials.MAX, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L)); + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "CircuitMAX", 1L)); GTOreDictUnificator .registerOre(OrePrefixes.block, Materials.Manasteel, GTModHandler.getModItem(Botania.ID, "storage", 1L)); diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java index e60ef979b52..12f7fabbb3f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java @@ -1189,7 +1189,7 @@ private static void dehydratorRecipes() { if (NewHorizonsCoreMod.isModLoaded()) { GTValues.RA.stdBuilder() - .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 2L, 0)) + .itemInputs(getModItem(NewHorizonsCoreMod.ID, "ArtificialLeather", 2L, 0)) .circuit(18) .itemOutputs(getModItem(Backpack.ID, "tannedLeather", 1)) .fluidInputs(new FluidStack(GTPPFluids.Ethylbenzene, 1_000)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java index 15973183f0f..a37ca2d600a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java @@ -429,7 +429,7 @@ private static void quantumTransformerRecipes() { .copyAmountUnsafe(64 * 32, getModItem(GalaxySpace.ID, "tcetiedandelions", 1, 4)); GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get("cropSeaweed", 64), Materials.Mytryl.getDust(16)) - .itemOutputs(seaweed, getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 16)) + .itemOutputs(seaweed, getModItem(NewHorizonsCoreMod.ID, "TCetiESeaweedExtract", 16)) .fluidInputs(FluidRegistry.getFluidStack("unknowwater", 25_000)) .fluidOutputs( FluidRegistry.getFluidStack("seaweedbroth", 50_000), @@ -691,7 +691,7 @@ private static void catalystRecipes() { GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.EmptyCatalystCarrier.get(1), - getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 64), + getModItem(NewHorizonsCoreMod.ID, "TCetiESeaweedExtract", 64), GTOreDictUnificator.get("dustIodine", 64), Materials.TranscendentMetal.getNanite(1)) .circuit(10) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGlueLine.java index 88009d7d172..3b93aeb78f4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGlueLine.java @@ -432,7 +432,7 @@ private static void glueUsageRecipes() { .itemInputs( getModItem(Mods.GalacticraftMars.ID, "item.itemBasicAsteroids", 1, 7), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8), - getModItem(Mods.NewHorizonsCoreMod.ID, "item.TungstenString", 8)) + getModItem(Mods.NewHorizonsCoreMod.ID, "TungstenString", 8)) .circuit(1) .itemOutputs(getModItem(Mods.GalaxySpace.ID, "item.ThermalClothT2", 1)) .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(576)) diff --git a/src/main/java/gtnhintergalactic/recipe/MachineRecipes.java b/src/main/java/gtnhintergalactic/recipe/MachineRecipes.java index b7105baa9c7..f843c5ea4d3 100644 --- a/src/main/java/gtnhintergalactic/recipe/MachineRecipes.java +++ b/src/main/java/gtnhintergalactic/recipe/MachineRecipes.java @@ -77,7 +77,7 @@ public void run() { new Object[] { GTModHandler.getModItem(OpenBlocks.ID, "elevator", 1), GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 64), ItemList.Field_Generator_UV.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier7", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyPlateTier7", 32), ItemList.Circuit_Chip_PPIC.get(64), GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 64), ItemList.Electric_Motor_UV.get(32), ItemList.SpaceElevatorBaseCasing.get(8) }, @@ -591,7 +591,7 @@ public void run() { new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.NaquadahAlloy, 8), ItemList.Robot_Arm_IV.get(8), ItemList.Field_Generator_IV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier4", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyPlateTier4", 32), new ItemStack(AsteroidsItems.basicItem, 4, 1), ItemList.Sensor_IV.get(8) }, new FluidStack[] { MaterialsAlloy.INDALLOY_140.getFluidStack(10 * INGOTS), Materials.Iridium.getMolten(10 * INGOTS), @@ -610,8 +610,8 @@ public void run() { new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Naquadria, 8), ItemList.Robot_Arm_LuV.get(8), ItemList.Field_Generator_LuV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier5", 32), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyPlateTier5", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier3", 4), ItemList.Sensor_LuV.get(8) }, new FluidStack[] { MaterialsAlloy.INDALLOY_140.getFluidStack(20 * INGOTS), Materials.Osmiridium.getMolten(10 * INGOTS), @@ -630,8 +630,8 @@ public void run() { new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Neutronium, 8), ItemList.Robot_Arm_ZPM.get(8), ItemList.Field_Generator_ZPM.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier6", 32), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyPlateTier6", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier3", 4), ItemList.Sensor_ZPM.get(8) }, new FluidStack[] { MaterialsAlloy.INDALLOY_140.getFluidStack(20 * INGOTS), Materials.Osmiridium.getMolten(10 * INGOTS), @@ -650,8 +650,8 @@ public void run() { new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), ItemList.Robot_Arm_UV.get(8), ItemList.Field_Generator_UV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier7", 32), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 4), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyPlateTier7", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier4", 4), ItemList.Sensor_UV.get(8) }, new FluidStack[] { MaterialsAlloy.INDALLOY_140.getFluidStack(20 * INGOTS), Materials.Naquadria.getMolten(10 * INGOTS), @@ -670,8 +670,8 @@ public void run() { new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Infinity, 8), ItemList.Robot_Arm_UHV.get(8), ItemList.Field_Generator_UHV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier8", 32), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 4), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyPlateTier8", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier4", 4), ItemList.Sensor_UHV.get(8) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(20 * INGOTS), Materials.Neutronium.getMolten(10 * INGOTS), @@ -692,7 +692,7 @@ public void run() { new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), ItemList.Robot_Arm_UEV.get(8), ItemList.Field_Generator_UEV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4 }, GTUtility.copyAmount(32, t9Plate), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier4", 8), ItemList.Sensor_UEV.get(8) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(20 * INGOTS), Materials.Quantium.getMolten(10 * INGOTS), @@ -711,7 +711,7 @@ public void run() { new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), ItemList.Robot_Arm_UIV.get(8), ItemList.Field_Generator_UIV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4 }, GTUtility.copyAmount(64, t9Plate), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 16), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier4", 16), ItemList.Sensor_UIV.get(8) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(40 * INGOTS), Materials.Quantium.getMolten(20 * INGOTS), @@ -731,7 +731,7 @@ public void run() { ItemList.Robot_Arm_UMV.get(8), ItemList.Field_Generator_UMV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, GTUtility.copyAmount(64, t9Plate), GTUtility.copyAmount(64, t9Plate), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier4", 32), ItemList.Sensor_UMV.get(8) }, new FluidStack[] { new FluidStack(hypogenFluid, 4 * INGOTS), new FluidStack(celestialTungstenFluid, 4 * INGOTS), @@ -751,7 +751,7 @@ public void run() { ItemList.Robot_Arm_UXV.get(8), ItemList.Field_Generator_UXV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 8 }, GTUtility.copyAmount(64, t9Plate), GTUtility.copyAmount(64, t9Plate), GTUtility.copyAmount(64, t9Plate), GTUtility.copyAmount(64, t9Plate), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 64), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "HeavyDutyRocketEngineTier4", 64), ItemList.Sensor_UXV.get(8) }, new FluidStack[] { Materials.Space.getMolten(4 * INGOTS), Materials.Universium.getMolten(4 * INGOTS), new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512_000) }, diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java index fd3aeb82065..4f0f9b315b6 100644 --- a/src/main/java/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java @@ -275,7 +275,7 @@ public static void loadAccelerator() { .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - ItemStack insulator = GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorSheet", 1); + ItemStack insulator = GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MicaInsulatorSheet", 1); // Coolant Delivery Casing @@ -650,7 +650,7 @@ public static void loadAccelerator() { .itemInputs( new ItemStack(LanthItemList.MASKED_MASK), GGMaterial.lithiumChloride.get(OrePrefixes.dust, 2), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 4)) + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PotassiumHydroxideDust", 4)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK2))) .duration(80 * GTRecipeBuilder.SECONDS) .eut(TierEU.RECIPE_ZPM) @@ -1033,7 +1033,7 @@ public static void loadGeneral() { GTValues.RA.stdBuilder() .itemInputs( Materials.Pyrolusite.getDust(6), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PotassiumHydroxideDust", 6), WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5)) .itemOutputs( WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), @@ -1056,7 +1056,7 @@ public static void loadGeneral() { // 6KOH + 6Cl = KClO3 + 5KCl + 3H2O GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 18)) + .itemInputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PotassiumHydroxideDust", 18)) .circuit(3) .itemOutputs( Materials.RockSalt.getDust(10), @@ -2209,7 +2209,7 @@ public static void loadLanthanideRecipes() { // Lanthanum GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Lanthanum.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2221,7 +2221,7 @@ public static void loadLanthanideRecipes() { // Praseodymium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Praseodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2233,7 +2233,7 @@ public static void loadLanthanideRecipes() { // Cerium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Cerium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2245,7 +2245,7 @@ public static void loadLanthanideRecipes() { // Neodymium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Neodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2257,7 +2257,7 @@ public static void loadLanthanideRecipes() { // Sm GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Samarium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2269,7 +2269,7 @@ public static void loadLanthanideRecipes() { // Europium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Europium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2281,7 +2281,7 @@ public static void loadLanthanideRecipes() { // Gadolinium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Gadolinium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2293,7 +2293,7 @@ public static void loadLanthanideRecipes() { // Terbium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Terbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2305,7 +2305,7 @@ public static void loadLanthanideRecipes() { // Dysprosium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Dysprosium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2317,7 +2317,7 @@ public static void loadLanthanideRecipes() { // Holmium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Holmium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2329,7 +2329,7 @@ public static void loadLanthanideRecipes() { // Erbium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Erbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2341,7 +2341,7 @@ public static void loadLanthanideRecipes() { // Thulium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Thulium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2353,7 +2353,7 @@ public static void loadLanthanideRecipes() { // Ytterbium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Ytterbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) @@ -2365,7 +2365,7 @@ public static void loadLanthanideRecipes() { // Lutetium GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MysteriousCrystalLens", 0), Materials.Lutetium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(GGMaterial.P507.getFluidOrGas(4_000)) diff --git a/src/main/java/kekztech/common/recipeLoaders/AssemblyLine.java b/src/main/java/kekztech/common/recipeLoaders/AssemblyLine.java index 390fb363d99..7b594844938 100644 --- a/src/main/java/kekztech/common/recipeLoaders/AssemblyLine.java +++ b/src/main/java/kekztech/common/recipeLoaders/AssemblyLine.java @@ -39,11 +39,11 @@ public void run() { ItemList.Casing_Tank_7.get(4), GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6), GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Naquadah, 3), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 6), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "ChromeBars", 6), GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Quantium, 6), ItemList.Field_Generator_EV.get(8), ItemList.FluidRegulator_LuV.get(1), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 4)) + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngineeringProcessorFluidEmeraldCore", 4)) .fluidInputs(Materials.Enderium.getMolten(10 * INGOTS), Materials.Polybenzimidazole.getMolten(11 * INGOTS)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 6)) .eut(TierEU.RECIPE_LuV) @@ -58,12 +58,12 @@ public void run() { ItemList.Casing_Tank_10.get(16), GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6), GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.NetherStar, 3), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 6), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "OsmiumBars", 6), GTOreDictUnificator.get(OrePrefixes.rotor, Materials.MysteriousCrystal, 6), ItemList.Field_Generator_IV.get(16), ItemList.Field_Generator_LuV.get(4), ItemList.FluidRegulator_UV.get(1), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 16)) + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "EngineeringProcessorFluidEmeraldCore", 16)) .fluidInputs( Materials.CrystallineAlloy.getMolten(20 * INGOTS), Materials.Polybenzimidazole.getMolten(14 * INGOTS)) @@ -81,7 +81,7 @@ public void run() { ItemList.Machine_Multi_NeutroniumCompressor.get(1), GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 12), GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.DraconiumAwakened, 3), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 6), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "NeutroniumBars", 6), GTOreDictUnificator.get(OrePrefixes.rotor, Materials.InfinityCatalyst, 6), ItemList.Field_Generator_ZPM.get(16), ItemList.Field_Generator_UV.get(4), diff --git a/src/main/java/kekztech/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/kekztech/common/recipeLoaders/ResearchableAssemblyLine.java index 2265af73550..cfcc201a71c 100644 --- a/src/main/java/kekztech/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/kekztech/common/recipeLoaders/ResearchableAssemblyLine.java @@ -79,8 +79,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24), HYPOGEN.getPlateDouble(64), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4 }, ItemList.ZPM4.get(8L), ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), - ItemList.Circuit_Wafer_QPIC.get(64), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64), + ItemList.Circuit_Wafer_QPIC.get(64), GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RawPicoWafer", 64), ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32), GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(2 * STACKS), @@ -101,8 +100,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24), DRAGON_METAL.getPlateDouble(64), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, ItemList.ZPM5.get(8L), ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), - ItemList.Circuit_Wafer_QPIC.get(64), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), + ItemList.Circuit_Wafer_QPIC.get(64), GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 64), ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(4 * STACKS), diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java index af7488c9d1e..1b50e836329 100644 --- a/src/main/java/kubatech/loaders/DEFCRecipes.java +++ b/src/main/java/kubatech/loaders/DEFCRecipes.java @@ -216,7 +216,7 @@ private static void fusionRecipes() { GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "ManyullynCrystal", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(10 * INGOTS)) .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) diff --git a/src/main/java/kubatech/loaders/HTGRLoader.java b/src/main/java/kubatech/loaders/HTGRLoader.java index 675547bc616..f4d86ea0b7e 100644 --- a/src/main/java/kubatech/loaders/HTGRLoader.java +++ b/src/main/java/kubatech/loaders/HTGRLoader.java @@ -341,7 +341,7 @@ public static void load() { .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 1L), GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1L), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 16), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "MicaInsulatorFoil", 16), GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4L), ItemList.Alumina_Support_Ring.get(2L)) .itemOutputs(ItemList.Casing_Insulated_Fluid_Pipe.get(1L)) diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java index a4830cc1ad8..9441068ddef 100644 --- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -760,7 +760,7 @@ public void run() { new Object[] { OrePrefixes.circuit.get(Materials.UV), 2L }, getModItem(Avaritia.ID, "Singularity", 2L, 0), GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 6), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 2, 0), ItemList.Field_Generator_UHV.get(1L) }, + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 2, 0), ItemList.Field_Generator_UHV.get(1L) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 8_000), MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(1 * STACKS), Materials.NaquadahEnriched.getMolten(9 * INGOTS) }, @@ -782,7 +782,7 @@ public void run() { new Object[] { OrePrefixes.circuit.get(Materials.IV), 2L }, GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2), ItemList.Super_Chest_IV.get(1), ItemList.Super_Tank_IV.get(1), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 1, 0), }, + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 1, 0), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 1_000), MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(4 * INGOTS), Materials.NaquadahEnriched.getMolten(2 * INGOTS) }, @@ -830,7 +830,7 @@ public void run() { // Deep Dark Portal TTRecipeAdder.addResearchableAssemblylineRecipe( - getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier8", 1, 0), + getModItem(NewHorizonsCoreMod.ID, "HeavyDutyPlateTier8", 1, 0), 16_777_216, 2048, (int) TierEU.RECIPE_UHV, @@ -839,7 +839,7 @@ public void run() { getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4 }, - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32, 0), ItemList.Robot_Arm_UIV.get(4), + getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 32, 0), ItemList.Robot_Arm_UIV.get(4), ItemList.Emitter_UIV.get(4), ItemList.Sensor_UIV.get(4), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 50_000), Materials.Infinity.getMolten(8 * STACKS), Materials.Cheese.getMolten(232_000L), }, @@ -917,7 +917,7 @@ public void run() { new Object[] { HYPOGEN.getPlateDouble(64), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4 }, ItemList.ZPM4.get(8L), ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "RawPicoWafer", 64), ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32), GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(2 * STACKS), @@ -938,7 +938,7 @@ public void run() { new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, ItemList.ZPM5.get(8L), ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "PicoWafer", 64), ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(4 * STACKS), @@ -2896,7 +2896,7 @@ private void addEOHRecipes() { CustomItemList.Machine_Multi_Transformer.get(16), ItemList.Wireless_Hatch_Energy_UMV.get(4), CustomItemList.eM_energyTunnel5_UMV.get(1), // High Energy Flow Circuit. - getModItem(NewHorizonsCoreMod.ID, "item.HighEnergyFlowCircuit", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "HighEnergyFlowCircuit", 64, 0), // Metastable Oganesson Plate. GTOreDictUnificator.get("plateMetastableOganesson", 6), diff --git a/src/main/java/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/tectech/recipe/EyeOfHarmonyRecipe.java index 9915a78df18..8b19479c5b8 100644 --- a/src/main/java/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/tectech/recipe/EyeOfHarmonyRecipe.java @@ -207,32 +207,32 @@ private ItemStack getStoneDustType(String key) { return switch (key) { case "Ne" -> GTOreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1); case "ED", "VA", "EA" -> GTOreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1); - case "Mo" -> getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1, placeholder); - case "De" -> getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1, placeholder); - case "Ma" -> getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1, placeholder); - case "Ph" -> getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1, placeholder); - case "As", "KB" -> getModItem(NewHorizonsCoreMod.ID, "item.AsteroidsStoneDust", 1, placeholder); - case "Ca" -> getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, placeholder); - case "Ce" -> getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1, placeholder); - case "Eu" -> getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, placeholder); - case "Ga" -> getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, placeholder); - case "Io" -> getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, placeholder); - case "Me" -> getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1, placeholder); - case "Ve" -> getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1, placeholder); - case "En" -> getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, placeholder); - case "Mi" -> getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, placeholder); - case "Ob" -> getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, placeholder); - case "Ti" -> getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, placeholder); - case "Pr" -> getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, placeholder); - case "Tr" -> getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, placeholder); - case "Ha" -> getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1, placeholder); - case "MM" -> getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1, placeholder); - case "Pl" -> getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1, placeholder); - case "BE" -> getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, placeholder); - case "BF" -> getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, placeholder); - case "CB" -> getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1, placeholder); - case "TE" -> getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, placeholder); - case "VB" -> getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, placeholder); + case "Mo" -> getModItem(NewHorizonsCoreMod.ID, "MoonStoneDust", 1, placeholder); + case "De" -> getModItem(NewHorizonsCoreMod.ID, "DeimosStoneDust", 1, placeholder); + case "Ma" -> getModItem(NewHorizonsCoreMod.ID, "MarsStoneDust", 1, placeholder); + case "Ph" -> getModItem(NewHorizonsCoreMod.ID, "PhobosStoneDust", 1, placeholder); + case "As", "KB" -> getModItem(NewHorizonsCoreMod.ID, "AsteroidsStoneDust", 1, placeholder); + case "Ca" -> getModItem(NewHorizonsCoreMod.ID, "CallistoStoneDust", 1, placeholder); + case "Ce" -> getModItem(NewHorizonsCoreMod.ID, "CeresStoneDust", 1, placeholder); + case "Eu" -> getModItem(NewHorizonsCoreMod.ID, "EuropaStoneDust", 1, placeholder); + case "Ga" -> getModItem(NewHorizonsCoreMod.ID, "GanymedeStoneDust", 1, placeholder); + case "Io" -> getModItem(NewHorizonsCoreMod.ID, "IoStoneDust", 1, placeholder); + case "Me" -> getModItem(NewHorizonsCoreMod.ID, "MercuryStoneDust", 1, placeholder); + case "Ve" -> getModItem(NewHorizonsCoreMod.ID, "VenusStoneDust", 1, placeholder); + case "En" -> getModItem(NewHorizonsCoreMod.ID, "EnceladusStoneDust", 1, placeholder); + case "Mi" -> getModItem(NewHorizonsCoreMod.ID, "MirandaStoneDust", 1, placeholder); + case "Ob" -> getModItem(NewHorizonsCoreMod.ID, "OberonStoneDust", 1, placeholder); + case "Ti" -> getModItem(NewHorizonsCoreMod.ID, "TitanStoneDust", 1, placeholder); + case "Pr" -> getModItem(NewHorizonsCoreMod.ID, "ProteusStoneDust", 1, placeholder); + case "Tr" -> getModItem(NewHorizonsCoreMod.ID, "TritonStoneDust", 1, placeholder); + case "Ha" -> getModItem(NewHorizonsCoreMod.ID, "HaumeaStoneDust", 1, placeholder); + case "MM" -> getModItem(NewHorizonsCoreMod.ID, "MakeMakeStoneDust", 1, placeholder); + case "Pl" -> getModItem(NewHorizonsCoreMod.ID, "PlutoStoneDust", 1, placeholder); + case "BE" -> getModItem(NewHorizonsCoreMod.ID, "BarnardaEStoneDust", 1, placeholder); + case "BF" -> getModItem(NewHorizonsCoreMod.ID, "BarnardaFStoneDust", 1, placeholder); + case "CB" -> getModItem(NewHorizonsCoreMod.ID, "CentauriAStoneDust", 1, placeholder); + case "TE" -> getModItem(NewHorizonsCoreMod.ID, "TCetiEStoneDust", 1, placeholder); + case "VB" -> getModItem(NewHorizonsCoreMod.ID, "VegaBStoneDust", 1, placeholder); default -> placeholder; }; } diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java index b7ceff87074..fe944aa5ed2 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java @@ -344,8 +344,8 @@ public static void run() { // 20k heat cap max! new RackComponent(ItemList.Circuit_OpticalComputer.get(1), 240, 22, -1f, 8000, true); // UEV new RackComponent(ItemList.Circuit_OpticalMainframe.get(1), 260, 20, -1f, 8000, true); // UIV - new RackComponent(getModItem(NewHorizonsCoreMod.ID, "item.PikoCircuit", 1), 260, 12, -1f, 9500, true); // UMV - new RackComponent(getModItem(NewHorizonsCoreMod.ID, "item.QuantumCircuit", 1), 320, 10, -1f, 10000, true); // UXV + new RackComponent(getModItem(NewHorizonsCoreMod.ID, "PikoCircuit", 1), 260, 12, -1f, 9500, true); // UMV + new RackComponent(getModItem(NewHorizonsCoreMod.ID, "QuantumCircuit", 1), 320, 10, -1f, 10000, true); // UXV } if (OpenComputers.isModLoaded()) {