diff options
Diffstat (limited to 'src/main')
475 files changed, 2244 insertions, 1761 deletions
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java index d60a25024f..450a85d3d6 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -141,7 +141,7 @@ public enum Element { Ma(0, 0, 100, -1, null, "Magic", false), Nq(130, 200, 0, -1, null, "Naquadah", false), - Nt(0, 1000, 0, -1, null, "Neutronium", false), + Nt(0, 100, 0, -1, null, "Neutronium", false), $H(-1, -0, 0, -1, null, "Anti-Hydrogen", false), $D(-1, -1, 0, -1, "H", "Anti-Deuterium", true), diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 2ee24b8b5a..8cadd17246 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -235,7 +235,8 @@ public class GT_Values { MOD_ID_GC_CORE = "GalacticraftCore", MOD_ID_GC_MARS = "GalacticraftMars", MOD_ID_GC_PLANETS = "GalacticraftPlanets", - MOD_ID_DC = "dreamcraft"; + MOD_ID_DC = "dreamcraft", + MOD_ID_GTPP = "miscutils"; /** * File Paths and Resource Paths */ diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index c737d4b15f..4453d16653 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -194,6 +194,36 @@ public enum ItemList implements IItemContainer { Shape_Extruder_Turbine_Blade, Shape_Extruder_Small_Gear, Shape_Extruder_ToolHeadDrill, + + White_Dwarf_Shape_Extruder_Bottle, + White_Dwarf_Shape_Extruder_Plate, + White_Dwarf_Shape_Extruder_Cell, + White_Dwarf_Shape_Extruder_Ring, + White_Dwarf_Shape_Extruder_Rod, + White_Dwarf_Shape_Extruder_Bolt, + White_Dwarf_Shape_Extruder_Ingot, + White_Dwarf_Shape_Extruder_Wire, + White_Dwarf_Shape_Extruder_Casing, + White_Dwarf_Shape_Extruder_Pipe_Tiny, + White_Dwarf_Shape_Extruder_Pipe_Small, + White_Dwarf_Shape_Extruder_Pipe_Medium, + White_Dwarf_Shape_Extruder_Pipe_Large, + White_Dwarf_Shape_Extruder_Pipe_Huge, + White_Dwarf_Shape_Extruder_Block, + White_Dwarf_Shape_Extruder_Sword, + White_Dwarf_Shape_Extruder_Pickaxe, + White_Dwarf_Shape_Extruder_Shovel, + White_Dwarf_Shape_Extruder_Axe, + White_Dwarf_Shape_Extruder_Hoe, + White_Dwarf_Shape_Extruder_Hammer, + White_Dwarf_Shape_Extruder_File, + White_Dwarf_Shape_Extruder_Saw, + White_Dwarf_Shape_Extruder_Gear, + White_Dwarf_Shape_Extruder_Rotor, + White_Dwarf_Shape_Extruder_Turbine_Blade, + White_Dwarf_Shape_Extruder_Small_Gear, + White_Dwarf_Shape_Extruder_ToolHeadDrill, + Crate_Empty, Credit_Copper, Credit_Iron, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 8d14f62c52..b9b76bad54 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -97,7 +97,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Mercury = new Materials( 87, TextureSet.SET_SHINY , 1.0F, 0, 0, 16|32 , 255, 220, 220, 0, "Mercury" , "Mercury" , 5, 32, 234, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Element.Hg , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.AQUA, 1), new TC_AspectStack(TC_Aspects.VENENUM, 1))); public static Materials Molybdenum = new Materials( 48, TextureSet.SET_SHINY , 7.0F, 512, 2, 1|2 |8 |32|64 , 180, 180, 220, 0, "Molybdenum" , "Molybdenum" , 0, 0, 2896, 0, false, false, 1, 1, 1, Dyes.dyeBlue , Element.Mo , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1))); public static Materials Neodymium = new Materials( 67, TextureSet.SET_METALLIC , 7.0F, 512, 2, 1|2 |8 |32|64|128 , 100, 100, 100, 0, "Neodymium" , "Neodymium" , 0, 0, 1297, 1297, true, false, 4, 1, 1, Dyes._NULL , Element.Nd , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MAGNETO, 2))); - public static Materials Neutronium = new Materials( 129, TextureSet.SET_DULL , 24.0F, 655360, 6, 1|2 |8 |32|64|128 , 250, 250, 250, 0, "Neutronium" , "Neutronium" , 0, 0, 10000, 10000, true, false, 20, 1, 1, Dyes.dyeWhite , Element.Nt , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 4), new TC_AspectStack(TC_Aspects.VITREUS, 3), new TC_AspectStack(TC_Aspects.ALIENIS, 2))).disableAutoGeneratedBlastFurnaceRecipes(); + public static Materials Neutronium = new Materials( 129, TextureSet.SET_DULL , 24.0F, 655360, 6, 1|2 |8 |32|64|128 , 250, 250, 250, 0, "Neutronium" , "Neutronium" , 0, 0, 10000, 10000, true, false, 20, 1, 1, Dyes.dyeWhite , Element.Nt , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 4), new TC_AspectStack(TC_Aspects.VITREUS, 3), new TC_AspectStack(TC_Aspects.ALIENIS, 2))).disableAutoGeneratedBlastFurnaceRecipes().setProcessingMaterialTierEU(Tier.RECIPE_ZPM); public static Materials Nickel = new Materials( 34, TextureSet.SET_METALLIC , 6.0F, 64, 2, 1|2 |8 |32|64|128 , 200, 200, 250, 0, "Nickel" , "Nickel" , 0, 0, 1728, 0, false, false, 4, 1, 1, Dyes.dyeLightBlue , Element.Ni , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.IGNIS, 1))); public static Materials Niobium = new Materials( 47, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 190, 180, 200, 0, "Niobium" , "Niobium" , 0, 0, 2750, 2750, true, false, 5, 1, 1, Dyes._NULL , Element.Nb , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ELECTRUM, 1))); public static Materials Nitrogen = new Materials( 12, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 0, 150, 200, 240, "Nitrogen" , "Nitrogen" , 0, 0, 63, 0, false, true, 2, 1, 1, Dyes.dyeCyan , Element.N , Collections.singletonList(new TC_AspectStack(TC_Aspects.AER, 2))); @@ -848,16 +848,15 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials ShadowSteel = new Materials( 337, TextureSet.SET_METALLIC , 6.0F, 768, 4, 1|2 |64 , 90, 90, 90, 0, "ShadowSteel" , "Shadow Steel" , 0, 0, -1, 1700, true, false, 4, 4, 3, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Thaumium, 3))); public static Materials AstralSilver = new Materials( 333, TextureSet.SET_SHINY , 10.0F, 64, 2, 1|2 |64 , 230, 230, 255, 0, "AstralSilver" , "Astral Silver" , 0, 0, -1, 0, false, false, 4, 3, 2, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Silver, 2), new MaterialStack(Thaumium, 1))); - /** + /** * Op materials (draconic evolution above) */ - //TODO: add other op materials? maybe some new ores or new only fusion made op materials from op materials??? like neutronium bedrockium alloy etc. - public static Materials InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 10, 1|2 |8 |64|128 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 10800, 10800, true, false, 20, 1, 1, Dyes.dyeLightGray ); - public static Materials Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2 |64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ); - public static Materials Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial(); + public static Materials InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 10, 1|2 |8 |64|128 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 10800, 10800, true, false, 20, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(Tier.RECIPE_UHV); + public static Materials Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2 |64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(Tier.RECIPE_UHV); + public static Materials Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(Tier.RECIPE_EV); public static Materials Trinium = new Materials( 868, TextureSet.SET_SHINY , 128.0F, 51200, 8, 1|2 |8 |64|128 , 200, 200, 210, 0, "Trinium" , "Trinium" , 0, 0, 7200, 7200, true, false, 4, 1, 1, Dyes.dyeLightGray ).disableAutoGeneratedBlastFurnaceRecipes(); public static Materials Ichorium = new Materials( 978, TextureSet.SET_SHINY , 32.0F, 850000, 12, 1|2 |8 |32|64|128 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeOrange ).setTurbineMultipliers(30, 30, 3); - public static Materials CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 96.0F, 163840, 12, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeBlack ); + public static Materials CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 96.0F, 163840, 12, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeBlack ).setProcessingMaterialTierEU(Tier.RECIPE_UV); // Superconductor base. public static Materials Pentacadmiummagnesiumhexaoxid = new Materials( 987, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 85, 85, 85, 0, "Pentacadmiummagnesiumhexaoxid" , "Superconductor Base MV" , 0, 0, 2500, 2500, true, false, 1, 1, 1, Dyes.dyeGray , 1, Arrays.asList(new MaterialStack(Cadmium, 5), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 6)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 3))); @@ -866,11 +865,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Vanadiumtriindinid = new Materials( 990, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 51, 0, 51, 0, "Vanadiumtriindinid" , "Superconductor Base IV" , 0, 0, 5200, 5200, true, false, 1, 1, 1, Dyes.dyeMagenta , 1, Arrays.asList(new MaterialStack(Vanadium , 1), new MaterialStack(Indium, 3)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 12))); public static Materials Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid = new Materials( 991, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 153, 76, 0, 0, "Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid" , "Superconductor Base LuV" , 0, 0, 6000, 6000, true, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Indium, 4), new MaterialStack(Tin, 2), new MaterialStack(Barium, 2), new MaterialStack(Titanium, 1), new MaterialStack(Copper, 7), new MaterialStack(Oxygen, 14)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15))); public static Materials Tetranaquadahdiindiumhexaplatiumosminid = new Materials( 992, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 10, 10, 10, 0, "Tetranaquadahdiindiumhexaplatiumosminid" , "Superconductor Base ZPM" , 0, 0, 9000, 9000, true, false, 1, 1, 1, Dyes.dyeBlack , 1, Arrays.asList(new MaterialStack(Naquadah, 4), new MaterialStack(Indium, 2), new MaterialStack(Palladium, 6), new MaterialStack(Osmium, 1)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 18))); - public static Materials Longasssuperconductornameforuvwire = new Materials( 986, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 224,210, 7, 0, "Longasssuperconductornameforuvwire" , "Superconductor Base UV" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Naquadria, 4), new MaterialStack(Osmiridium, 3), new MaterialStack(Europium, 1), new MaterialStack(Samarium, 1)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 21))); - public static Materials Longasssuperconductornameforuhvwire = new Materials( 985, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 38,129, 189, 0, "Longasssuperconductornameforuhvwire" , "Superconductor Base UHV" , 0, 0, 10800, 10800, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Draconium, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(Tritanium, 5), new MaterialStack(Americium, 6)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 24))); - public static Materials SuperconductorUEVBase = new Materials( 974, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 174, 8, 8, 0, "SuperconductorUEVBase" , "Superconductor Base UEV" , 0, 0, 11700, 11800, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 27))); - public static Materials SuperconductorUIVBase = new Materials( 131, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 229, 88, 177, 0, "SuperconductorUIVBase" , "Superconductor Base UIV" , 0, 0, 12700, 12700, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 34))); - public static Materials SuperconductorUMVBase = new Materials( 134, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 181, 38, 205, 0, "SuperconductorUMVBase" , "Superconductor Base UMV" , 0, 0, 13600, 13600, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 40))); + public static Materials Longasssuperconductornameforuvwire = new Materials( 986, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 224,210, 7, 0, "Longasssuperconductornameforuvwire" , "Superconductor Base UV" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Naquadria, 4), new MaterialStack(Osmiridium, 3), new MaterialStack(Europium, 1), new MaterialStack(Samarium, 1)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 21))).setProcessingMaterialTierEU(Tier.RECIPE_ZPM); + public static Materials Longasssuperconductornameforuhvwire = new Materials( 985, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 38,129, 189, 0, "Longasssuperconductornameforuhvwire" , "Superconductor Base UHV" , 0, 0, 10800, 10800, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Draconium, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(Tritanium, 5), new MaterialStack(Americium, 6)), Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 24))).setProcessingMaterialTierEU(Tier.RECIPE_UV); + public static Materials SuperconductorUEVBase = new Materials( 974, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 174, 8, 8, 0, "SuperconductorUEVBase" , "Superconductor Base UEV" , 0, 0, 11700, 11800, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 27))).setProcessingMaterialTierEU(Tier.RECIPE_UHV); + public static Materials SuperconductorUIVBase = new Materials( 131, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 229, 88, 177, 0, "SuperconductorUIVBase" , "Superconductor Base UIV" , 0, 0, 12700, 12700, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 34))).setProcessingMaterialTierEU(Tier.RECIPE_UEV); + public static Materials SuperconductorUMVBase = new Materials( 134, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 181, 38, 205, 0, "SuperconductorUMVBase" , "Superconductor Base UMV" , 0, 0, 13600, 13600, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 40))).setProcessingMaterialTierEU(Tier.RECIPE_UIV); // Superconductors. public static Materials SuperconductorMV = new Materials( -1, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 85, 85, 85, 0, "SuperconductorMV" , "Superconductor MV" , 0, 0, -1, -1, false, false, 1, 1, 1, Dyes.dyeGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 6))); @@ -887,10 +886,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials SuperCoolant = new MaterialBuilder( -1, TextureSet.SET_DULL,"Super Coolant").setRGB(2, 91, 111).addFluid().constructMaterial().setLiquidTemperature(1); - public static Materials DimensionallyTranscendentCrudeCatalyst = new Materials( 748, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentCrudeCatalyst" , "Dimensionally Transcendent Crude Catalyst" , 0, 0, 100000000, 1, false, true, 1, 1, 1, Dyes.dyeCyan).setHasCorrespondingFluid(true); - public static Materials DimensionallyTranscendentProsaicCatalyst = new Materials( 747, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentProsaicCatalyst" , "Dimensionally Transcendent Prosaic Catalyst" , 0, 0, 100000000, 1, false, true, 1, 1, 1, Dyes.dyeGreen).setHasCorrespondingFluid(true); - public static Materials DimensionallyTranscendentResplendentCatalyst = new Materials( 746, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentResplendentCatalyst" , "Dimensionally Transcendent Resplendent Catalyst" , 0, 0, 100000000, 1, false, true, 1, 1, 1, Dyes.dyeLime).setHasCorrespondingFluid(true); - public static Materials DimensionallyTranscendentExoticCatalyst = new Materials( 745, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentExoticCatalyst" , "Dimensionally Transcendent Exotic Catalyst" , 0, 0, 100000000, 1, false, true, 1, 1, 1, Dyes.dyeMagenta).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentCrudeCatalyst = new Materials( 748, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentCrudeCatalyst" , "Dimensionally Transcendent Crude Catalyst" , 0, 0, 25_000_000, 1, false, true, 1, 1, 1, Dyes.dyeCyan).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentProsaicCatalyst = new Materials( 747, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentProsaicCatalyst" , "Dimensionally Transcendent Prosaic Catalyst" , 0, 0, 50_000_000, 1, false, true, 1, 1, 1, Dyes.dyeGreen).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentResplendentCatalyst = new Materials( 746, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentResplendentCatalyst" , "Dimensionally Transcendent Resplendent Catalyst" , 0, 0, 75_000_000, 1, false, true, 1, 1, 1, Dyes.dyeLime).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentExoticCatalyst = new Materials( 745, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentExoticCatalyst" , "Dimensionally Transcendent Exotic Catalyst" , 0, 0, 100_000_000, 1, false, true, 1, 1, 1, Dyes.dyeMagenta).setHasCorrespondingFluid(true); public static Materials ExcitedDTCC = new Materials( 109, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "ExcitedDTCC" , "Excited Dimensionally Transcendent Crude Catalyst" , -1, -1, 500000000, 1, false, true, 1, 1, 1, Dyes.dyeCyan); public static Materials ExcitedDTPC = new Materials( 113, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 35, 59, 41, 1, "ExcitedDTPC" , "Excited Dimensionally Transcendent Prosaic Catalyst" , -1, -1, 500000000, 1, false, true, 1, 1, 1, Dyes.dyeGreen); @@ -899,9 +898,19 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials DimensionallyTranscendentResidue = new Materials( 589, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 0, 1, "DimensionallyTranscendentResidue" , "Dimensionally Transcendent Residue" , -1, -1, 25, 1, false, true, 1, 1, 1, Dyes.dyeBlack); - public static Materials SpaceTime = new Materials( 588, new TextureSet("spacetime", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))); - public static Materials TranscendentMetal = new Materials( 581, TextureSet.SET_METALLIC , 290.0F, 3*2621440, 22, 1|2|64|128, 50, 50, 50,0, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, true, true, 200, 1000, 1000, Dyes.dyeBlack , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); - public static Materials EnrichedHolmium = new Materials(582, TextureSet.SET_METALLIC, 1.0F, 0, 2, 18, 100, 1|2|4|16, 255, 255, "EnrichedHolmium", "Enriched Holmium", -1, -1, 0, 3000, true, false, 200, 1, 1, Dyes.dyePurple); + public static Materials SpaceTime = new Materials(588, new TextureSet("spacetime", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setProcessingMaterialTierEU(Tier.RECIPE_UIV); + public static Materials TranscendentMetal = new Materials(581, TextureSet.SET_METALLIC , 290.0F, 3*2621440, 22, 1|2|64|128, 50, 50, 50,0, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, true, true, 200, 1000, 1000, Dyes.dyeBlack , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setProcessingMaterialTierEU(Tier.RECIPE_UEV); + public static Materials EnrichedHolmium = new Materials(582, TextureSet.SET_METALLIC, 1.0F, 0, 2, 18, 100, 1|2|4|16, 255, 255, "EnrichedHolmium", "Enriched Holmium", -1, -1, 0, 3000, true, false, 200, 1, 1, Dyes.dyePurple); + + public static Materials MagnetohydrodynamicallyConstrainedStarMatter = new Materials(583, new TextureSet("MagnetohydrodynamicallyConstrainedStarMatter", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 255, 255, 255, 0, "MagnetohydrodynamicallyConstrainedStarMatter" , "Magnetohydrodynamically Constrained Star Matter" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setProcessingMaterialTierEU(Tier.RECIPE_UMV); + public static Materials RawStarMatter = new Materials(584, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "RawStarMatter", "Condensed Raw Stellar Plasma Mixture", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); + public static Materials WhiteDwarfMatter = new Materials(585, new TextureSet("WhiteDwarfMatter", true), 1.0F, 0, 2, 1|2|64|128, 255, 255, 255, 255, "WhiteDwarfMatter", "White Dwarf Matter", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple).setHasCorrespondingFluid(true).setProcessingMaterialTierEU(Tier.RECIPE_UMV); + public static Materials BlackDwarfMatter = new Materials(586, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|64|128, 0, 0, 0, 255, "BlackDwarfMatter", "Black Dwarf Matter", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple).setHasCorrespondingFluid(true).setProcessingMaterialTierEU(Tier.RECIPE_UMV); + + public static Materials Time = new Materials(587, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "Time", "Molten Time", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); + public static Materials Space = new Materials(106, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "Space", "Molten Space", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); + + // spotless:on static { @@ -974,20 +983,31 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { mCustomOre = false; public byte mEnchantmentToolsLevel = 0, mEnchantmentArmorsLevel = 0, mToolQuality = 0; public short mBlastFurnaceTemp = 0; - public int mMeltingPoint = 0, - mGasTemp = 0, - mMetaItemSubID, - mTypes = 0, - mDurability = 16, - mFuelPower = 0, - mFuelType = 0, - mExtraData = 0, - mOreValue = 0, - mOreMultiplier = 1, - mByProductMultiplier = 1, - mSmeltingMultiplier = 1, - mDensityMultiplier = 1, - mDensityDivider = 1; + public int mMeltingPoint = 0; + public int mGasTemp = 0; + public int mMetaItemSubID; + public int mTypes = 0; + public int mDurability = 16; + public int mFuelPower = 0; + public int mFuelType = 0; + public int mExtraData = 0; + public int mOreValue = 0; + public int mOreMultiplier = 1; + public int mByProductMultiplier = 1; + public int mSmeltingMultiplier = 1; + public int mDensityMultiplier = 1; + public int mDensityDivider = 1; + + public int getProcessingMaterialTierEU() { + return processingMaterialTierEU; + } + + public Materials setProcessingMaterialTierEU(final long processingMaterialTierEU) { + this.processingMaterialTierEU = (int) processingMaterialTierEU; + return this; + } + + public int processingMaterialTierEU = 0; public long mDensity = M; public float mToolSpeed = 1.0F, mHeatDamage = 0.0F, @@ -1976,7 +1996,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { NetherQuartz.mChemicalFormula = "SiO\u2082"; Quartzite.mChemicalFormula = "SiO\u2082"; CertusQuartz.mChemicalFormula = "SiO\u2082"; - SpaceTime.mChemicalFormula = "Reality itself distilled into liquid form"; + SpaceTime.mChemicalFormula = "Reality itself distilled into physical form"; Longasssuperconductornameforuvwire.mChemicalFormula = "Nq*\u2084(Ir\u2083Os)\u2083EuSm"; Longasssuperconductornameforuhvwire.mChemicalFormula = "D\u2086(SpNt)\u2087Tn\u2085Am\u2086"; SuperconductorUEVBase.mChemicalFormula = "D*\u2085If*\u2085(✦◆✦)(⚷⚙⚷ Ni4Ti6)"; @@ -2002,6 +2022,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { SubTag.ELECTROMAGNETIC_SEPERATION_GOLD.addTo( Magnetite, VanadiumMagnetite, BasalticMineralSand, GraniticMineralSand); + SubTag.NO_RECIPES.addTo(MagnetohydrodynamicallyConstrainedStarMatter); + SubTag.ELECTROMAGNETIC_SEPERATION_IRON.addTo( YellowLimonite, BrownLimonite, @@ -2272,7 +2294,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Sugar, FreshWater); - // TranscendentMetal.add(SubTag.NO_SMELTING); + BlackDwarfMatter.add(SubTag.NO_SMELTING); + WhiteDwarfMatter.add(SubTag.NO_SMELTING); + SpaceTime.add(SubTag.NO_SMELTING); + Wood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); WoodSealed.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING, SubTag.NO_WORKING); Peanutwood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); @@ -2600,6 +2625,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { : aMaterial.getMass() > Element.Tc.getMass() * 2 ? TungstenSteel : aMaterial.getMass() > Element.Tc.getMass() ? Steel : Wood); + + if (aMaterial == Materials.SpaceTime) { + aMaterial.mHandleMaterial = Materials.Infinity; + } + + if (aMaterial == Materials.TranscendentMetal) { + aMaterial.mHandleMaterial = Materials.DraconiumAwakened; + } } private static void addEnchantmentValues(Materials aMaterial, String aConfigPath) { @@ -2721,13 +2754,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { SubTagCalculation(aMaterial, aConfigPath); OreByProductsCalculation(aMaterial, aConfigPath); OreReRegistrationsCalculation(aMaterial, aConfigPath); - AspectCalculation(aMaterial, aConfigPath); + aspectCalculation(aMaterial, aConfigPath); addHarvestLevelNerfs(aMaterial, aConfigPath); } } } - private static void AspectCalculation(Materials aMaterial, String aConfigPath) { + private static void aspectCalculation(Materials aMaterial, String aConfigPath) { String aDefaultAspectString = aMaterial.mAspects.stream() .map(aAspectStack -> aAspectStack.mAspect.toString()) diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 7de2425df0..ffe60675d6 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -3261,6 +3261,21 @@ public enum OrePrefixes { ingot.mNotGeneratedItems.add(Materials.BrickNether); ingot.mNotGeneratedItems.add(Materials.WoodSealed); ingot.mNotGeneratedItems.add(Materials.Wood); + + plateDouble.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + plateTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + plateQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + plateQuintuple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + cell.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotDouble.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotQuintuple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + turbine.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dust.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dustSmall.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dustTiny.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + // ingot.mNotGeneratedItems.add(Materials.Ichorium); nugget.mNotGeneratedItems.add(Materials.Gold); plate.mNotGeneratedItems.add(Materials.Paper); @@ -3289,6 +3304,10 @@ public enum OrePrefixes { block.mNotGeneratedItems.add(Materials.Diamond); block.mNotGeneratedItems.add(Materials.Coal); toolHeadArrow.mNotGeneratedItems.add(Materials.Glass); + toolHeadArrow.mNotGeneratedItems.add(Materials.TranscendentMetal); + arrowGtPlastic.mNotGeneratedItems.add(Materials.TranscendentMetal); + arrow.mNotGeneratedItems.add(Materials.TranscendentMetal); + arrowGtWood.mNotGeneratedItems.add(Materials.TranscendentMetal); // ----- @@ -3334,9 +3353,17 @@ public enum OrePrefixes { nanite.mGeneratedItems.add(Materials.Silver); nanite.mGeneratedItems.add(Materials.TranscendentMetal); nanite.mGeneratedItems.add(Materials.Neutronium); + nanite.mGeneratedItems.add(Materials.WhiteDwarfMatter); + nanite.mGeneratedItems.add(Materials.BlackDwarfMatter); nanite.mGeneratedItems.add(Materials.Glowstone); // ----- + gear.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingot.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + toolHeadHammer.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + frame.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + frameGt.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dust.mGeneratedItems.addAll(dustPure.mGeneratedItems); dust.mGeneratedItems.addAll(dustImpure.mGeneratedItems); dust.mGeneratedItems.addAll(dustRefined.mGeneratedItems); @@ -4162,8 +4189,16 @@ public enum OrePrefixes { } public void processOre(Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aMaterial != null - && (aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased) + + if (aMaterial == null) { + return; + } + + if (aMaterial.contains(SubTag.NO_RECIPES)) { + return; + } + + if ((aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased) && GT_Utility.isStackValid(aStack)) { // if (Materials.mPreventableComponents.contains(this) && !this.mDynamicItems.contains(aMaterial)) return; for (IOreRecipeRegistrator tRegistrator : mOreProcessing) { diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java index b1999de89b..610e4a637b 100644 --- a/src/main/java/gregtech/api/enums/SubTag.java +++ b/src/main/java/gregtech/api/enums/SubTag.java @@ -85,6 +85,10 @@ public final class SubTag implements ICondition<ISubTagContainer> { */ public static final SubTag NO_SMASHING = getNewSubTag("NO_SMASHING"); /** + * This Material will have no associated recipes in any format. + */ + public static final SubTag NO_RECIPES = getNewSubTag("NO_RECIPES"); + /** * This Material cannot be unificated */ public static final SubTag NO_UNIFICATION = getNewSubTag("NO_UNIFICATION"); diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java index 7b8940a70a..b033e010d3 100644 --- a/src/main/java/gregtech/api/enums/TextureSet.java +++ b/src/main/java/gregtech/api/enums/TextureSet.java @@ -330,9 +330,9 @@ public class TextureSet { } } - public TextureSet(String aSetName, boolean is_custom) { + public TextureSet(String aSetName, boolean isCustom) { this("CUSTOM/" + aSetName); - this.is_custom = is_custom; + this.is_custom = isCustom; } /** diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index f881ae693b..dd389cfdf7 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1121,6 +1121,10 @@ public class Textures { BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, + BLOCK_WHITEDWARFMATTER, + + BLOCK_BLACKDWARFMATTER, + MARBLE_COBBLE_MOSSY, MARBLE_BRICKS, MARBLE_BRICKS_CRACKED, @@ -1865,7 +1869,9 @@ public class Textures { BLOCK_NICKELALUMINIUM, BLOCK_SPACETIME, BLOCK_TRANSCENDENTMETAL, - BLOCK_ORIHARUKON + BLOCK_ORIHARUKON, + BLOCK_WHITEDWARFMATTER, + BLOCK_BLACKDWARFMATTER, }; public static final ITexture[] HIDDEN_TEXTURE = { diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java index bef43f92ae..55cabcfe2c 100644 --- a/src/main/java/gregtech/api/enums/Tier.java +++ b/src/main/java/gregtech/api/enums/Tier.java @@ -6,6 +6,43 @@ import static gregtech.api.enums.GT_Values.V; * Experimental Class for later */ public class Tier { + + private static final double RECIPE_DISCOUNT = 0.95; + + // Do NOT use these for crafting recipes as they are exactly 1A! Use RECIPE_ULV etc. + public static final long ULV = V[0]; + public static final long LV = V[1]; + public static final long MV = V[2]; + public static final long HV = V[3]; + public static final long EV = V[4]; + public static final long IV = V[5]; + public static final long LuV = V[6]; + public static final long ZPM = V[7]; + public static final long UV = V[8]; + public static final long UHV = V[9]; + public static final long UEV = V[10]; + public static final long UIV = V[11]; + public static final long UMV = V[12]; + public static final long UXV = V[13]; + public static final long MAX = V[14]; + + // Use me for recipes. + public static final long RECIPE_ULV = GT_Values.VP[0]; + public static final long RECIPE_LV = GT_Values.VP[1]; + public static final long RECIPE_MV = GT_Values.VP[2]; + public static final long RECIPE_HV = GT_Values.VP[3]; + public static final long RECIPE_EV = GT_Values.VP[4]; + public static final long RECIPE_IV = GT_Values.VP[5]; + public static final long RECIPE_LuV = GT_Values.VP[6]; + public static final long RECIPE_ZPM = GT_Values.VP[7]; + public static final long RECIPE_UV = GT_Values.VP[8]; + public static final long RECIPE_UHV = GT_Values.VP[9]; + public static final long RECIPE_UEV = GT_Values.VP[10]; + public static final long RECIPE_UIV = GT_Values.VP[11]; + public static final long RECIPE_UMV = GT_Values.VP[12]; + public static final long RECIPE_UXV = GT_Values.VP[13]; + public static final long RECIPE_MAX = GT_Values.VP[14]; + public static final Tier[] ELECTRIC = new Tier[] { diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index bcb5cc5402..83e5cd9407 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -586,6 +586,15 @@ public interface IGT_RecipeAdder { */ boolean addForgeHammerRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt); + // Allows fluids as well as multiple items. + boolean addForgeHammerRecipe( + ItemStack[] ItemInputArray, + FluidStack[] FluidInputArray, + ItemStack[] ItemOutputArray, + FluidStack[] FluidOutputArray, + int aDuration, + int aEUt); + /** * Adds a Wiremill Recipe * diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java index dce130325c..636012fac3 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java @@ -1,11 +1,9 @@ package gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; -import gregtech.api.enums.Dyes; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.*; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -28,16 +26,22 @@ public class GT_MetaPipeEntity_Frame extends MetaPipeEntity { mMaterial = aMaterial; GT_OreDictUnificator.registerOre(OrePrefixes.frameGt, aMaterial, getStackForm(1)); - GT_ModHandler.addCraftingRecipe( - getStackForm(2), - RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"SSS", "SwS", "SSS", 'S', OrePrefixes.stick.get(mMaterial)}); - RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 4), - ItemList.Circuit_Integrated.getWithDamage(0, 4), - getStackForm(1), - 64, - 8); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + getStackForm(2), + RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] {"SSS", "SwS", "SSS", 'S', OrePrefixes.stick.get(mMaterial)}); + } + + if (!aMaterial.contains(SubTag.NO_RECIPES)) { + // Auto generate frame box recipe in an assembler. + RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 4), + ItemList.Circuit_Integrated.getWithDamage(0, 4), + getStackForm(1), + 64, + calculateRecipeEU(aMaterial, 7)); + } } public GT_MetaPipeEntity_Frame(String aName, Materials aMaterial) { diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 21d7d6ea3e..8ed8b5a9ff 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -1392,8 +1392,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "Precision Laser Engraver", null, RES_PATH_GUI + "basicmachines/LaserEngraverNEI", - 2, - 1, + 4, + 4, 0, 0, 1, @@ -2122,14 +2122,15 @@ public class GT_Recipe implements Comparable<GT_Recipe> { true) .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_EXTRUDER_SHAPE) .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRUDE, ProgressBar.Direction.RIGHT); + public static final GT_Recipe_Map sHammerRecipes = new GT_Recipe_Map( new HashSet<>(3800), "gt.recipe.hammer", "Forge Hammer", null, RES_PATH_GUI + "basicmachines/Hammer", - 1, - 1, + 2, + 2, 1, 0, 1, @@ -2138,6 +2139,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true) + .setUsualFluidInputCount(2) + .setUsualFluidOutputCount(2) .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_HAMMER) .setProgressBar(GT_UITextures.PROGRESSBAR_HAMMER, ProgressBar.Direction.DOWN) .addSpecialTexture(20, 6, 78, 42, GT_UITextures.PROGRESSBAR_HAMMER_BASE) @@ -2473,7 +2476,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { false, true) .useModularUI(true) - .setUsualFluidInputCount(1) + .setUsualFluidInputCount(3) .setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_LENS) .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index d6751ebd84..8a28b686c5 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -3,6 +3,7 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.*; import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.Materials.Void; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; @@ -159,7 +160,8 @@ public class GT_RecipeRegistrator { || !aData.hasValidMaterialData() || !aData.mMaterial.mMaterial.mAutoGenerateRecycleRecipes || aData.mMaterial.mAmount <= 0 - || GT_Utility.getFluidForFilledItem(aStack, false) != null) return; + || GT_Utility.getFluidForFilledItem(aStack, false) != null + || aData.mMaterial.mMaterial.mSubTags.contains(SubTag.NO_RECIPES)) return; registerReverseMacerating(GT_Utility.copyAmount(1, aStack), aData, aData.mPrefix == null); registerReverseSmelting( GT_Utility.copyAmount(1, aStack), aData.mMaterial.mMaterial, aData.mMaterial.mAmount, true); @@ -232,10 +234,12 @@ public class GT_RecipeRegistrator { || aMaterial == null || aMaterialAmount <= 0 || aMaterial.contains(SubTag.NO_SMELTING) - || (aMaterialAmount > M && aMaterial.contains(SubTag.METAL))) return; - aMaterialAmount /= aStack.stackSize; + || (aMaterialAmount > M && aMaterial.contains(SubTag.METAL)) + || (aMaterial.getProcessingMaterialTierEU() > Tier.IV)) return; if (aMaterial == Materials.Naquadah || aMaterial == Materials.NaquadahEnriched) return; + aMaterialAmount /= aStack.stackSize; + boolean tHide = (aMaterial != Materials.Iron) && (GT_Mod.gregtechproxy.mHideRecyclingRecipes); if (aAllowAlloySmelter) GT_ModHandler.addSmeltingAndAlloySmeltingRecipe( @@ -597,12 +601,6 @@ public class GT_RecipeRegistrator { aItemData.mMaterial.mMaterial + "." + sShapesA[i][0], true)) { if (null != (tStack = GT_ModHandler.removeRecipe(tRecipe.shape))) { - // - // GT_Log.out.println("###################################################################################"); - // GT_Log.out.println("registerStickStuff used - // aPlate: "+aPlate); - // - // GT_Log.out.println("###################################################################################"); switch (sShapesA[i].length) { case 2: GT_ModHandler.addCraftingRecipe( @@ -658,9 +656,11 @@ public class GT_RecipeRegistrator { * @param aMaterial material to register * @param baseDuration base duration ticks for ingot -> 1x wire recipe * @param aEUt EU/t for recipe + * If you provide a proper EU tier for recipe processing then aEUt will be overriden with it. */ public static void registerWiremillRecipes(Materials aMaterial, int baseDuration, int aEUt) { - registerWiremillRecipes(aMaterial, baseDuration, aEUt, OrePrefixes.ingot, OrePrefixes.stick, 2); + registerWiremillRecipes( + aMaterial, baseDuration, calculateRecipeEU(aMaterial, aEUt), OrePrefixes.ingot, OrePrefixes.stick, 2); } /** diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index ee4a92b1a4..51efb8a9a7 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1926,6 +1926,12 @@ public class GT_Utility { return copyAmount(1, tData.filledContainer); } + public static int calculateRecipeEU(Materials aMaterial, int defaultRecipeEUPerTick) { + return aMaterial.getProcessingMaterialTierEU() == 0 + ? defaultRecipeEUPerTick + : aMaterial.getProcessingMaterialTierEU(); + } + public static ItemStack getFluidDisplayStack(Fluid aFluid) { return aFluid == null ? null : getFluidDisplayStack(new FluidStack(aFluid, 0), false); } diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 88954a03f9..638ed857b9 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -1,6 +1,7 @@ package gregtech.common; import static gregtech.GT_Mod.GT_FML_LOGGER; +import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; @@ -772,11 +773,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { 0, 0); } - if (Loader.isModLoaded("miscutils")) { + if (Loader.isModLoaded(MOD_ID_GTPP)) { GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe( true, new ItemStack[] { - aInput1, aInput2, GT_ModHandler.getModItem("miscutils", "itemCactusCoke", (aCoalAmount * 2L)) + aInput1, aInput2, GT_ModHandler.getModItem(MOD_ID_GTPP, "itemCactusCoke", (aCoalAmount * 2L)) }, new ItemStack[] {aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)}, null, @@ -789,7 +790,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe( true, new ItemStack[] { - aInput1, aInput2, GT_ModHandler.getModItem("miscutils", "itemSugarCoke", (aCoalAmount * 2L)) + aInput1, aInput2, GT_ModHandler.getModItem(MOD_ID_GTPP, "itemSugarCoke", (aCoalAmount * 2L)) }, new ItemStack[] {aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)}, null, @@ -1662,6 +1663,20 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } @Override + public boolean addForgeHammerRecipe( + ItemStack[] ItemInputArray, + FluidStack[] FluidInputArray, + ItemStack[] ItemOutputArray, + FluidStack[] FluidOutputArray, + int aDuration, + int aEUt) { + + GT_Recipe.GT_Recipe_Map.sHammerRecipes.addRecipe( + true, ItemInputArray, ItemOutputArray, null, FluidInputArray, FluidOutputArray, aDuration, aEUt, 0); + return true; + } + + @Override public boolean addBoxingRecipe( ItemStack aContainedItem, ItemStack aEmptyBox, ItemStack aFullBox, int aDuration, int aEUt) { if ((aContainedItem == null) || (aFullBox == null)) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java index cbd2d86093..3f717b4d79 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -19,7 +19,7 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { * Textures.BlockIcons.casingTexturePages[4][0-127] - Free * Textures.BlockIcons.casingTexturePages[5][0-127] - Free * Textures.BlockIcons.casingTexturePages[6][0-127] - Free - * Textures.BlockIcons.casingTexturePages[7][0-127] - Free + * Textures.BlockIcons.casingTexturePages[7][0-127] - TecTech * Textures.BlockIcons.casingTexturePages[8][0-127] - TecTech */ public GT_Block_Casings1() { diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 2c7c2e4014..aa18e8f02c 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -810,7 +810,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L)); ItemList.NuclearStar.set(addItem( - tLastID = 230, + 230, "Nuclear Star", "BY THE POWERS OF NAUGHTINESS, I COMMAND THIS PARTICULAR STAR, TO BE REALLY, REALLY HOT", SubTag.NO_UNIFICATION)); @@ -820,6 +820,102 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.Optically_Perfected_CPU.set(addItem(tLastID = 726, "Optically Perfected CPU", "Perfected CPU!", o)); ItemList.Optically_Compatible_Memory.set( addItem(tLastID = 725, "Optically Compatible Memory", "Its in the name!", o)); + + int whiteDwarfIDs = 729; + ItemList.White_Dwarf_Shape_Extruder_Plate.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Plate)", "Ultra Strong Stellar Shape for making Plates")); + ItemList.White_Dwarf_Shape_Extruder_Rod.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Rod)", "Ultra Strong Stellar Shape for making Rods")); + ItemList.White_Dwarf_Shape_Extruder_Bolt.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Bolt)", "Ultra Strong Stellar Shape for making Bolts")); + ItemList.White_Dwarf_Shape_Extruder_Ring.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Ring)", "Ultra Strong Stellar Shape for making Rings")); + ItemList.White_Dwarf_Shape_Extruder_Cell.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Cell)", "Ultra Strong Stellar Shape for making Cells")); + ItemList.White_Dwarf_Shape_Extruder_Ingot.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Ingot)", + "Ultra Strong Stellar Shape for, wait, can't we just use a Furnace?")); + ItemList.White_Dwarf_Shape_Extruder_Wire.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Wire)", "Ultra Strong Stellar Shape for making Wires")); + ItemList.White_Dwarf_Shape_Extruder_Casing.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Casing)", + "Ultra Strong Stellar Shape for making Item Casings")); + ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Tiny Pipe)", + "Ultra Strong Stellar Shape for making tiny Pipes")); + ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Small Pipe)", + "Ultra Strong Stellar Shape for making small Pipes")); + ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Normal Pipe)", + "Ultra Strong Stellar Shape for making Pipes")); + ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Large Pipe)", + "Ultra Strong Stellar Shape for making large Pipes")); + ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Huge Pipe)", + "Ultra Strong Stellar Shape for making full Block Pipes")); + ItemList.White_Dwarf_Shape_Extruder_Block.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Block)", "Ultra Strong Stellar Shape for making Blocks")); + ItemList.White_Dwarf_Shape_Extruder_Sword.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Sword Blade)", + "Ultra Strong Stellar Shape for making Swords")); + ItemList.White_Dwarf_Shape_Extruder_Pickaxe.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Pickaxe Head)", + "Ultra Strong Stellar Shape for making Pickaxes")); + ItemList.White_Dwarf_Shape_Extruder_Shovel.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Shovel Head)", + "Ultra Strong Stellar Shape for making Shovels")); + ItemList.White_Dwarf_Shape_Extruder_Axe.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Axe Head)", + "Ultra Strong Stellar Shape for making Axes")); + ItemList.White_Dwarf_Shape_Extruder_Hoe.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Hoe Head)", + "Ultra Strong Stellar Shape for making Hoes")); + ItemList.White_Dwarf_Shape_Extruder_Hammer.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Hammer Head)", + "Ultra Strong Stellar Shape for making Hammers")); + ItemList.White_Dwarf_Shape_Extruder_File.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (File Head)", + "Ultra Strong Stellar Shape for making Files")); + ItemList.White_Dwarf_Shape_Extruder_Saw.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Saw Blade)", + "Ultra Strong Stellar Shape for making Saws")); + ItemList.White_Dwarf_Shape_Extruder_Gear.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Gear)", "Ultra Strong Stellar Shape for making Gears")); + ItemList.White_Dwarf_Shape_Extruder_Bottle.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Bottle)", + "Ultra Strong Stellar Shape for making Bottles")); + ItemList.White_Dwarf_Shape_Extruder_Rotor.set(addItem( + whiteDwarfIDs++, "White Dwarf Extruder Shape (Rotor)", "Ultra Strong Stellar Shape for a Rotor")); + ItemList.White_Dwarf_Shape_Extruder_Small_Gear.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Small Gear)", + "Ultra Strong Stellar Shape for a Small Gear")); + ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.set(addItem( + whiteDwarfIDs++, + "White Dwarf Extruder Shape (Turbine Blade)", + "Ultra Strong Stellar Extruder Shape for a Turbine Blade")); + ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.set(addItem( + whiteDwarfIDs, + "White Dwarf Extruder Shape (Drill Head)", + "White Dwarf Extruder Shape for a Drill Head")); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java index 80371c6cc7..60f168e05d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java @@ -55,7 +55,7 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul private static final double log4 = log(4); private static final int min_input_hatch = 0; - private static final int max_input_hatch = 6; + private static final int max_input_hatch = 7; private static final int min_output_hatch = 0; private static final int max_output_hatch = 2; private static final int min_input_bus = 0; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 86630cbe08..c893d75674 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -16,17 +16,19 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre( OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { - GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - aMaterial == MaterialsBotania.Livingrock - || aMaterial == MaterialsBotania.Livingwood - || aMaterial == MaterialsBotania.Dreamwood - ? GT_Utility.getIntegratedCircuit(3) - : null, - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), - null, - (int) Math.max(aMaterial.getMass() * 10L, 1L), - 30); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_Values.RA.addCutterRecipe( + GT_Utility.copyAmount(1L, aStack), + aMaterial == MaterialsBotania.Livingrock + || aMaterial == MaterialsBotania.Livingwood + || aMaterial == MaterialsBotania.Dreamwood + ? GT_Utility.getIntegratedCircuit(3) + : null, + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), + null, + (int) Math.max(aMaterial.getMass() * 10L, 1L), + 30); + } } ItemStack tStack1 = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); @@ -45,14 +47,17 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeRecipeDelayed( tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3); } + if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Block.get(0L), - aMaterial.getMolten(1296L), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - 288, - 8); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Block.get(0L), + aMaterial.getMolten(1296L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + 288, + 8); + } } } if (GregTech_API.sRecipeFile.get( @@ -89,10 +94,15 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (tStack1 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] {OrePrefixes.block.get(aMaterial)}); } - if (!OrePrefixes.block.isIgnored(aMaterial)) - GT_ModHandler.addCompressionRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); + + if (!OrePrefixes.block.isIgnored(aMaterial)) { + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCompressionRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); + } + } + switch (aMaterial.mName) { case "Mercury": System.err.println( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index 17ba07917f..1234d3fc53 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -3,6 +3,7 @@ package gregtech.loaders.oreprocessing; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; +import gregtech.api.enums.Tier; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; @@ -16,12 +17,14 @@ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre( OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(2L, aStack), GT_Proxy.tBits, new Object[] { - "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + if ((aMaterial.mUnificatable) + && (aMaterial.mMaterialInto == aMaterial) + && !aMaterial.contains(SubTag.NO_WORKING)) { + GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(2L, aStack), GT_Proxy.tBits, new Object[] { + "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) + }); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index 7a85572b5b..ae25bcee98 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -22,7 +24,7 @@ public class ProcessingFoil implements IOreRecipeRegistrator { GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L)), GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), (int) Math.max(aMaterial.getMass(), 1L), - 24); + calculateRecipeEU(aMaterial, 24)); GregTech_API.registerCover( aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[70], aMaterial.mRGBa, false), null); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index d05d2188b7..f5f9a1688a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -27,7 +29,7 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr aMaterial.getMolten(576L), GT_OreDictUnificator.get(aPrefix, aMaterial, 1L), 128, - 8); + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) @@ -62,18 +64,20 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr }); break; default: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "SPS", - "PwP", - "SPS", - 'P', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial) - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "SPS", + "PwP", + "SPS", + 'P', + OrePrefixes.plate.get(aMaterial), + 'S', + OrePrefixes.stick.get(aMaterial) + }); + } } } break; @@ -85,7 +89,7 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr aMaterial.getMolten(144L), GT_Utility.copyAmount(1L, aStack), 16, - 8); + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) @@ -104,18 +108,20 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr new Object[] {"P ", " f", 'P', OrePrefixes.stoneSmooth}); break; default: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - " S ", - "hPx", - " S ", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial) - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + " S ", + "hPx", + " S ", + 'S', + OrePrefixes.stick.get(aMaterial), + 'P', + OrePrefixes.plate.get(aMaterial) + }); + } } } break; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 411309f396..507a015950 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; @@ -54,46 +56,48 @@ public class ProcessingGem GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), (int) Math.max(aMaterialMass, 1L), - 16); + calculateRecipeEU(aMaterial, 16)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), (int) Math.max(aMaterialMass * 2L, 1L), - 24); + calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(2L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), (int) Math.max(aMaterialMass * 2L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(3L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), (int) Math.max(aMaterialMass * 3L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(4L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), (int) Math.max(aMaterialMass * 4L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(5L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), (int) Math.max(aMaterialMass * 5L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(9L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), (int) Math.max(aMaterialMass * 9L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); } if (aNoWorking) { - GT_Values.RA.addLatheRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), - (int) Math.max(aMaterialMass, 1L), - 16); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_Values.RA.addLatheRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 16)); + } } else { if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { GT_ModHandler.addCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index 88995c0e0b..bd98e6a162 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; @@ -42,7 +44,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist aMaterial.getMolten(144L), GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), 32, - 8); + calculateRecipeEU(aMaterial, 8)); } } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); @@ -71,47 +73,49 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } if (!aNoSmashing) { - GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(3L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), - (int) Math.max(aMaterialMass, 1L), - 16); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_Values.RA.addForgeHammerRecipe( + GT_Utility.copyAmount(3L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 16)); + } GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), (int) Math.max(aMaterialMass, 1L), - 24); + calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(2L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), (int) Math.max(aMaterialMass * 2L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(3L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), (int) Math.max(aMaterialMass * 3L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(4L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), (int) Math.max(aMaterialMass * 4L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(5L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), (int) Math.max(aMaterialMass * 5L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(9L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), (int) Math.max(aMaterialMass * 9L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(10), GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), (int) Math.max(aMaterialMass * 2L, 1L), - 24); + calculateRecipeEU(aMaterial, 24)); } break; @@ -121,19 +125,23 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), (int) Math.max(aMaterialMass, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(2L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), (int) Math.max(aMaterialMass * 2L, 1L), - 96); - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial)}); + calculateRecipeEU(aMaterial, 96)); + + // Enable crafting with hammer if tier is < IV. + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + if (aSpecialRecipeReq + && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial)}); + } } } break; @@ -143,27 +151,29 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), (int) Math.max(aMaterialMass, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(3L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), (int) Math.max(aMaterialMass * 3L, 1L), - 96); - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotDouble.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + calculateRecipeEU(aMaterial, 96)); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + if (aSpecialRecipeReq + && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "I", + "B", + "h", + 'I', + OrePrefixes.ingotDouble.get(aMaterial), + 'B', + OrePrefixes.ingot.get(aMaterial) + }); + } } } break; @@ -173,22 +183,26 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), (int) Math.max(aMaterialMass, 1L), - 96); - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotTriple.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + calculateRecipeEU(aMaterial, 96)); + + // If tier < IV add manual crafting. + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + if (aSpecialRecipeReq + && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "I", + "B", + "h", + 'I', + OrePrefixes.ingotTriple.get(aMaterial), + 'B', + OrePrefixes.ingot.get(aMaterial) + }); + } } } break; @@ -198,22 +212,25 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), (int) Math.max(aMaterialMass, 1L), - 96); - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotQuadruple.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + calculateRecipeEU(aMaterial, 96)); + + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + if (aSpecialRecipeReq + && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "I", + "B", + "h", + 'I', + OrePrefixes.ingotQuadruple.get(aMaterial), + 'B', + OrePrefixes.ingot.get(aMaterial) + }); + } } } break; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index b1a73e19b5..7e2dfbd439 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -15,10 +17,7 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis @Override public void registerOre( OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aMaterial == Materials.Iron) - GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.WroughtIron, 1L)); + GT_Values.RA.addAlloySmelterRecipe( GT_Utility.copyAmount(9L, aStack), aMaterial.contains(SubTag.SMELTING_TO_GEM) @@ -29,7 +28,8 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis aMaterial.mSmeltInto, 1L), 200, - 2); + calculateRecipeEU(aMaterial, 2)); + if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( @@ -37,8 +37,9 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis aMaterial.getMolten(16L), GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), 16, - 4); + calculateRecipeEU(aMaterial, 4)); } + GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); GT_RecipeRegistrator.registerReverseMacerating( aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); @@ -48,11 +49,13 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis ItemList.Shape_Mold_Nugget.get(0L), GT_Utility.copyAmount(9L, aStack), 100, - 1); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 9L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sI ", 'I', OrePrefixes.ingot.get(aMaterial)}); + calculateRecipeEU(aMaterial, 1)); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 9L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] {"sI ", 'I', OrePrefixes.ingot.get(aMaterial)}); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index 709a6c36b3..f39e04d61e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -25,137 +25,142 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre( OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - switch (aPrefix) { - case pipeHuge: - case pipeLarge: - case pipeMedium: - case pipeSmall: - case pipeTiny: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial)}); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PWP", - "P P", - "PHP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPP", - "W H", - "PPP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - "P P", - "PWP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial)}); - break; - case pipeRestrictiveHuge: - case pipeRestrictiveLarge: - case pipeRestrictiveMedium: - case pipeRestrictiveSmall: - case pipeRestrictiveTiny: - gregtech.api.enums.GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true), - GT_OreDictUnificator.get( - OrePrefixes.ring, - Materials.Steel, - aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), - GT_Utility.copyAmount(1L, aStack), - (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount), - 4); - break; - case pipeQuadruple: - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PP ", - "PP ", - " ", - 'P', + // These are only generated if a materials tier is < IV. + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + switch (aPrefix) { + case pipeHuge: + case pipeLarge: + case pipeMedium: + case pipeSmall: + case pipeTiny: + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] {"PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial)}); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "PWP", + "P P", + "PHP", + 'P', + aMaterial == Materials.Wood + ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) + ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', + aMaterial.contains(SubTag.WOOD) + ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench + }); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "PPP", + "W H", + "PPP", + 'P', + aMaterial == Materials.Wood + ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) + ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', + aMaterial.contains(SubTag.WOOD) + ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench + }); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "PHP", + "P P", + "PWP", + 'P', + aMaterial == Materials.Wood + ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) + ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', + aMaterial.contains(SubTag.WOOD) + ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench + }); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] {"DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial)}); + break; + case pipeRestrictiveHuge: + case pipeRestrictiveLarge: + case pipeRestrictiveMedium: + case pipeRestrictiveSmall: + case pipeRestrictiveTiny: + gregtech.api.enums.GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get( - aOreDictName.replaceFirst("Quadruple", "Medium"), null, 1L, false, true) - }); - gregtech.api.enums.GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get( - aOreDictName.replaceFirst("Quadruple", "Medium"), null, 4L, false, true), - ItemList.Circuit_Integrated.getWithDamage(0, 4), - GT_Utility.copyAmount(1L, aStack), - 40, - 8); - break; - case pipeNonuple: - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPP", - "PPP", - "PPP", - 'P', + aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true), GT_OreDictUnificator.get( - aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) - }); - gregtech.api.enums.GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 9L, false, true), - ItemList.Circuit_Integrated.getWithDamage(0, 9), - GT_Utility.copyAmount(1L, aStack), - 60, - 8); - break; - default: - break; + OrePrefixes.ring, + Materials.Steel, + aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), + GT_Utility.copyAmount(1L, aStack), + (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount), + 4); + break; + case pipeQuadruple: + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "PP ", + "PP ", + " ", + 'P', + GT_OreDictUnificator.get( + aOreDictName.replaceFirst("Quadruple", "Medium"), null, 1L, false, true) + }); + gregtech.api.enums.GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get( + aOreDictName.replaceFirst("Quadruple", "Medium"), null, 4L, false, true), + ItemList.Circuit_Integrated.getWithDamage(0, 4), + GT_Utility.copyAmount(1L, aStack), + 40, + 8); + break; + case pipeNonuple: + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "PPP", + "PPP", + "PPP", + 'P', + GT_OreDictUnificator.get( + aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) + }); + gregtech.api.enums.GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get( + aOreDictName.replaceFirst("Nonuple", "Small"), null, 9L, false, true), + ItemList.Circuit_Integrated.getWithDamage(0, 9), + GT_Utility.copyAmount(1L, aStack), + 60, + 8); + break; + default: + break; + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index c96d49ae46..2ec37ed6e9 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -7,16 +7,11 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED; import static gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; import static gregtech.common.GT_Proxy.tBits; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.enums.TextureSet; -import gregtech.api.enums.ToolDictNames; +import gregtech.api.enums.*; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -100,7 +95,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); if (aMaterial.mFuelPower > 0) { - RA.addFuel(GT_Utility.copyAmount(1L, aStack), NI, aMaterial.mFuelPower, aMaterial.mFuelType); } @@ -108,7 +102,11 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist && !(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(0L), aMaterial.getMolten(L), aMaterial.getPlates(1), 32, 8); + ItemList.Shape_Mold_Plate.get(0L), + aMaterial.getMolten(L), + aMaterial.getPlates(1), + 32, + calculateRecipeEU(aMaterial, 8)); } GT_ModHandler.addCraftingRecipe( @@ -129,61 +127,65 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { - GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "h", // craftingToolHardHammer - "X", - "X", - 'X', - OrePrefixes.ingot.get(aMaterial) - }); - - // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H", // craftingToolForgeHammer - "X", - 'H', - ToolDictNames.craftingToolForgeHammer, - 'X', - OrePrefixes.ingot.get(aMaterial) - }); - - GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "h", // craftingToolHardHammer - "X", - 'X', - OrePrefixes.gem.get(aMaterial) - }); - - // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H", // craftingToolForgeHammer - "X", - 'H', - ToolDictNames.craftingToolForgeHammer, - 'X', - OrePrefixes.gem.get(aMaterial) - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { + "h", // craftingToolHardHammer + "X", + "X", + 'X', + OrePrefixes.ingot.get(aMaterial) + }); + + // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false + GT_ModHandler.addCraftingRecipe( + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { + "H", // craftingToolForgeHammer + "X", + 'H', + ToolDictNames.craftingToolForgeHammer, + 'X', + OrePrefixes.ingot.get(aMaterial) + }); + + GT_ModHandler.addCraftingRecipe( + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { + "h", // craftingToolHardHammer + "X", + 'X', + OrePrefixes.gem.get(aMaterial) + }); + + // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false + GT_ModHandler.addCraftingRecipe( + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { + "H", // craftingToolForgeHammer + "X", + 'H', + ToolDictNames.craftingToolForgeHammer, + 'X', + OrePrefixes.gem.get(aMaterial) + }); + } } if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) { - GT_ModHandler.addShapelessCraftingRecipe( - aMaterial.getDust(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addShapelessCraftingRecipe( + aMaterial.getDust(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] {ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial)}); + } } } } @@ -201,7 +203,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(2L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), (int) Math.max(aMaterialMass * 2L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); if (GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Tools.hammerdoubleplate, @@ -210,35 +212,39 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Object aPlateStack = OrePrefixes.plate.get(aMaterial); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - aPlateStack, - 'B', - aPlateStack - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { + "I", + "B", + "h", // craftingToolHardHammer + 'I', + aPlateStack, + 'B', + aPlateStack + }); + } // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack - }); + // GT_ModHandler.addShapelessCraftingRecipe( + // GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new + // Object[] { + // gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + // aPlateStack + // }); } RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), GT_Utility.copyAmount(1L, aStack), (int) Math.max(aMaterialMass * 2L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); } else { RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), - gregtech.api.enums.ItemList.Circuit_Integrated.getWithDamage(0L, 2L), + GT_Utility.getIntegratedCircuit(2), Materials.Glue.getFluid(10L), GT_Utility.copyAmount(1L, aStack), 64, @@ -259,46 +265,49 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(3L, aStack), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), (int) Math.max(aMaterialMass * 3L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); if (GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Tools.hammertripleplate, OrePrefixes.plate.get(aMaterial).toString(), true)) { - Object aPlateStack = OrePrefixes.plate.get(aMaterial); - - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateDouble.get(aMaterial), - 'B', - aPlateStack - }); - - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + + Object aPlateStack = OrePrefixes.plate.get(aMaterial); + + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { + "I", + "B", + "h", // craftingToolHardHammer + 'I', + OrePrefixes.plateDouble.get(aMaterial), + 'B', + aPlateStack + }); + + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { + gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, + aPlateStack, + aPlateStack, + aPlateStack + }); + } } RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), GT_Utility.copyAmount(1L, aStack), (int) Math.max(aMaterialMass * 3L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); } else { RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), - gregtech.api.enums.ItemList.Circuit_Integrated.getWithDamage(0L, 3L), + GT_Utility.getIntegratedCircuit(3), Materials.Glue.getFluid(20L), GT_Utility.copyAmount(1L, aStack), 96, @@ -337,40 +346,42 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist OrePrefixes.plate.get(aMaterial).toString(), true)) { - Object aPlateStack = OrePrefixes.plate.get(aMaterial); - - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateTriple.get(aMaterial), - 'B', - aPlateStack - }); - - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + Object aPlateStack = OrePrefixes.plate.get(aMaterial); + + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { + "I", + "B", + "h", // craftingToolHardHammer + 'I', + OrePrefixes.plateTriple.get(aMaterial), + 'B', + aPlateStack + }); + + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { + gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, + aPlateStack, + aPlateStack, + aPlateStack, + aPlateStack + }); + } } RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_Utility.copyAmount(1L, aStack), (int) Math.max(aMaterialMass * 4L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); } else { RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), - gregtech.api.enums.ItemList.Circuit_Integrated.getWithDamage(0L, 4L), + GT_Utility.getIntegratedCircuit(4), Materials.Glue.getFluid(30L), GT_Utility.copyAmount(1L, aStack), 128, @@ -392,35 +403,37 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist OrePrefixes.plate.get(aMaterial).toString(), true)) { - Object aPlateStack = OrePrefixes.plate.get(aMaterial); - - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateQuadruple.get(aMaterial), - 'B', - aPlateStack - }); - - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + Object aPlateStack = OrePrefixes.plate.get(aMaterial); + + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { + "I", + "B", + "h", // craftingToolHardHammer + 'I', + OrePrefixes.plateQuadruple.get(aMaterial), + 'B', + aPlateStack + }); + + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { + ToolDictNames.craftingToolForgeHammer, + aPlateStack, + aPlateStack, + aPlateStack, + aPlateStack, + aPlateStack + }); + } } RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), GT_Utility.copyAmount(1L, aStack), (int) Math.max(aMaterialMass * 5L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); } else { @@ -447,7 +460,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), GT_Utility.copyAmount(1L, aStack), (int) Math.max(aMaterialMass * 9L, 1L), - 96); + calculateRecipeEU(aMaterial, 96)); } } @@ -463,7 +476,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist aMaterial.getMolten(L / 2), GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), 16, - 8); + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable @@ -471,18 +484,20 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist && !aNoSmashing && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {"h X", 'X', OrePrefixes.plate.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] {"h X", 'X', OrePrefixes.plate.get(aMaterial)}); - // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.plate.get(aMaterial) - }); + // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { + "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.plate.get(aMaterial) + }); + } } RA.addAlloySmelterRecipe( @@ -490,21 +505,21 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Shape_Mold_Casing.get(0L), GT_Utility.copyAmount(3L, aStack), 128, - 15); + calculateRecipeEU(aMaterial, 15)); RA.addCutterRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L), NI, (int) Math.max(aMaterial.getMass(), 1L), - 16); + calculateRecipeEU(aMaterial, 16)); RA.addExtruderRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Extruder_Casing.get(0L), GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L), (int) Math.max(aMaterial.getMass(), 1L), - 45); + calculateRecipeEU(aMaterial, 45)); GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java index a3151c5bb4..7915b7915a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -21,52 +23,60 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist ItemStack tPlate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L); ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L); if (GT_Utility.isStackValid(tPlate) && GT_Utility.isStackValid(tRing)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), GT_Proxy.tBits, new Object[] { - "PhP", - "SRf", - "PdP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'R', - OrePrefixes.ring.get(aMaterial), - 'S', - OrePrefixes.screw.get(aMaterial) - }); + + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), GT_Proxy.tBits, new Object[] { + "PhP", + "SRf", + "PdP", + 'P', + aMaterial == Materials.Wood + ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'R', + OrePrefixes.ring.get(aMaterial), + 'S', + OrePrefixes.screw.get(aMaterial) + }); + } + GT_Values.RA.addAssemblerRecipe( new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, Materials.Tin.getMolten(32), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - 240, - 24); + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); + GT_Values.RA.addAssemblerRecipe( new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, Materials.Lead.getMolten(48), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - 240, - 24); + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); + GT_Values.RA.addAssemblerRecipe( new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, Materials.SolderingAlloy.getMolten(16), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - 240, - 24); + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); } GT_Values.RA.addExtruderRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L), ItemList.Shape_Extruder_Rotor.get(0L), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - 200, - 60); + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); + if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Rotor.get(0L), aMaterial.getMolten(612L), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - 100, - 60); + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java index f89451fbe0..eefad6af6b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java @@ -1,9 +1,8 @@ package gregtech.loaders.oreprocessing; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -24,12 +23,14 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), null, (int) Math.max(aMaterial.getMass() / 8L, 1L), - 4); + calculateRecipeEU(aMaterial, 4)); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial)}); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index bf50836627..09f3936aad 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -24,6 +26,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); if ((tAmount > 0) && (tAmount <= 64) && (aPrefix.mMaterialAmount % 3628800L == 0L)) { int tVoltageMultiplier = aMaterial.mBlastFurnaceTemp >= 2800 ? 60 : 15; + int tTrueVoltage = aMaterial.getProcessingMaterialTierEU(); if (aMaterial.contains(SubTag.NO_SMASHING)) { tVoltageMultiplier /= 4; @@ -37,13 +40,17 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Shape_Extruder_Block.get(0L), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount), 10 * tAmount, - 8 * tVoltageMultiplier); - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(9L, aStack), - ItemList.Shape_Mold_Block.get(0L), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount), - 5 * tAmount, - 4 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + + // Allow creation of alloy smelter recipes for material recycling if < IV tier. + if (tTrueVoltage < Tier.IV) { + GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(9L, aStack), + ItemList.Shape_Mold_Block.get(0L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount), + 5 * tAmount, + calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); + } } if (((aPrefix != OrePrefixes.ingot) || (aMaterial != aMaterial.mSmeltInto))) { GT_Values.RA.addExtruderRecipe( @@ -51,7 +58,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Shape_Extruder_Ingot.get(0L), GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount), 10, - 4 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); } GT_Values.RA.addExtruderRecipe( @@ -59,26 +66,29 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Shape_Extruder_Pipe_Tiny.get(0L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2), 4 * tAmount, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + if (!(aMaterial == Materials.Redstone || aMaterial == Materials.Glowstone)) { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Pipe_Small.get(0L), GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount), 8 * tAmount, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(3L, aStack), ItemList.Shape_Extruder_Pipe_Medium.get(0L), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount), 24 * tAmount, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(6L, aStack), ItemList.Shape_Extruder_Pipe_Large.get(0L), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount), 48 * tAmount, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); } GT_Values.RA.addExtruderRecipe( @@ -86,98 +96,99 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Shape_Extruder_Pipe_Huge.get(0L), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount), 96 * tAmount, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Plate.get(0L), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), - 8 * tVoltageMultiplier); + (int) Math.max(aMaterialMass * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Extruder_Small_Gear.get(0L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), - 8 * tVoltageMultiplier); + (int) Math.max(aMaterialMass * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(6L, aStack), ItemList.Shape_Extruder_Turbine_Blade.get(0L), GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), - 8 * tVoltageMultiplier); + (int) Math.max(aMaterialMass * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Ring.get(0L), aMaterial.getMolten(36L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), 100, - 4 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Screw.get(0L), aMaterial.getMolten(18L), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), 50, - 2 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Rod.get(0L), aMaterial.getMolten(72L), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), 150, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Bolt.get(0L), aMaterial.getMolten(18L), GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), 50, - 2 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Round.get(0L), aMaterial.getMolten(18L), GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), 50, - 2 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Rod_Long.get(0L), aMaterial.getMolten(144L), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), 300, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Turbine_Blade.get(0L), aMaterial.getMolten(864L), GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), 400, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Pipe_Tiny.get(0L), aMaterial.getMolten(72L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L), 20, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Pipe_Small.get(0L), aMaterial.getMolten(144L), GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L), 40, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Pipe_Medium.get(0L), aMaterial.getMolten(432L), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L), 80, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Pipe_Large.get(0L), aMaterial.getMolten(864L), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), 160, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Pipe_Huge.get(0L), aMaterial.getMolten(1728L), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), 320, - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); } if (tAmount * 2 <= 64) { if (!(aMaterial == Materials.Aluminium)) { @@ -186,14 +197,14 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Shape_Extruder_Rod.get(0L), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 6 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); } else { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Rod.get(0L), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), 200, - 2 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } } if (tAmount * 2 <= 64) @@ -202,105 +213,120 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Shape_Extruder_Wire.get(0L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 6 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); if (tAmount * 8 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Bolt.get(0L), GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (tAmount * 4 <= 64) { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Ring.get(0L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 6 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_SMASHING)) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"h ", "fX", 'X', OrePrefixes.stick.get(aMaterial)}); + + // If material tier < IV then add manual recipe. + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"h ", "fX", 'X', OrePrefixes.stick.get(aMaterial)}); + } } + GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, new Object[] {aStack}), + GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Sword.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(3L, new Object[] {aStack}), + GT_Utility.copyAmount(3L, aStack), ItemList.Shape_Extruder_Pickaxe.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, new Object[] {aStack}), + GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Shovel.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(3L, new Object[] {aStack}), + GT_Utility.copyAmount(3L, aStack), ItemList.Shape_Extruder_Axe.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, new Object[] {aStack}), + GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Hoe.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(6L, new Object[] {aStack}), + GT_Utility.copyAmount(6L, aStack), ItemList.Shape_Extruder_Hammer.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 6L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, new Object[] {aStack}), + GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_File.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, new Object[] {aStack}), + GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Saw.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(4L, new Object[] {aStack}), + GT_Utility.copyAmount(4L, aStack), ItemList.Shape_Extruder_Gear.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 5L * tAmount, tAmount), - 8 * tVoltageMultiplier); + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (!(aMaterial == Materials.StyreneButadieneRubber || aMaterial == Materials.Silicone)) { - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Plate.get(0L), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 2 * tVoltageMultiplier); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Plate.get(0L), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + } } else { + // If tier < IV then add ability to turn ingots into plates via alloy smelter. + if (tTrueVoltage < Tier.IV) { + GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Mold_Plate.get(0L), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + } + } + + // If tier < IV then add ability to turn ingots into gears via alloy smelter. + if (tTrueVoltage < Tier.IV) { GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Mold_Plate.get(0L), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - 2 * tVoltageMultiplier); + GT_Utility.copyAmount(8L, aStack), + ItemList.Shape_Mold_Gear.get(0L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 10L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(8L, aStack), - ItemList.Shape_Mold_Gear.get(0L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 10L * tAmount, tAmount), - 2 * tVoltageMultiplier); + switch (aMaterial.mSmeltInto.mName) { case "Glass": GT_Values.RA.addExtruderRecipe( @@ -455,7 +481,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi tAmount * 128, 1 * tVoltageMultiplier); break; - case "Polytetrafluoroethylene": + case "Polytetrafluoroethylene": // Recipe for cells from PTFE, why is it here? GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index 8f710a509a..a24a1b7866 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -15,10 +17,12 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre( OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {" s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] {" s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial)}); + } if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( aMaterial.contains(SubTag.CRYSTAL) @@ -27,22 +31,24 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L), (int) Math.max(aMaterial.getMass() * 5L, 1L), - 16); + calculateRecipeEU(aMaterial, 16)); GT_Values.RA.addCutterRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L), null, (int) Math.max(aMaterial.getMass() * 2L, 1L), - 4); + calculateRecipeEU(aMaterial, 4)); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] {"s", "X", 'X', OrePrefixes.stickLong.get(aMaterial)}); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"f ", " X", 'X', OrePrefixes.ingot.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] {"s", "X", 'X', OrePrefixes.stickLong.get(aMaterial)}); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"f ", " X", 'X', OrePrefixes.ingot.get(aMaterial)}); + } } } if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { @@ -50,16 +56,16 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(2L, aStack), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), - 16); + calculateRecipeEU(aMaterial, 16)); } GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - ItemList.Circuit_Integrated.getWithDamage(0L, 2L), + GT_Utility.getIntegratedCircuit(2), Materials.SeedOil.getFluid(50L), ItemList.FR_Stick.get(1L), 16, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index ca8ae1c31e..a3362ede85 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -1,9 +1,8 @@ package gregtech.loaders.oreprocessing; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -18,26 +17,30 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe @Override public void registerOre( OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {" s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] {" s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial)}); + } if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addCutterRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), null, (int) Math.max(aMaterial.getMass(), 1L), - 4); + calculateRecipeEU(aMaterial, 4)); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial)}); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] {"sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial)}); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] {"sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial)}); + } } } if (!aMaterial.contains(SubTag.NO_SMASHING)) { @@ -45,12 +48,14 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), 200, - 16); + calculateRecipeEU(aMaterial, 16)); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"ShS", 'S', OrePrefixes.stick.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"ShS", 'S', OrePrefixes.stick.get(aMaterial)}); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index b016e10009..867c528e46 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -591,7 +593,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L + 100_000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -616,7 +618,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L + 75_000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -641,7 +643,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L + 50_000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -666,7 +668,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L + 400_000L, 128L, 2L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -691,7 +693,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L + 300_000L, 128L, 2L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -716,7 +718,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L + 200_000L, 128L, 2L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -741,7 +743,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1600000L, 512L, 3L, -1L + 1_600_000L, 512L, 3L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -766,7 +768,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1200000L, 512L, 3L, -1L + 1_200_000L, 512L, 3L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -791,7 +793,7 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 800000L, 512L, 3L, -1L + 800_000L, 512L, 3L, -1L }), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS @@ -819,7 +821,7 @@ public class ProcessingToolHead 1, aMaterial, Materials.StainlessSteel, - new long[] {1600000L, 512L, 3L, -1L}), + new long[] {1_600_000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, @@ -846,7 +848,7 @@ public class ProcessingToolHead 1, aMaterial, Materials.StainlessSteel, - new long[] {1200000L, 512L, 3L, -1L}), + new long[] {1_200_000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, @@ -873,7 +875,7 @@ public class ProcessingToolHead 1, aMaterial, Materials.StainlessSteel, - new long[] {800000L, 512L, 3L, -1L}), + new long[] {800_000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, @@ -913,7 +915,7 @@ public class ProcessingToolHead aMaterial.getMolten(144 * 4), GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), 5 * 20, - (int) GT_Values.VP[2]); + calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); } if (aMaterial.getIngots(1) != null) { GT_Values.RA.addExtruderRecipe( @@ -921,15 +923,42 @@ public class ProcessingToolHead ItemList.Shape_Extruder_ToolHeadDrill.get(0), GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), 5 * 20, - (int) GT_Values.VP[2]); + calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); } } break; case toolHeadFile: - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addShapelessCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + + if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.FILE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + GT_ModHandler.RecipeBits.MIRRORED + | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "P", + "P", + "S", + 'P', + OrePrefixes.plate.get(aMaterial), + 'S', + OrePrefixes.stick.get(aMaterial.mHandleMaterial) + }); + } + } + } + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), @@ -940,30 +969,16 @@ public class ProcessingToolHead GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), 200, - 120); - if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), - GT_ModHandler.RecipeBits.MIRRORED - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "P", - "P", - "S", - 'P', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); - } + calculateRecipeEU(aMaterial, 120)); + break; case toolHeadHoe: - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addShapelessCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + } GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), @@ -974,7 +989,7 @@ public class ProcessingToolHead GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), 200, - 120); + calculateRecipeEU(aMaterial, 120)); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), @@ -994,10 +1009,33 @@ public class ProcessingToolHead new Object[] {"GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial)}); break; case toolHeadPickaxe: - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + + GT_ModHandler.addShapelessCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.PICKAXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + + if (aSpecialRecipeReq1) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "PII", + "f h", + 'P', + OrePrefixes.plate.get(aMaterial), + 'I', + OrePrefixes.ingot.get(aMaterial) + }); + + if (!aNoWorking) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial)}); + } + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), @@ -1009,29 +1047,29 @@ public class ProcessingToolHead GT_MetaGenerated_Tool_01.PICKAXE, 1, aMaterial, aMaterial.mHandleMaterial, null), 200, 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PII", - "f h", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial)}); + break; case toolHeadPlow: - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + + GT_ModHandler.addShapelessCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + + if (aSpecialRecipeReq1) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial)}); + + if (!aNoWorking) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial)}); + } + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), @@ -1042,23 +1080,37 @@ public class ProcessingToolHead GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), 200, - 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial)}); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial)}); + calculateRecipeEU(aMaterial, 120)); + break; case toolHeadSaw: - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + + GT_ModHandler.addShapelessCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + + if (aSpecialRecipeReq1) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "PP ", + "fh ", + 'P', + OrePrefixes.plate.get(aMaterial), + 'I', + OrePrefixes.ingot.get(aMaterial) + }); + + if (!aNoWorking) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"GGf", 'G', OrePrefixes.gem.get(aMaterial)}); + } + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), @@ -1069,30 +1121,37 @@ public class ProcessingToolHead GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), 200, - 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PP ", - "fh ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGf", 'G', OrePrefixes.gem.get(aMaterial)}); + calculateRecipeEU(aMaterial, 120)); + break; case toolHeadSense: - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + + GT_ModHandler.addShapelessCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SENSE, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + + if (aSpecialRecipeReq1) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "PPI", + "hf ", + 'P', + OrePrefixes.plate.get(aMaterial), + 'I', + OrePrefixes.ingot.get(aMaterial) + }); + + if (!aNoWorking) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial)}); + } + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), @@ -1103,24 +1162,8 @@ public class ProcessingToolHead GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SENSE, 1, aMaterial, aMaterial.mHandleMaterial, null), 200, - 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PPI", - "hf ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial)}); + calculateRecipeEU(aMaterial, 120)); + break; case toolHeadShovel: GT_ModHandler.addShapelessCraftingRecipe( @@ -1152,10 +1195,33 @@ public class ProcessingToolHead new Object[] {"fG", 'G', OrePrefixes.gem.get(aMaterial)}); break; case toolHeadSword: - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + + GT_ModHandler.addShapelessCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SWORD, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + + if (aSpecialRecipeReq1) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + " P ", + "fPh", + 'P', + OrePrefixes.plate.get(aMaterial), + 'I', + OrePrefixes.ingot.get(aMaterial) + }); + + if (!aNoWorking) + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {" G", "fG", 'G', OrePrefixes.gem.get(aMaterial)}); + } + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), @@ -1166,24 +1232,7 @@ public class ProcessingToolHead GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SWORD, 1, aMaterial, aMaterial.mHandleMaterial, null), 200, - 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - " P ", - "fPh", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {" G", "fG", 'G', OrePrefixes.gem.get(aMaterial)}); + calculateRecipeEU(aMaterial, 120)); break; case toolHeadUniversalSpade: GT_ModHandler.addShapelessCraftingRecipe( @@ -1783,48 +1832,52 @@ public class ProcessingToolHead GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L), GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null), 160, - 100); + calculateRecipeEU(aMaterial, 100)); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L), GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null), 320, - 400); + calculateRecipeEU(aMaterial, 400)); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L), GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null), 640, - 1600); + calculateRecipeEU(aMaterial, 1600)); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L), GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null), 1280, - 6400); + calculateRecipeEU(aMaterial, 6400)); + if (aSpecialRecipeReq2) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "fPd", - "SPS", - " P ", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plateDouble.get(aMaterial), - 'R', - OrePrefixes.ring.get(aMaterial), - 'S', - OrePrefixes.screw.get(aMaterial) - }); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { + "fPd", + "SPS", + " P ", + 'P', + aMaterial == Materials.Wood + ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plateDouble.get(aMaterial), + 'R', + OrePrefixes.ring.get(aMaterial), + 'S', + OrePrefixes.screw.get(aMaterial) + }); + } + GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L), GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), 200, - 60); + calculateRecipeEU(aMaterial, 60)); } break; default: diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 71724bf27f..f3b81834aa 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.util.GT_Utility.calculateRecipeEU; + import appeng.api.config.TunnelType; import appeng.core.Api; import cpw.mods.fml.common.Optional; @@ -54,124 +56,134 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addWiremillRecipe( GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1), GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L), 200, - 8); - // GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - // GT_Utility.copy(new Object[]{GT_Utility.copyAmount(2L, aStack), - // GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 8L)}), 100, 4); - // GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - // GT_Utility.copy(new Object[]{aStack, GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, - // 4L)}), 50, 4); + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"Xx", 'X', OrePrefixes.plate.get(aMaterial)}); + && !aMaterial.contains(SubTag.NO_WORKING)) { + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] {"Xx", 'X', OrePrefixes.plate.get(aMaterial)}); + } + } GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 2L), + GT_Utility.getIntegratedCircuit(2), GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), 150, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(4L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 4L), + GT_Utility.getIntegratedCircuit(4), GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), 200, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(8L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 8L), + GT_Utility.getIntegratedCircuit(8), GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L), 300, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(12L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 12L), + GT_Utility.getIntegratedCircuit(12), GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L), 400, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(16L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 16L), + GT_Utility.getIntegratedCircuit(16), GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), 500, - 8); + calculateRecipeEU(aMaterial, 8)); break; case wireGt02: cableWidth = 2; correspondingCable = OrePrefixes.cableGt02; - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), new Object[] {aOreDictName}); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] {OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial)}); + } break; case wireGt04: cableWidth = 4; correspondingCable = OrePrefixes.cableGt04; - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial) - }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), new Object[] {aOreDictName}); + GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial) + }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] {OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial)}); + } break; case wireGt08: cableWidth = 8; correspondingCable = OrePrefixes.cableGt08; - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial) - }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), new Object[] {aOreDictName}); + GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial) + }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] {OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + } break; case wireGt12: cableWidth = 12; correspondingCable = OrePrefixes.cableGt12; - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), + new Object[] {aOreDictName}); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + } break; case wireGt16: cableWidth = 16; correspondingCable = OrePrefixes.cableGt16; - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial)}); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) { - if (GT_Mod.gregtechproxy.mAE2Integration) { - AE2addNewAttunement(aStack); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), + new Object[] {aOreDictName}); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial)}); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] {OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + + if (GT_Mod.gregtechproxy.mAE2Integration) { + AE2addNewAttunement(aStack); + } } break; default: @@ -320,21 +332,21 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr Materials.Rubber.getMolten(144 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( aStack, GT_Utility.getIntegratedCircuit(24), Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( aStack, GT_Utility.getIntegratedCircuit(24), Materials.Silicone.getMolten(72 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( @@ -344,13 +356,13 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] {aStack, dielectric.getDustSmall(costMultiplier)}, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); } } } else { @@ -363,7 +375,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { aStack, @@ -374,7 +386,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( @@ -386,7 +398,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(4, aStack), @@ -397,7 +409,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { aStack, @@ -407,7 +419,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { aStack, @@ -418,18 +430,19 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); + calculateRecipeEU(aMaterial, 8)); } } } break; } + // Honestly when can this machine be removed? ); GT_Values.RA.addUnboxingRecipe( GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), GT_Utility.copyAmount(1L, aStack), null, 100, - 8); + calculateRecipeEU(aMaterial, 8)); if (GT_Mod.gregtechproxy.mAE2Integration) { AE2AddNetAttunementCable(aStack, correspondingCable, aMaterial); } diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index ed6c62f85a..bd84529cf5 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2,6 +2,8 @@ package gregtech.loaders.postload; import static gregtech.api.GregTech_API.mGTPlusPlus; import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.util.GT_ModHandler.getModItem; +import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import codechicken.nei.api.API; import cpw.mods.fml.common.Loader; @@ -214,35 +216,35 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addPrinterRecipe( GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L), - FluidRegistry.getFluidStack("squidink", 36), + getFluidStack("squidink", 36), GT_Values.NI, ItemList.Paper_Punch_Card_Empty.get(1L), 100, 2); GT_Values.RA.addPrinterRecipe( ItemList.Paper_Punch_Card_Empty.get(1L), - FluidRegistry.getFluidStack("squidink", 36), + getFluidStack("squidink", 36), ItemList.Tool_DataStick.getWithName(0L, "With Punch Card Data"), ItemList.Paper_Punch_Card_Encoded.get(1L), 100, 2); GT_Values.RA.addPrinterRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L), - FluidRegistry.getFluidStack("squidink", 144), + getFluidStack("squidink", 144), ItemList.Tool_DataStick.getWithName(0L, "With Scanned Book Data"), ItemList.Paper_Printed_Pages.get(1L), 400, 2); GT_Values.RA.addPrinterRecipe( new ItemStack(Items.map, 1, 32767), - FluidRegistry.getFluidStack("squidink", 144), + getFluidStack("squidink", 144), ItemList.Tool_DataStick.getWithName(0L, "With Scanned Map Data"), new ItemStack(Items.filled_map, 1, 0), 400, 2); GT_Values.RA.addPrinterRecipe( new ItemStack(Items.book, 1, 32767), - FluidRegistry.getFluidStack("squidink", 144), + getFluidStack("squidink", 144), GT_Values.NI, GT_Utility.getWrittenBook("Manual_Printer", ItemList.Book_Written_01.get(1L)), 400, @@ -694,8 +696,8 @@ public class GT_MachineRecipeLoader implements Runnable { new ItemStack(Items.fermented_spider_eye, 1, 0), ItemList.IC2_Scrap.get(1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L), - FluidRegistry.getFluidStack("potion.purpledrink", 750), - FluidRegistry.getFluidStack("sludge", 1000), + getFluidStack("potion.purpledrink", 750), + getFluidStack("sludge", 1000), ItemList.Food_Chum.get(4L), 128, 24); @@ -770,7 +772,7 @@ public class GT_MachineRecipeLoader implements Runnable { 900, 8); GT_Values.RA.addMixerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L), GT_Values.NI, @@ -780,7 +782,7 @@ public class GT_MachineRecipeLoader implements Runnable { 20, 16); GT_Values.RA.addMixerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L), GT_Values.NI, @@ -796,7 +798,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -806,7 +808,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -816,7 +818,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -826,7 +828,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -836,7 +838,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(250L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 2L, 1), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 2L, 1), 16, 16); GT_Values.RA.addMixerRecipe( @@ -905,7 +907,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(125), - FluidRegistry.getFluidStack("ic2coolant", 125), + getFluidStack("ic2coolant", 125), GT_Values.NI, 256, 48); @@ -915,7 +917,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, GT_Values.NI, GT_ModHandler.getDistilledWater(1000), - FluidRegistry.getFluidStack("ic2coolant", 1000), + getFluidStack("ic2coolant", 1000), GT_Values.NI, 256, 48); @@ -1125,7 +1127,7 @@ public class GT_MachineRecipeLoader implements Runnable { 200, 64); - FluidStack tFD = FluidRegistry.getFluidStack("fluiddeath", 30); + FluidStack tFD = getFluidStack("fluiddeath", 30); if (tFD != null && tFD.getFluid() != null && tFD.amount > 0) { GT_Values.RA.addMixerRecipe( ItemList.SFMixture.get(30), @@ -1203,7 +1205,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1215,7 +1217,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1227,7 +1229,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1239,7 +1241,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1251,7 +1253,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1263,7 +1265,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1493,7 +1495,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Ball.get(0L), Materials.Mercury.getFluid(1000L), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 3), + getModItem("Thaumcraft", "ItemResource", 1, 3), 128, 4); GT_Values.RA.addFluidSolidifierRecipe( @@ -2237,7 +2239,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 2L, 14), + getModItem("Thaumcraft", "ItemResource", 2L, 14), GT_Values.NI, GT_Values.NI, GT_Values.NI, @@ -2249,7 +2251,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeRed.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 0), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 0), GT_Values.NI, GT_Values.NI, null, @@ -2260,7 +2262,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeBlue.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 1), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 1), GT_Values.NI, GT_Values.NI, null, @@ -2271,7 +2273,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeGreen.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 2), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 2), GT_Values.NI, GT_Values.NI, null, @@ -2282,7 +2284,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeYellow.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 3), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 3), GT_Values.NI, GT_Values.NI, null, @@ -2330,21 +2332,11 @@ public class GT_MachineRecipeLoader implements Runnable { } } GT_Values.RA.addFluidExtractionRecipe( - ItemList.Dye_SquidInk.get(1L), - GT_Values.NI, - FluidRegistry.getFluidStack("squidink", 144), - 10000, - 128, - 4); + ItemList.Dye_SquidInk.get(1L), GT_Values.NI, getFluidStack("squidink", 144), 10000, 128, 4); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Dye_Indigo.get(1L), GT_Values.NI, FluidRegistry.getFluidStack("indigo", 144), 10000, 128, 4); + ItemList.Dye_Indigo.get(1L), GT_Values.NI, getFluidStack("indigo", 144), 10000, 128, 4); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Crop_Drop_Indigo.get(1L), - GT_Values.NI, - FluidRegistry.getFluidStack("indigo", 144), - 10000, - 128, - 4); + ItemList.Crop_Drop_Indigo.get(1L), GT_Values.NI, getFluidStack("indigo", 144), 10000, 128, 4); GT_Values.RA.addFluidExtractionRecipe( ItemList.Crop_Drop_MilkWart.get(1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L), @@ -2389,7 +2381,7 @@ public class GT_MachineRecipeLoader implements Runnable { 32, 4); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 3), + getModItem("Thaumcraft", "ItemResource", 1, 3), GT_Values.NI, Materials.Mercury.getFluid(1000L), 10000, @@ -2411,21 +2403,21 @@ public class GT_MachineRecipeLoader implements Runnable { 64); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L, 0), + getModItem("IC2", "blockAlloyGlass", 1L, 0), GT_Values.NI, Materials.ReinforceGlass.getMolten(144), 10000, 100, 1920); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), + getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), GT_Values.NI, Materials.ReinforceGlass.getMolten(72), 10000, 50, 1920); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_DC, "item.ReinforcedGlassLense", 1L, 0), + getModItem(MOD_ID_DC, "item.ReinforcedGlassLense", 1L, 0), GT_Values.NI, Materials.ReinforceGlass.getMolten(54), 10000, @@ -2444,7 +2436,7 @@ public class GT_MachineRecipeLoader implements Runnable { 128, 4); GT_Values.RA.addFluidSmelterRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "phosphor", 1L), + getModItem(GT_MachineRecipeLoader.aTextForestry, "phosphor", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), Materials.Lava.getFluid(800L), 1000, @@ -2466,65 +2458,65 @@ public class GT_MachineRecipeLoader implements Runnable { 1200, 256); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), Materials.Water.getFluid(200L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), 8000, 2000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), Materials.Water.getFluid(200L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), 8000, 2000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), Materials.Water.getFluid(200L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), 8000, 2000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), GT_ModHandler.getDistilledWater(100L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), 9000, 1000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), GT_ModHandler.getDistilledWater(100L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), 9000, 1000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), GT_ModHandler.getDistilledWater(100L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), 9000, 1000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), Materials.Void.getMolten(36L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), 10000, 500, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), Materials.Void.getMolten(36L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), 10000, 500, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), Materials.Void.getMolten(36L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), 10000, 500, 24); @@ -2648,7 +2640,7 @@ public class GT_MachineRecipeLoader implements Runnable { 800, 7920); - if (!Loader.isModLoaded("miscutils")) { + if (!Loader.isModLoaded(MOD_ID_GTPP)) { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), @@ -3587,21 +3579,21 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Plate.get(0L), Materials.ReinforceGlass.getMolten(72), - GT_ModHandler.getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), + getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), 160, 1920); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Block.get(0L), Materials.ReinforceGlass.getMolten(144), - GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L), + getModItem("IC2", "blockAlloyGlass", 1L), 160, 1920); GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.UnknowCrystal", 4L), + getModItem("GalaxySpace", "item.UnknowCrystal", 4L), Materials.Osmiridium.getDust(2), Materials.GrowthMediumSterilized.getFluid(1000L), - FluidRegistry.getFluidStack("bacterialsludge", 1000), + getFluidStack("bacterialsludge", 1000), ItemList.Circuit_Chip_Stemcell.get(64L), GT_Values.NI, 600, @@ -3610,7 +3602,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Circuit_Chip_Stemcell.get(32L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 4), Materials.BioMediumSterilized.getFluid(2000L), - FluidRegistry.getFluidStack("mutagen", 2000), + getFluidStack("mutagen", 2000), ItemList.Circuit_Chip_Biocell.get(32L), GT_Values.NI, 1200, @@ -3630,74 +3622,74 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), 100, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), 100, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 2), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 2), 200, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 3), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 3), 100, 480); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 2L, 4), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 2L, 4), 200, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 5), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 5), 300, 120); GT_Values.RA.addFormingPressRecipe( new ItemStack(Items.comparator, 1, 32767), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 6), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 6), 300, 120); GT_Values.RA.addFormingPressRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 14), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 17), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 14), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 17), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 15), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 18), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 15), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 18), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 19), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 19), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), 200, 16); @@ -3730,7 +3722,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 0), + getModItem("Forestry", "chipsets", 1L, 0), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -3743,7 +3735,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 1), + getModItem("Forestry", "chipsets", 1L, 1), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -3756,7 +3748,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 2), + getModItem("Forestry", "chipsets", 1L, 2), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -3769,7 +3761,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 3), + getModItem("Forestry", "chipsets", 1L, 3), 200, 30); // Circuit soldering @@ -4060,7 +4052,7 @@ public class GT_MachineRecipeLoader implements Runnable { 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), + getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), new ItemStack(Items.lead, 1, 32767), Materials.Glue.getFluid(72L), new ItemStack(Items.name_tag, 1, 0), @@ -4081,119 +4073,119 @@ public class GT_MachineRecipeLoader implements Runnable { 100, 4); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), + getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), GT_Utility.getIntegratedCircuit(4), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), + getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), GT_Utility.getIntegratedCircuit(4), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), GT_Utility.getIntegratedCircuit(4), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), + getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), + getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), Materials.Redstone.getMolten(144L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 23), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 23), 64, 30); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 17), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 17), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), Materials.Redstone.getMolten(144L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 24), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 24), 64, 30); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 18), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 18), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), Materials.Redstone.getMolten(144L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 22), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 22), 64, 30); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1L), new ItemStack(Blocks.sand, 1, 32767), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 2L, 0), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 2L, 0), 64, 8); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1L), new ItemStack(Blocks.sand, 1, 32767), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 2L, 600), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 2L, 600), 64, 8); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Fluix, 1L), new ItemStack(Blocks.sand, 1, 32767), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 2L, 1200), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 2L, 1200), 64, 8); GT_Values.RA.addAssemblerRecipe( ItemList.FR_Wax.get(6L), new ItemStack(Items.string, 1, 32767), Materials.Water.getFluid(600L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "candle", 24L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "candle", 24L, 0), 64, 8); GT_Values.RA.addAssemblerRecipe( ItemList.FR_Wax.get(2L), ItemList.FR_Silk.get(1L), Materials.Water.getFluid(200L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "candle", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "candle", 8L, 0), 16, 8); GT_Values.RA.addAssemblerRecipe( ItemList.FR_Silk.get(9L), GT_Utility.getIntegratedCircuit(9), Materials.Water.getFluid(500L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "craftingMaterial", 1L, 3), + getModItem(GT_MachineRecipeLoader.aTextForestry, "craftingMaterial", 1L, 3), 64, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "propolis", 5L, 2), + getModItem(GT_MachineRecipeLoader.aTextForestry, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "craftingMaterial", 1L, 1), + getModItem(GT_MachineRecipeLoader.aTextForestry, "craftingMaterial", 1L, 1), 16, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "sturdyMachine", 1L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "sturdyMachine", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 4L), Materials.Water.getFluid(5000L), ItemList.FR_Casing_Hardened.get(1L), @@ -4214,7 +4206,7 @@ public class GT_MachineRecipeLoader implements Runnable { 400, 1); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "craftingMaterial", 5L, 1), + getModItem(GT_MachineRecipeLoader.aTextForestry, "craftingMaterial", 5L, 1), GT_Utility.getIntegratedCircuit(5), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), @@ -4289,7 +4281,7 @@ public class GT_MachineRecipeLoader implements Runnable { 8); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), + getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), Materials.Glue.getFluid(20L), new ItemStack(Items.book, 1, 0), 32, @@ -4310,7 +4302,7 @@ public class GT_MachineRecipeLoader implements Runnable { 8); GT_Values.RA.addAssemblerRecipe( ItemList.Paper_Printed_Pages.get(1L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), + getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), Materials.Glue.getFluid(20L), new ItemStack(Items.written_book, 1, 0), 32, @@ -4435,7 +4427,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Copper, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4446,7 +4438,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4457,7 +4449,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Tin, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 1), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 1), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4468,7 +4460,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Bronze, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 2), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 2), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4479,7 +4471,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4490,7 +4482,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4501,7 +4493,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 4), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 4), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4512,7 +4504,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 5), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 5), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4520,10 +4512,10 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.LongObsidianRod", 2L, 0) + getModItem(MOD_ID_DC, "item.LongObsidianRod", 2L, 0) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 6), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 6), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4534,7 +4526,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 7), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 7), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4545,7 +4537,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 8), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 8), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4556,7 +4548,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 9), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 9), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4567,7 +4559,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Apatite, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 10), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 10), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4578,7 +4570,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Lapis, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 11), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 11), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4589,7 +4581,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.EnderEye, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 12), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 12), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -4600,7 +4592,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium, 2L) }, Materials.Glass.getMolten(576L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 13), + getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 13), 200, 30); @@ -5042,7 +5034,7 @@ public class GT_MachineRecipeLoader implements Runnable { 240); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Ball.get(0L), - FluidRegistry.getFluidStack("glass.molten", 1000), + getFluidStack("glass.molten", 1000), ItemList.Circuit_Parts_Glass_Tube.get(1), 200, 24); @@ -5243,7 +5235,7 @@ public class GT_MachineRecipeLoader implements Runnable { new ItemStack(Items.string, 32), 80, 48); - GT_RecipeRegistrator.registerWiremillRecipes(Materials.SpaceTime, 400, 32000); + GT_RecipeRegistrator.registerWiremillRecipes(Materials.SpaceTime, 400, 32_000); GT_Values.RA.addDistilleryRecipe( GT_Utility.getIntegratedCircuit(24), @@ -5317,15 +5309,15 @@ public class GT_MachineRecipeLoader implements Runnable { false); GT_Values.RA.addDistilleryRecipe( GT_Utility.getIntegratedCircuit(1), - FluidRegistry.getFluidStack("potion.potatojuice", 2), - FluidRegistry.getFluidStack("potion.vodka", 1), + getFluidStack("potion.potatojuice", 2), + getFluidStack("potion.vodka", 1), 16, 16, true); GT_Values.RA.addDistilleryRecipe( GT_Utility.getIntegratedCircuit(1), - FluidRegistry.getFluidStack("potion.lemonade", 2), - FluidRegistry.getFluidStack("potion.alcopops", 1), + getFluidStack("potion.lemonade", 2), + getFluidStack("potion.alcopops", 1), 16, 16, true); @@ -5356,13 +5348,13 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addDistilleryRecipe( GT_Utility.getIntegratedCircuit(1), Materials.Glue.getFluid(8L), - FluidRegistry.getFluidStack("glue", 8), + getFluidStack("glue", 8), 1, 24, false); GT_Values.RA.addDistilleryRecipe( GT_Utility.getIntegratedCircuit(1), - FluidRegistry.getFluidStack("glue", 8), + getFluidStack("glue", 8), Materials.Glue.getFluid(4L), 1, 24, @@ -5407,67 +5399,67 @@ public class GT_MachineRecipeLoader implements Runnable { false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L), - FluidRegistry.getFluidStack("liquid_light_oil", 750), - FluidRegistry.getFluidStack("lubricant", 500), + getFluidStack("liquid_light_oil", 750), + getFluidStack("lubricant", 500), 128, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L), - FluidRegistry.getFluidStack("liquid_light_oil", 750), - FluidRegistry.getFluidStack("lubricant", 500), + getFluidStack("liquid_light_oil", 750), + getFluidStack("lubricant", 500), 128, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - FluidRegistry.getFluidStack("liquid_light_oil", 750), - FluidRegistry.getFluidStack("lubricant", 500), + getFluidStack("liquid_light_oil", 750), + getFluidStack("lubricant", 500), 128, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L), - FluidRegistry.getFluidStack("liquid_medium_oil", 750), - FluidRegistry.getFluidStack("lubricant", 750), + getFluidStack("liquid_medium_oil", 750), + getFluidStack("lubricant", 750), 128, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L), - FluidRegistry.getFluidStack("liquid_medium_oil", 750), - FluidRegistry.getFluidStack("lubricant", 750), + getFluidStack("liquid_medium_oil", 750), + getFluidStack("lubricant", 750), 128, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - FluidRegistry.getFluidStack("liquid_medium_oil", 750), - FluidRegistry.getFluidStack("lubricant", 750), + getFluidStack("liquid_medium_oil", 750), + getFluidStack("lubricant", 750), 128, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L), - FluidRegistry.getFluidStack("liquid_heavy_oil", 500), - FluidRegistry.getFluidStack("lubricant", 750), + getFluidStack("liquid_heavy_oil", 500), + getFluidStack("lubricant", 750), 64, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L), - FluidRegistry.getFluidStack("liquid_heavy_oil", 500), - FluidRegistry.getFluidStack("lubricant", 750), + getFluidStack("liquid_heavy_oil", 500), + getFluidStack("lubricant", 750), 64, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - FluidRegistry.getFluidStack("liquid_heavy_oil", 500), - FluidRegistry.getFluidStack("lubricant", 750), + getFluidStack("liquid_heavy_oil", 500), + getFluidStack("lubricant", 750), 64, 4, false); @@ -5870,19 +5862,19 @@ public class GT_MachineRecipeLoader implements Runnable { false); GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "fertilizerBio", 4L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "fertilizerBio", 4L, 0), FluidRegistry.WATER, FluidRegistry.getFluid("biomass"), false); GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "mulch", 16L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "mulch", 16L, 0), GT_ModHandler.getDistilledWater(750L).getFluid(), FluidRegistry.getFluid("biomass"), false); GT_Values.RA.addBrewingRecipeCustom( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "mulch", 8L, 0), - FluidRegistry.getFluidStack("juice", 500), - FluidRegistry.getFluidStack("biomass", 750), + getModItem(GT_MachineRecipeLoader.aTextForestry, "mulch", 8L, 0), + getFluidStack("juice", 500), + getFluidStack("biomass", 750), 128, 4, false); @@ -5890,14 +5882,14 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addBrewingRecipeCustom( GT_ModHandler.getIC2Item("biochaff", 1), GT_ModHandler.getWater(1000L), - FluidRegistry.getFluidStack("ic2biomass", 1000), + getFluidStack("ic2biomass", 1000), 170, 4, false); GT_Values.RA.addBrewingRecipeCustom( GT_ModHandler.getIC2Item("biochaff", 1), GT_ModHandler.getDistilledWater(500L), - FluidRegistry.getFluidStack("ic2biomass", 1000), + getFluidStack("ic2biomass", 1000), 10, 30, false); @@ -5911,7 +5903,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(100), null, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( @@ -5923,127 +5915,127 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 32767), - GT_ModHandler.getModItem("BiomesOPlenty", "plants", 4, 6), + getModItem("BiomesOPlenty", "plants", 4, 6), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 2), - GT_ModHandler.getModItem("BiomesOPlenty", "plants", 4, 6), + getModItem("BiomesOPlenty", "plants", 4, 6), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 32767), - GT_ModHandler.getModItem("harvestcraft", "oatsItem", 4), + getModItem("harvestcraft", "oatsItem", 4), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 2), - GT_ModHandler.getModItem("harvestcraft", "oatsItem", 4), + getModItem("harvestcraft", "oatsItem", 4), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 32767), - GT_ModHandler.getModItem("harvestcraft", "ryeItem", 4), + getModItem("harvestcraft", "ryeItem", 4), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 2), - GT_ModHandler.getModItem("harvestcraft", "ryeItem", 4), + getModItem("harvestcraft", "ryeItem", 4), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 32767), - GT_ModHandler.getModItem("harvestcraft", "barleyItem", 4), + getModItem("harvestcraft", "barleyItem", 4), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 2), - GT_ModHandler.getModItem("harvestcraft", "barleyItem", 4, 6), + getModItem("harvestcraft", "barleyItem", 4, 6), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 32767), - GT_ModHandler.getModItem("Natura", "barleyFood", 4), + getModItem("Natura", "barleyFood", 4), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( new ItemStack(Blocks.dirt, 1, 2), - GT_ModHandler.getModItem("Natura", "barleyFood", 4), + getModItem("Natura", "barleyFood", 4), GT_Utility.getIntegratedCircuit(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( @@ -6055,7 +6047,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); GT_Values.RA.addMixerRecipe( @@ -6067,7 +6059,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(100), GT_Values.NF, - GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L, 0), + getModItem("Forestry", "fertilizerBio", 1L, 0), 200, 16); @@ -6081,218 +6073,97 @@ public class GT_MachineRecipeLoader implements Runnable { this.addPotionRecipes("speed", GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)); this.addPotionRecipes("strength", GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)); + GT_Values.RA.addFermentingRecipe(getFluidStack("milk", 50), getFluidStack("potion.mundane", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("milk", 50), - FluidRegistry.getFluidStack("potion.mundane", 25), - 1024, - false); + getFluidStack("potion.lemonjuice", 50), getFluidStack("potion.limoncello", 25), 1024, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.lemonjuice", 50), - FluidRegistry.getFluidStack("potion.limoncello", 25), - 1024, - true); - GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.applejuice", 50), - FluidRegistry.getFluidStack("potion.cider", 25), - 1024, - false); + getFluidStack("potion.applejuice", 50), getFluidStack("potion.cider", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.goldenapplejuice", 50), - FluidRegistry.getFluidStack("potion.goldencider", 25), - 1024, - true); + getFluidStack("potion.goldenapplejuice", 50), getFluidStack("potion.goldencider", 25), 1024, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.idunsapplejuice", 50), - FluidRegistry.getFluidStack("potion.notchesbrew", 25), - 1024, - true); + getFluidStack("potion.idunsapplejuice", 50), getFluidStack("potion.notchesbrew", 25), 1024, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.reedwater", 50), - FluidRegistry.getFluidStack("potion.rum", 25), - 1024, - true); + getFluidStack("potion.reedwater", 50), getFluidStack("potion.rum", 25), 1024, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.rum", 50), - FluidRegistry.getFluidStack("potion.piratebrew", 10), - 2048, - false); + getFluidStack("potion.rum", 50), getFluidStack("potion.piratebrew", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.grapejuice", 50), - FluidRegistry.getFluidStack("potion.wine", 25), - 1024, - false); + getFluidStack("potion.grapejuice", 50), getFluidStack("potion.wine", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.wine", 50), - FluidRegistry.getFluidStack("potion.vinegar", 10), - 2048, - true); + getFluidStack("potion.wine", 50), getFluidStack("potion.vinegar", 10), 2048, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.wheatyjuice", 50), - FluidRegistry.getFluidStack("potion.scotch", 25), - 1024, - true); + getFluidStack("potion.wheatyjuice", 50), getFluidStack("potion.scotch", 25), 1024, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.scotch", 50), - FluidRegistry.getFluidStack("potion.glenmckenner", 10), - 2048, - true); + getFluidStack("potion.scotch", 50), getFluidStack("potion.glenmckenner", 10), 2048, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.wheatyhopsjuice", 50), - FluidRegistry.getFluidStack("potion.beer", 25), - 1024, - false); + getFluidStack("potion.wheatyhopsjuice", 50), getFluidStack("potion.beer", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.hopsjuice", 50), - FluidRegistry.getFluidStack("potion.darkbeer", 25), - 1024, - false); + getFluidStack("potion.hopsjuice", 50), getFluidStack("potion.darkbeer", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.darkbeer", 50), - FluidRegistry.getFluidStack("potion.dragonblood", 10), - 2048, - true); + getFluidStack("potion.darkbeer", 50), getFluidStack("potion.dragonblood", 10), 2048, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.beer", 75), - FluidRegistry.getFluidStack("potion.vinegar", 50), - 2048, - false); + getFluidStack("potion.beer", 75), getFluidStack("potion.vinegar", 50), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.cider", 75), - FluidRegistry.getFluidStack("potion.vinegar", 50), - 2048, - false); + getFluidStack("potion.cider", 75), getFluidStack("potion.vinegar", 50), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.goldencider", 75), - FluidRegistry.getFluidStack("potion.vinegar", 50), - 2048, - true); + getFluidStack("potion.goldencider", 75), getFluidStack("potion.vinegar", 50), 2048, true); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.rum", 75), - FluidRegistry.getFluidStack("potion.vinegar", 50), - 2048, - false); + getFluidStack("potion.rum", 75), getFluidStack("potion.vinegar", 50), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.wine", 75), - FluidRegistry.getFluidStack("potion.vinegar", 50), - 2048, - false); + getFluidStack("potion.wine", 75), getFluidStack("potion.vinegar", 50), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.awkward", 50), - FluidRegistry.getFluidStack("potion.weakness", 25), - 1024, - false); + getFluidStack("potion.awkward", 50), getFluidStack("potion.weakness", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.mundane", 50), - FluidRegistry.getFluidStack("potion.weakness", 25), - 1024, - false); + getFluidStack("potion.mundane", 50), getFluidStack("potion.weakness", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.thick", 50), - FluidRegistry.getFluidStack("potion.weakness", 25), - 1024, - false); + getFluidStack("potion.thick", 50), getFluidStack("potion.weakness", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.poison", 50), - FluidRegistry.getFluidStack("potion.damage", 25), - 1024, - false); + getFluidStack("potion.poison", 50), getFluidStack("potion.damage", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.health", 50), - FluidRegistry.getFluidStack("potion.damage", 25), - 1024, - false); + getFluidStack("potion.health", 50), getFluidStack("potion.damage", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.waterbreathing", 50), - FluidRegistry.getFluidStack("potion.damage", 25), - 1024, - false); + getFluidStack("potion.waterbreathing", 50), getFluidStack("potion.damage", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.nightvision", 50), - FluidRegistry.getFluidStack("potion.invisibility", 25), - 1024, - false); + getFluidStack("potion.nightvision", 50), getFluidStack("potion.invisibility", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.fireresistance", 50), - FluidRegistry.getFluidStack("potion.slowness", 25), - 1024, - false); + getFluidStack("potion.fireresistance", 50), getFluidStack("potion.slowness", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.speed", 50), - FluidRegistry.getFluidStack("potion.slowness", 25), - 1024, - false); + getFluidStack("potion.speed", 50), getFluidStack("potion.slowness", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.strength", 50), - FluidRegistry.getFluidStack("potion.weakness", 25), - 1024, - false); + getFluidStack("potion.strength", 50), getFluidStack("potion.weakness", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.regen", 50), - FluidRegistry.getFluidStack("potion.poison", 25), - 1024, - false); + getFluidStack("potion.regen", 50), getFluidStack("potion.poison", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.poison.strong", 50), - FluidRegistry.getFluidStack("potion.damage.strong", 10), - 2048, - false); + getFluidStack("potion.poison.strong", 50), getFluidStack("potion.damage.strong", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.health.strong", 50), - FluidRegistry.getFluidStack("potion.damage.strong", 10), - 2048, - false); + getFluidStack("potion.health.strong", 50), getFluidStack("potion.damage.strong", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.speed.strong", 50), - FluidRegistry.getFluidStack("potion.slowness.strong", 10), - 2048, - false); + getFluidStack("potion.speed.strong", 50), getFluidStack("potion.slowness.strong", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.strength.strong", 50), - FluidRegistry.getFluidStack("potion.weakness.strong", 10), - 2048, - false); + getFluidStack("potion.strength.strong", 50), getFluidStack("potion.weakness.strong", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.nightvision.long", 50), - FluidRegistry.getFluidStack("potion.invisibility.long", 10), + getFluidStack("potion.nightvision.long", 50), + getFluidStack("potion.invisibility.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.regen.strong", 50), - FluidRegistry.getFluidStack("potion.poison.strong", 10), - 2048, - false); + getFluidStack("potion.regen.strong", 50), getFluidStack("potion.poison.strong", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.poison.long", 50), - FluidRegistry.getFluidStack("potion.damage.long", 10), - 2048, - false); + getFluidStack("potion.poison.long", 50), getFluidStack("potion.damage.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.waterbreathing.long", 50), - FluidRegistry.getFluidStack("potion.damage.long", 10), - 2048, - false); + getFluidStack("potion.waterbreathing.long", 50), getFluidStack("potion.damage.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.fireresistance.long", 50), - FluidRegistry.getFluidStack("potion.slowness.long", 10), + getFluidStack("potion.fireresistance.long", 50), + getFluidStack("potion.slowness.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.speed.long", 50), - FluidRegistry.getFluidStack("potion.slowness.long", 10), - 2048, - false); + getFluidStack("potion.speed.long", 50), getFluidStack("potion.slowness.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.strength.long", 50), - FluidRegistry.getFluidStack("potion.weakness.long", 10), - 2048, - false); + getFluidStack("potion.strength.long", 50), getFluidStack("potion.weakness.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - FluidRegistry.getFluidStack("potion.regen.long", 50), - FluidRegistry.getFluidStack("potion.poison.long", 10), - 2048, - false); + getFluidStack("potion.regen.long", 50), getFluidStack("potion.poison.long", 10), 2048, false); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_PotatoChips.get(1L), ItemList.Food_PotatoChips.get(1L)); GT_ModHandler.addSmeltingRecipe( @@ -6325,155 +6196,113 @@ public class GT_MachineRecipeLoader implements Runnable { GT_ModHandler.addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L)); if (Loader.isModLoaded(GT_MachineRecipeLoader.aTextEBXL)) { GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "waterplant1", 1, 0), - new ItemStack(Items.dye, 4, 2)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "waterplant1", 1, 0), new ItemStack(Items.dye, 4, 2)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "vines", 1, 0), - new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "vines", 1, 0), new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 11), - new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 11), new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 10), - new ItemStack(Items.dye, 4, 5)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 10), new ItemStack(Items.dye, 4, 5)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 9), - new ItemStack(Items.dye, 4, 14)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 9), new ItemStack(Items.dye, 4, 14)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 8), - new ItemStack(Items.dye, 4, 14)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 8), new ItemStack(Items.dye, 4, 14)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 7), - new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 7), new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 6), - new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 6), new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 5), - new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 5), new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 0), - new ItemStack(Items.dye, 4, 9)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 0), new ItemStack(Items.dye, 4, 9)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 4), - new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 4), new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 3), - new ItemStack(Items.dye, 4, 13)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 3), new ItemStack(Items.dye, 4, 13)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 3), - new ItemStack(Items.dye, 4, 5)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 3), new ItemStack(Items.dye, 4, 5)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 2), - new ItemStack(Items.dye, 4, 5)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 2), new ItemStack(Items.dye, 4, 5)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 1), - new ItemStack(Items.dye, 4, 12)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 1), new ItemStack(Items.dye, 4, 12)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 15), - new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 15), new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 14), - new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 14), new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 13), - new ItemStack(Items.dye, 4, 9)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 13), new ItemStack(Items.dye, 4, 9)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 12), - new ItemStack(Items.dye, 4, 14)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 12), new ItemStack(Items.dye, 4, 14)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 11), - new ItemStack(Items.dye, 4, 7)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 11), new ItemStack(Items.dye, 4, 7)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 7), - new ItemStack(Items.dye, 4, 7)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 7), new ItemStack(Items.dye, 4, 7)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 2), - new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 2), new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 13), - new ItemStack(Items.dye, 4, 6)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 13), new ItemStack(Items.dye, 4, 6)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 6), - new ItemStack(Items.dye, 4, 12)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 6), new ItemStack(Items.dye, 4, 12)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 5), - new ItemStack(Items.dye, 4, 10)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 5), new ItemStack(Items.dye, 4, 10)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 2), - new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 2), new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 1), - new ItemStack(Items.dye, 4, 9)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 1), new ItemStack(Items.dye, 4, 9)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 0), - new ItemStack(Items.dye, 4, 13)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 0), new ItemStack(Items.dye, 4, 13)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 7), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 0)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 7), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 0)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 1), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 1), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 12), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 12), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 4), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 4), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 6), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 2)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 6), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 2)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 8), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 3)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 8), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 3)); GT_ModHandler.addExtractionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 3), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 3)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 3), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 3)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 0), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 0), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 1), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 1), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 2), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 2), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 3), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 3), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 4), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 4), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 5), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 5), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 6), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 6), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 7), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 7), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 0), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 0), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 1), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 1), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 2), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 2), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 3), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 3), ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 4), - ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 4), ItemList.IC2_Plantball.get(1)); } GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem("miscutils", "blockRainforestOakSapling", 8, 0), - ItemList.IC2_Plantball.get(1)); + getModItem(MOD_ID_GTPP, "blockRainforestOakSapling", 8, 0), ItemList.IC2_Plantball.get(1)); GT_Values.RA.addCompressorRecipe( ItemList.IC2_Compressed_Coal_Chunk.get(1L), ItemList.IC2_Industrial_Diamond.get(1L), 300, 2); @@ -6497,16 +6326,16 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), new ItemStack(Blocks.ice, 1, 0)); GT_ModHandler.addCompressionRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockQuartz", 1L)); + getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockQuartz", 1L)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 10), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockQuartz", 1L)); + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockQuartz", 1L)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 11), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 11), new ItemStack(Blocks.quartz_block, 1, 0)); GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 12), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockFluix", 1L)); + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 12), + getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockFluix", 1L)); GT_ModHandler.addCompressionRecipe(new ItemStack(Items.quartz, 4, 0), new ItemStack(Blocks.quartz_block, 1, 0)); // GT_ModHandler.addCompressionRecipe(new ItemStack(Items.wheat, 9, 0), new ItemStack(Blocks.hay_block, 1, 0)); GT_ModHandler.addCompressionRecipe( @@ -6540,6 +6369,9 @@ public class GT_MachineRecipeLoader implements Runnable { GT_ModHandler.addSmeltingRecipe( GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L)); + GT_ModHandler.addSmeltingRecipe( + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.WroughtIron, 1L)); GT_ModHandler.removeFurnaceSmelting( GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L)); GT_ModHandler.addSmeltingRecipe( @@ -6547,14 +6379,14 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L)); GT_ModHandler.addPulverisationRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockSkyStone", 1L, 32767), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 45), + getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockSkyStone", 1L, 32767), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 45), GT_Values.NI, 0, false); GT_ModHandler.addPulverisationRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockSkyChest", 1L, 32767), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 45), + getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockSkyChest", 1L, 32767), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 45), GT_Values.NI, 0, false); @@ -6666,14 +6498,22 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addForgeHammerRecipe(ItemList.Firebrick.get(1), Materials.Brick.getDust(1), 10, 16); GT_Values.RA.addForgeHammerRecipe(ItemList.Casing_Firebricks.get(1), ItemList.Firebrick.get(3), 10, 16); + GT_Values.RA.addForgeHammerRecipe( + new ItemStack[] {ItemList.Tesseract.get(1L), getModItem(MOD_ID_GTPP, "MU-metaitem.01", 1, 32105)}, + new FluidStack[] {Materials.SpaceTime.getMolten(2880L)}, + null, + new FluidStack[] {Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)}, + 10 * 20, + (int) Tier.RECIPE_UXV); + if (Loader.isModLoaded("HardcoreEnderExpansion")) { GT_Values.RA.addForgeHammerRecipe( - GT_ModHandler.getModItem("HardcoreEnderExpansion", "endium_ore", 1), + getModItem("HardcoreEnderExpansion", "endium_ore", 1), GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1), 16, 10); GT_ModHandler.addPulverisationRecipe( - GT_ModHandler.getModItem("HardcoreEnderExpansion", "endium_ore", 1), + getModItem("HardcoreEnderExpansion", "endium_ore", 1), GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1), 50, @@ -6683,7 +6523,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.HeeEndium, - GT_ModHandler.getModItem("HardcoreEnderExpansion", "endium_ingot", 1), + getModItem("HardcoreEnderExpansion", "endium_ingot", 1), true, true); } @@ -6704,6 +6544,22 @@ public class GT_MachineRecipeLoader implements Runnable { 2_000_000_000, 13500); + // Quantum anomaly recipe bypass for UXV. Avoids RNG. + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[] { + getModItem(MOD_ID_DC, "item.ChromaticLens", 1), getModItem("GoodGenerator", "huiCircuit", 1, 4) + }, + new FluidStack[] { + Materials.WhiteDwarfMatter.getMolten(144), + getFluidStack("molten.shirabon", 72), + Materials.BlackDwarfMatter.getMolten(144) + }, + new ItemStack[] {getModItem(MOD_ID_GTPP, "MU-metaitem.01", 1, 32105)}, + new FluidStack[] {NF}, + 50 * 20, + (int) Tier.UXV, + 13_500); + GT_Values.RA.addAmplifier(ItemList.IC2_Scrap.get(9L), 180, 1); GT_Values.RA.addAmplifier(ItemList.IC2_Scrapbox.get(1L), 180, 1); @@ -7094,7 +6950,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem("GalacticraftCore", "item.heavyPlating", 1L), + getModItem("GalacticraftCore", "item.heavyPlating", 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2L), GT_Utility.getIntegratedCircuit(1) }, @@ -7104,7 +6960,7 @@ public class GT_MachineRecipeLoader implements Runnable { 1920); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 3), + getModItem("GalacticraftMars", "item.null", 1L, 3), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4L), GT_Utility.getIntegratedCircuit(1) }, @@ -7115,17 +6971,17 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addImplosionRecipe( ItemList.Ingot_Heavy1.get(1L), 8, - GT_ModHandler.getModItem("GalacticraftCore", "item.heavyPlating", 1L), + getModItem("GalacticraftCore", "item.heavyPlating", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.StainlessSteel, 1L)); GT_Values.RA.addImplosionRecipe( ItemList.Ingot_Heavy2.get(1L), 16, - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 3), + getModItem("GalacticraftMars", "item.null", 1L, 3), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 2L)); GT_Values.RA.addImplosionRecipe( ItemList.Ingot_Heavy3.get(1L), 24, - GT_ModHandler.getModItem("GalacticraftMars", "item.itemBasicAsteroids", 1L), + getModItem("GalacticraftMars", "item.itemBasicAsteroids", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Platinum, 3L)); } @@ -7222,21 +7078,21 @@ public class GT_MachineRecipeLoader implements Runnable { } GT_Values.RA.addFuel(new ItemStack(Items.golden_apple, 1, 1), new ItemStack(Items.apple, 1), 6400, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 6), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "GluttonyShard", 1L), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "FMResource", 1L, 3), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "NetherShard", 1L), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "NetherShard", 1L, 1), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "NetherShard", 1L, 2), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "NetherShard", 1L, 3), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "NetherShard", 1L, 4), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "NetherShard", 1L, 5), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ForbiddenMagic", "NetherShard", 1L, 6), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("TaintedMagic", "WarpedShard", 1L), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("TaintedMagic", "FluxShard", 1L), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("TaintedMagic", "EldritchShard", 1L), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1L, 6), null, 720, 5); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1L, 7), null, 720, 5); + GT_Values.RA.addFuel(getModItem("Thaumcraft", "ItemShard", 1L, 6), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "GluttonyShard", 1L), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "FMResource", 1L, 3), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "NetherShard", 1L), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "NetherShard", 1L, 1), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "NetherShard", 1L, 2), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "NetherShard", 1L, 3), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "NetherShard", 1L, 4), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "NetherShard", 1L, 5), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ForbiddenMagic", "NetherShard", 1L, 6), null, 720, 5); + GT_Values.RA.addFuel(getModItem("TaintedMagic", "WarpedShard", 1L), null, 720, 5); + GT_Values.RA.addFuel(getModItem("TaintedMagic", "FluxShard", 1L), null, 720, 5); + GT_Values.RA.addFuel(getModItem("TaintedMagic", "EldritchShard", 1L), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ThaumicTinkerer", "kamiResource", 1L, 6), null, 720, 5); + GT_Values.RA.addFuel(getModItem("ThaumicTinkerer", "kamiResource", 1L, 7), null, 720, 5); // H2O = 2H + O GT_Values.RA.addElectrolyzerRecipe( @@ -7790,7 +7646,7 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.HydrochloricAcid.getFluid(2000), Materials.Hydrogen.getGas(2000), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 3L, 63), + getModItem("bartworks", "gt.bwMetaGenerateddust", 3L, 63), 900, 30); // SiCl4 + 2Zn = 2ZnCl2 + Si @@ -7800,7 +7656,7 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SiliconTetrachloride.getFluid(1000), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 6L, 10052), + getModItem("bartworks", "gt.bwMetaGenerateddust", 6L, 10052), 400, 30); } @@ -7972,7 +7828,7 @@ public class GT_MachineRecipeLoader implements Runnable { 160, 4); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 18), + getModItem("Thaumcraft", "ItemResource", 1, 18), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1L)}, null, 21, @@ -8094,25 +7950,15 @@ public class GT_MachineRecipeLoader implements Runnable { if (Loader.isModLoaded("bartworks")) { // xenon GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 134), - null, - FluidRegistry.getFluidStack("xenon", 250), - 100 * 100, - 50, - 8192); + getModItem("gregtech", "gt.comb", 1L, 134), null, getFluidStack("xenon", 250), 100 * 100, 50, 8192); // neon GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 135), - null, - FluidRegistry.getFluidStack("neon", 250), - 100 * 100, - 15, - 8192); + getModItem("gregtech", "gt.comb", 1L, 135), null, getFluidStack("neon", 250), 100 * 100, 15, 8192); // krpton GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 136), + getModItem("gregtech", "gt.comb", 1L, 136), null, - FluidRegistry.getFluidStack("krypton", 250), + getFluidStack("krypton", 250), 100 * 100, 25, 8192); @@ -8120,7 +7966,7 @@ public class GT_MachineRecipeLoader implements Runnable { if (Loader.isModLoaded("Thaumcraft")) { // air GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 144), + getModItem("gregtech", "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, @@ -8135,7 +7981,7 @@ public class GT_MachineRecipeLoader implements Runnable { 12); // fire GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 146), + getModItem("gregtech", "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, @@ -8150,7 +7996,7 @@ public class GT_MachineRecipeLoader implements Runnable { 12); // aqua GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 147), + getModItem("gregtech", "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, @@ -8165,7 +8011,7 @@ public class GT_MachineRecipeLoader implements Runnable { 12); // terra GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 145), + getModItem("gregtech", "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, @@ -8180,7 +8026,7 @@ public class GT_MachineRecipeLoader implements Runnable { 12); // ordo GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 148), + getModItem("gregtech", "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, @@ -8195,7 +8041,7 @@ public class GT_MachineRecipeLoader implements Runnable { 12); // perditio GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 149), + getModItem("gregtech", "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, @@ -8210,11 +8056,11 @@ public class GT_MachineRecipeLoader implements Runnable { 12); // Nethershard GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 152), + getModItem("gregtech", "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, - GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1L, 6), + getModItem("ThaumicTinkerer", "kamiResource", 1L, 6), GT_Values.NI, GT_Values.NI, GT_Values.NI, @@ -8225,11 +8071,11 @@ public class GT_MachineRecipeLoader implements Runnable { 512); // Endshard GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 153), + getModItem("gregtech", "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, - GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1L, 7), + getModItem("ThaumicTinkerer", "kamiResource", 1L, 7), GT_Values.NI, GT_Values.NI, GT_Values.NI, @@ -8243,8 +8089,8 @@ public class GT_MachineRecipeLoader implements Runnable { String tKey = "GT_BALANCE_SHARD_RECIPE"; GregTech_API.sThaumcraftCompat.addCrucibleRecipe( "TB.SM", - GT_ModHandler.getModItem(MOD_ID_TC, "ItemResource", 1L, 14), - GT_ModHandler.getModItem(MOD_ID_TC, "ItemShard", 1L, 6), + getModItem(MOD_ID_TC, "ItemResource", 1L, 14), + getModItem(MOD_ID_TC, "ItemShard", 1L, 6), Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))); @@ -8252,45 +8098,45 @@ public class GT_MachineRecipeLoader implements Runnable { if (Loader.isModLoaded("ExtraUtilities")) { // Caelestis red GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 154), + getModItem("gregtech", "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 2), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 10), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 14), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 1), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 12), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 6), + getModItem("ExtraUtilities", "greenscreen", 1L, 2), + getModItem("ExtraUtilities", "greenscreen", 1L, 10), + getModItem("ExtraUtilities", "greenscreen", 1L, 14), + getModItem("ExtraUtilities", "greenscreen", 1L, 1), + getModItem("ExtraUtilities", "greenscreen", 1L, 12), + getModItem("ExtraUtilities", "greenscreen", 1L, 6), null, 512, 12); // Caelestis green GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 155), + getModItem("gregtech", "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 13), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 5), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 4), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 8), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 0), + getModItem("ExtraUtilities", "greenscreen", 1L, 13), + getModItem("ExtraUtilities", "greenscreen", 1L, 5), + getModItem("ExtraUtilities", "greenscreen", 1L, 4), + getModItem("ExtraUtilities", "greenscreen", 1L, 8), + getModItem("ExtraUtilities", "greenscreen", 1L, 0), NI, null, 512, 12); // Caelestis blue GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("gregtech", "gt.comb", 1L, 156), + getModItem("gregtech", "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, null, - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 3), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 9), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 11), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 7), - GT_ModHandler.getModItem("ExtraUtilities", "greenscreen", 1L, 15), + getModItem("ExtraUtilities", "greenscreen", 1L, 3), + getModItem("ExtraUtilities", "greenscreen", 1L, 9), + getModItem("ExtraUtilities", "greenscreen", 1L, 11), + getModItem("ExtraUtilities", "greenscreen", 1L, 7), + getModItem("ExtraUtilities", "greenscreen", 1L, 15), NI, null, 512, @@ -8472,8 +8318,8 @@ public class GT_MachineRecipeLoader implements Runnable { 8); // We use rubber GT_Values.RA.addCutterRecipe( - GT_ModHandler.getModItem("BuildCraft|Transport", "item.buildcraftPipe.pipestructurecobblestone", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipePlug", 8L, 0), + getModItem("BuildCraft|Transport", "item.buildcraftPipe.pipestructurecobblestone", 1L, 0), + getModItem("BuildCraft|Transport", "pipePlug", 8L, 0), GT_Values.NI, 32, 16); @@ -8488,8 +8334,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addCutterRecipe( new ItemStack(Blocks.glass, 3, 0), new ItemStack(Blocks.glass_pane, 8, 0), GT_Values.NI, 50, 8); GT_Values.RA.addCutterRecipe( - GT_ModHandler.getModItem("TConstruct", "GlassBlock", 3L, 0), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 8L, 0), + getModItem("TConstruct", "GlassBlock", 3L, 0), + getModItem("TConstruct", "GlassPane", 8L, 0), GT_Values.NI, 50, 8); @@ -8564,9 +8410,8 @@ public class GT_MachineRecipeLoader implements Runnable { int i = 0; for (ItemStack cover : coverIDs) { if (loaded) { - ItemStack slabWood = GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "slabs", 1, i); - ItemStack slabWoodFireproof = - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "slabsFireproof", 1, i); + ItemStack slabWood = getModItem(GT_MachineRecipeLoader.aTextForestry, "slabs", 1, i); + ItemStack slabWoodFireproof = getModItem(GT_MachineRecipeLoader.aTextForestry, "slabsFireproof", 1, i); GT_ModHandler.addCraftingRecipe( cover, GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, @@ -8642,13 +8487,13 @@ public class GT_MachineRecipeLoader implements Runnable { 50, 8); GT_Values.RA.addLatheRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "slabs", 1L, GT_Values.W), + getModItem(GT_MachineRecipeLoader.aTextForestry, "slabs", 1L, GT_Values.W), new ItemStack(Items.bowl, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1), 50, 8); GT_Values.RA.addLatheRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "woodslab", 1L, GT_Values.W), + getModItem(GT_MachineRecipeLoader.aTextEBXL, "woodslab", 1L, GT_Values.W), new ItemStack(Items.bowl, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1), 50, @@ -9083,7 +8928,7 @@ public class GT_MachineRecipeLoader implements Runnable { 16); if (Loader.isModLoaded("bartworks")) { GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 6L, 88), + getModItem("bartworks", "gt.bwMetaGeneratedplate", 6L, 88), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1L), ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), 50, @@ -9417,73 +9262,73 @@ public class GT_MachineRecipeLoader implements Runnable { if (Loader.isModLoaded("IC2NuclearControl")) { // Card recycling recipes GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemVanillaMachineCard", 1L, 0), + getModItem("IC2NuclearControl", "ItemVanillaMachineCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemInventoryScannerCard", 1L, 0), + getModItem("IC2NuclearControl", "ItemInventoryScannerCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemEnergySensorLocationCard", 1L, 0), + getModItem("IC2NuclearControl", "ItemEnergySensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "RFSensorCard", 1L, 0), + getModItem("IC2NuclearControl", "RFSensorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 0), + getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 1L), 200, 30); // counter GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 1), + getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 1), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 1L), 200, 30); // liquid GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 2), + getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 2), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); // generator GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemLiquidArrayLocationCard", 1L, 0), + getModItem("IC2NuclearControl", "ItemLiquidArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); // 2-6 liquid GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemEnergyArrayLocationCard", 1L, 0), + getModItem("IC2NuclearControl", "ItemEnergyArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); // 2-6 energy GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemSensorLocationCard", 1L, 0), + getModItem("IC2NuclearControl", "ItemSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2L), 200, 30); // non-fluid nuke GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "Item55ReactorCard", 1L, 0), + getModItem("IC2NuclearControl", "Item55ReactorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2L), 200, 30); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("IC2NuclearControl", "CardAppeng", 1L, 0), + getModItem("IC2NuclearControl", "CardAppeng", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, @@ -9920,7 +9765,7 @@ public class GT_MachineRecipeLoader implements Runnable { 10); if (Loader.isModLoaded(MOD_ID_FR)) { GT_Values.RA.addPyrolyseRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "fertilizerBio", 4L), + getModItem(GT_MachineRecipeLoader.aTextForestry, "fertilizerBio", 4L), Materials.Water.getFluid(4000), 1, GT_Values.NI, @@ -9928,7 +9773,7 @@ public class GT_MachineRecipeLoader implements Runnable { 900, 10); GT_Values.RA.addPyrolyseRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "mulch", 32L), + getModItem(GT_MachineRecipeLoader.aTextForestry, "mulch", 32L), Materials.Water.getFluid(4000), 1, GT_Values.NI, @@ -10595,7 +10440,7 @@ public class GT_MachineRecipeLoader implements Runnable { 4608, 5); GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.meefRaw", 12L, 32767), + getModItem("TwilightForest", "item.meefRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, Materials.Methane.getGas(576L), @@ -10609,7 +10454,7 @@ public class GT_MachineRecipeLoader implements Runnable { 4608, 5); GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.meefSteak", 16L, 32767), + getModItem("TwilightForest", "item.meefSteak", 16L, 32767), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, Materials.Methane.getGas(576L), @@ -10623,7 +10468,7 @@ public class GT_MachineRecipeLoader implements Runnable { 4608, 5); GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.venisonRaw", 12L, 32767), + getModItem("TwilightForest", "item.venisonRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, Materials.Methane.getGas(576L), @@ -10637,7 +10482,7 @@ public class GT_MachineRecipeLoader implements Runnable { 4608, 5); GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.venisonCooked", 16L, 32767), + getModItem("TwilightForest", "item.venisonCooked", 16L, 32767), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, Materials.Methane.getGas(576L), @@ -10930,7 +10775,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(10), GT_Values.NI, - FluidRegistry.getFluidStack("ic2pahoehoelava", 100), + getFluidStack("ic2pahoehoelava", 100), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), @@ -10944,7 +10789,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(20), GT_Values.NI, - FluidRegistry.getFluidStack("ic2pahoehoelava", 3600), + getFluidStack("ic2pahoehoelava", 3600), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), @@ -10973,7 +10818,7 @@ public class GT_MachineRecipeLoader implements Runnable { 20); GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 45), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 45), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, GT_Values.NF, @@ -10987,7 +10832,7 @@ public class GT_MachineRecipeLoader implements Runnable { 64, 20); GT_Values.RA.addCentrifugeRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 36L, 45), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 36L, 45), GT_Utility.getIntegratedCircuit(2), GT_Values.NF, GT_Values.NF, @@ -11065,18 +10910,16 @@ public class GT_MachineRecipeLoader implements Runnable { GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L)); GT_Utility.removeSimpleIC2MachineRecipe( - GT_Values.NI, - GT_ModHandler.getMaceratorRecipeList(), - GT_ModHandler.getModItem("IC2", "itemBiochaff", 1L)); + GT_Values.NI, GT_ModHandler.getMaceratorRecipeList(), getModItem("IC2", "itemBiochaff", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( new ItemStack(Blocks.cactus, 8, 0), GT_ModHandler.getCompressorRecipeList(), - GT_ModHandler.getModItem("IC2", "itemFuelPlantBall", 1L)); + getModItem("IC2", "itemFuelPlantBall", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( - GT_ModHandler.getModItem("ExtraTrees", "food", 8L, 24), + getModItem("ExtraTrees", "food", 8L, 24), GT_ModHandler.getCompressorRecipeList(), - GT_ModHandler.getModItem("IC2", "itemFuelPlantBall", 1L)); + getModItem("IC2", "itemFuelPlantBall", 1L)); for (MaterialStack[] tMats : mAlloySmelterList) { ItemStack tDust1 = GT_OreDictUnificator.get(OrePrefixes.dust, tMats[0].mMaterial, tMats[0].mAmount); @@ -11315,7 +11158,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 29L), 2500, 1920); - if (Loader.isModLoaded("gtnhlanth") && (Loader.isModLoaded("miscutils"))) { + if (Loader.isModLoaded("gtnhlanth") && (Loader.isModLoaded(MOD_ID_GTPP))) { // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, @@ -11513,7 +11356,7 @@ public class GT_MachineRecipeLoader implements Runnable { 1920); // 4CH2O + C2H4O =NaOH= C5H12O4 + CO GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("miscutils", "Formaldehyde", 4L), + getModItem(MOD_ID_GTPP, "Formaldehyde", 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1L), MaterialsKevlar.Acetaldehyde.getGas(1000), Materials.CarbonMonoxide.getGas(1000), @@ -11583,14 +11426,14 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1), Materials.Water.getFluid(2000L), MaterialsKevlar.Acetylene.getGas(1000L), - GT_ModHandler.getModItem("miscutils", "itemDustCalciumHydroxide", 5L), + getModItem(MOD_ID_GTPP, "itemDustCalciumHydroxide", 5L), 300, 480); GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_ModHandler.getModItem("miscutils", "itemDustCalciumChloride", 1L), + getModItem(MOD_ID_GTPP, "itemDustCalciumChloride", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9L), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9L) }, @@ -11605,7 +11448,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(9), - GT_ModHandler.getModItem("miscutils", "itemDustCalciumChloride", 7L), + getModItem(MOD_ID_GTPP, "itemDustCalciumChloride", 7L), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63L), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63L) }, @@ -11622,7 +11465,7 @@ public class GT_MachineRecipeLoader implements Runnable { new ItemStack[] { ItemList.Electric_Pump_EV.get(4L), ItemList.Field_Generator_EV.get(4L), - GT_ModHandler.getModItem("miscutils", "itemPlateInconel690", 4L), + getModItem(MOD_ID_GTPP, "itemPlateInconel690", 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16L), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L), @@ -11641,12 +11484,12 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NF, GT_Values.NF, MaterialsKevlar.CobaltIIHydroxide.getDust(5), - GT_ModHandler.getModItem("miscutils", "itemDustSodiumNitrate", 10L), + getModItem(MOD_ID_GTPP, "itemDustSodiumNitrate", 10L), 100, 120); // Rh + 3Cl = RhCl3 GT_Values.RA.addBlastRecipe( - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 1L, 78), + getModItem("bartworks", "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2), Materials.Chlorine.getGas(3000L), GT_Values.NF, @@ -12396,7 +12239,7 @@ public class GT_MachineRecipeLoader implements Runnable { // Co(NO3)2 + 2KOH = CoH2O2 + 2KNO3 GT_Values.RA.addChemicalRecipe( MaterialsKevlar.CobaltIINitrate.getDust(9), - GT_ModHandler.getModItem(MOD_ID_DC, "item.PotassiumHydroxideDust", 6L, 0), + getModItem(MOD_ID_DC, "item.PotassiumHydroxideDust", 6L, 0), GT_Values.NF, GT_Values.NF, MaterialsKevlar.CobaltIIHydroxide.getDust(5), @@ -14048,7 +13891,7 @@ public class GT_MachineRecipeLoader implements Runnable { "Transformation of obsidian into skystone", new String[] {"GT_ADVANCEDMETALLURGY"}, "ALCHEMY", - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), + getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), 4, 0, 19, @@ -14065,7 +13908,7 @@ public class GT_MachineRecipeLoader implements Runnable { GregTech_API.sThaumcraftCompat.addCrucibleRecipe( tKey, new ItemStack(Blocks.obsidian), - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), + getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), @@ -14656,7 +14499,7 @@ public class GT_MachineRecipeLoader implements Runnable { false); GT_Values.RA.addUniversalDistillationRecipe( - FluidRegistry.getFluidStack("potion.vinegar", 40), + getFluidStack("potion.vinegar", 40), new FluidStack[] {Materials.AceticAcid.getFluid(5), Materials.Water.getFluid(35)}, GT_Values.NI, 20, @@ -19760,60 +19603,58 @@ public class GT_MachineRecipeLoader implements Runnable { }; ItemStack[] chests = { - Loader.isModLoaded(MOD_ID_DC) - ? GT_ModHandler.getModItem(MOD_ID_DC, "BabyChest", 1) - : new ItemStack(Blocks.chest), + Loader.isModLoaded(MOD_ID_DC) ? getModItem(MOD_ID_DC, "BabyChest", 1) : new ItemStack(Blocks.chest), new ItemStack(Blocks.chest), Loader.isModLoaded("IronChest") - ? GT_ModHandler.getModItem("IronChest", "BlockIronChest", 1, 3) + ? getModItem("IronChest", "BlockIronChest", 1, 3) : new ItemStack(Blocks.chest), Loader.isModLoaded("IronChest") - ? GT_ModHandler.getModItem("IronChest", "BlockIronChest", 1) + ? getModItem("IronChest", "BlockIronChest", 1) : new ItemStack(Blocks.chest), Loader.isModLoaded("IronChest") - ? GT_ModHandler.getModItem("IronChest", "BlockIronChest", 1, 4) + ? getModItem("IronChest", "BlockIronChest", 1, 4) : new ItemStack(Blocks.chest), Loader.isModLoaded("IronChest") - ? GT_ModHandler.getModItem("IronChest", "BlockIronChest", 1, 1) + ? getModItem("IronChest", "BlockIronChest", 1, 1) : new ItemStack(Blocks.chest), Loader.isModLoaded("IronChest") - ? GT_ModHandler.getModItem("IronChest", "BlockIronChest", 1, 2) + ? getModItem("IronChest", "BlockIronChest", 1, 2) : new ItemStack(Blocks.chest), Loader.isModLoaded("IronChest") - ? GT_ModHandler.getModItem("IronChest", "BlockIronChest", 1, 5) + ? getModItem("IronChest", "BlockIronChest", 1, 5) : new ItemStack(Blocks.chest), Loader.isModLoaded("IronChest") - ? GT_ModHandler.getModItem("IronChest", "BlockIronChest", 1, 6) + ? getModItem("IronChest", "BlockIronChest", 1, 6) : new ItemStack(Blocks.chest), Loader.isModLoaded("avaritiaddons") - ? GT_ModHandler.getModItem("avaritiaddons", "CompressedChest", 1) + ? getModItem("avaritiaddons", "CompressedChest", 1) : new ItemStack(Blocks.chest) }; ItemStack[] tanks = { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), Loader.isModLoaded("BuildCraft|Factory") - ? GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1) + ? getModItem("BuildCraft|Factory", "tankBlock", 1) : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), Loader.isModLoaded("irontank") - ? GT_ModHandler.getModItem("irontank", "copperTank", 1) + ? getModItem("irontank", "copperTank", 1) : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), Loader.isModLoaded("irontank") - ? GT_ModHandler.getModItem("irontank", "ironTank", 1) + ? getModItem("irontank", "ironTank", 1) : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), Loader.isModLoaded("irontank") - ? GT_ModHandler.getModItem("irontank", "silverTank", 1) + ? getModItem("irontank", "silverTank", 1) : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), Loader.isModLoaded("irontank") - ? GT_ModHandler.getModItem("irontank", "goldTank", 1) + ? getModItem("irontank", "goldTank", 1) : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), Loader.isModLoaded("irontank") - ? GT_ModHandler.getModItem("irontank", "diamondTank", 1) + ? getModItem("irontank", "diamondTank", 1) : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), Loader.isModLoaded("irontank") - ? GT_ModHandler.getModItem("irontank", "obsidianTank", 1) + ? getModItem("irontank", "obsidianTank", 1) : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 130), - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 131) + getModItem("gregtech", "gt.blockmachines", 1, 130), + getModItem("gregtech", "gt.blockmachines", 1, 131) }; ItemStack[][] aInputs = new ItemStack[10][3]; @@ -20218,13 +20059,13 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.RC_Bed_Stone.get(48L), 200, 48); - ItemStack tRailWood = GT_ModHandler.getModItem(MOD_ID_RC, "track", 64, 736); + ItemStack tRailWood = getModItem(MOD_ID_RC, "track", 64, 736); if (tRailWood != null) { NBTTagCompound tTagWood = new NBTTagCompound(); tTagWood.setString("track", "railcraft:track.slow"); tRailWood.stackTagCompound = tTagWood; - ItemStack tRailWoodB = GT_ModHandler.getModItem(MOD_ID_RC, "track.slow", 16); + ItemStack tRailWoodB = getModItem(MOD_ID_RC, "track.slow", 16); NBTTagCompound tTagWoodB = new NBTTagCompound(); tTagWoodB.setString("track", "railcraft:track.slow.boost"); tRailWoodB.stackTagCompound = tTagWoodB; @@ -20271,7 +20112,7 @@ public class GT_MachineRecipeLoader implements Runnable { 200, 30); - ItemStack tRailRe = GT_ModHandler.getModItem(MOD_ID_RC, "track", 64); + ItemStack tRailRe = getModItem(MOD_ID_RC, "track", 64); NBTTagCompound tTagRe = new NBTTagCompound(); tTagRe.setString("track", "railcraft:track.reinforced"); tRailRe.stackTagCompound = tTagRe; @@ -20287,7 +20128,7 @@ public class GT_MachineRecipeLoader implements Runnable { 200, 30); - ItemStack tRailReB = GT_ModHandler.getModItem(MOD_ID_RC, "track.reinforced", 16); + ItemStack tRailReB = getModItem(MOD_ID_RC, "track.reinforced", 16); NBTTagCompound tTagReB = new NBTTagCompound(); tTagReB.setString("track", "railcraft:track.reinforced.boost"); tRailReB.stackTagCompound = tTagReB; @@ -20303,7 +20144,7 @@ public class GT_MachineRecipeLoader implements Runnable { 300, 30); - ItemStack tRailEl = GT_ModHandler.getModItem(MOD_ID_RC, "track", 64); + ItemStack tRailEl = getModItem(MOD_ID_RC, "track", 64); NBTTagCompound tTagEl = new NBTTagCompound(); tTagEl.setString("track", "railcraft:track.electric"); tRailEl.stackTagCompound = tTagEl; @@ -20319,7 +20160,7 @@ public class GT_MachineRecipeLoader implements Runnable { 200, 30); - ItemStack tRailHs = GT_ModHandler.getModItem(MOD_ID_RC, "track", 64, 816); + ItemStack tRailHs = getModItem(MOD_ID_RC, "track", 64, 816); if (tRailHs != null) { NBTTagCompound tTagHs = new NBTTagCompound(); tTagHs.setString("track", "railcraft:track.speed"); @@ -20334,7 +20175,7 @@ public class GT_MachineRecipeLoader implements Runnable { 200, 30); } - ItemStack tRailHsB = GT_ModHandler.getModItem(MOD_ID_RC, "track.speed", 16); + ItemStack tRailHsB = getModItem(MOD_ID_RC, "track.speed", 16); NBTTagCompound tTagHsB = new NBTTagCompound(); tTagHsB.setString("track", "railcraft:track.speed.boost"); tRailHsB.stackTagCompound = tTagHsB; @@ -20351,7 +20192,7 @@ public class GT_MachineRecipeLoader implements Runnable { 30); // --- Wooden Switch Track --- - ItemStack tRailSS = GT_ModHandler.getModItem(MOD_ID_RC, "track.slow", 1, 19986); + ItemStack tRailSS = getModItem(MOD_ID_RC, "track.slow", 1, 19986); if (tRailSS != null) { NBTTagCompound tTagSS = new NBTTagCompound(); tTagSS.setString("track", "railcraft:track.slow.switch"); @@ -20429,7 +20270,7 @@ public class GT_MachineRecipeLoader implements Runnable { 256); } // --- Wooden Wye Track --- - ItemStack tRailSW = GT_ModHandler.getModItem(MOD_ID_RC, "track.slow", 1); + ItemStack tRailSW = getModItem(MOD_ID_RC, "track.slow", 1); if (tRailSW != null) { NBTTagCompound tTagSW = new NBTTagCompound(); tTagSW.setString("track", "railcraft:track.slow.wye"); @@ -20507,7 +20348,7 @@ public class GT_MachineRecipeLoader implements Runnable { 256); } // --- Wooden Junction Tack --- - ItemStack tRailSJ = GT_ModHandler.getModItem(MOD_ID_RC, "track.slow", 1); + ItemStack tRailSJ = getModItem(MOD_ID_RC, "track.slow", 1); if (tRailSJ != null) { NBTTagCompound tTagSJ = new NBTTagCompound(); tTagSJ.setString("track", "railcraft:track.slow.junction"); @@ -20585,7 +20426,7 @@ public class GT_MachineRecipeLoader implements Runnable { 256); } // --- Switch Tack --- - ItemStack tRailNS = GT_ModHandler.getModItem(MOD_ID_RC, "track", 1, 4767); + ItemStack tRailNS = getModItem(MOD_ID_RC, "track", 1, 4767); if (tRailNS != null) { NBTTagCompound tTagNS = new NBTTagCompound(); tTagNS.setString("track", "railcraft:track.switch"); @@ -20663,7 +20504,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Wye Tack --- - ItemStack tRailNW = GT_ModHandler.getModItem(MOD_ID_RC, "track", 1, 2144); + ItemStack tRailNW = getModItem(MOD_ID_RC, "track", 1, 2144); if (tRailNW != null) { NBTTagCompound tTagNW = new NBTTagCompound(); tTagNW.setString("track", "railcraft:track.wye"); @@ -20741,7 +20582,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Junction Tack --- - ItemStack tRailNJ = GT_ModHandler.getModItem(MOD_ID_RC, "track", 1); + ItemStack tRailNJ = getModItem(MOD_ID_RC, "track", 1); if (tRailNJ != null) { NBTTagCompound tTagNJ = new NBTTagCompound(); tTagNJ.setString("track", "railcraft:track.junction"); @@ -20819,7 +20660,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Reinforced Switch Track --- - ItemStack tRailRS = GT_ModHandler.getModItem(MOD_ID_RC, "track.reinforced", 1); + ItemStack tRailRS = getModItem(MOD_ID_RC, "track.reinforced", 1); if (tRailRS != null) { NBTTagCompound tTagRS = new NBTTagCompound(); tTagRS.setString("track", "railcraft:track.reinforced.switch"); @@ -20897,7 +20738,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Reinforced Wye Track --- - ItemStack tRailRW = GT_ModHandler.getModItem(MOD_ID_RC, "track.reinforced", 1); + ItemStack tRailRW = getModItem(MOD_ID_RC, "track.reinforced", 1); if (tRailRW != null) { NBTTagCompound tTagRW = new NBTTagCompound(); tTagRW.setString("track", "railcraft:track.reinforced.wye"); @@ -20975,7 +20816,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Reinforced Junction Track --- - ItemStack tRailRJ = GT_ModHandler.getModItem(MOD_ID_RC, "track.reinforced", 1, 764); + ItemStack tRailRJ = getModItem(MOD_ID_RC, "track.reinforced", 1, 764); if (tRailRJ != null) { NBTTagCompound tTagRJ = new NBTTagCompound(); tTagRJ.setString("track", "railcraft:track.reinforced.junction"); @@ -21053,7 +20894,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- H.S. Switch Track --- - ItemStack tRailSSw = GT_ModHandler.getModItem(MOD_ID_RC, "track.speed", 1, 7916); + ItemStack tRailSSw = getModItem(MOD_ID_RC, "track.speed", 1, 7916); if (tRailSSw != null) { NBTTagCompound tTagRSSw = new NBTTagCompound(); tTagRSSw.setString("track", "railcraft:track.speed.switch"); @@ -21131,7 +20972,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- H.S. Wye Track --- - ItemStack tRailSWy = GT_ModHandler.getModItem(MOD_ID_RC, "track.speed", 1); + ItemStack tRailSWy = getModItem(MOD_ID_RC, "track.speed", 1); if (tRailSWy != null) { NBTTagCompound tTagRSWy = new NBTTagCompound(); tTagRSWy.setString("track", "railcraft:track.speed.wye"); @@ -21209,7 +21050,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- H.S. Transition Track --- - ItemStack tRailSTt = GT_ModHandler.getModItem(MOD_ID_RC, "track.speed", 1, 26865); + ItemStack tRailSTt = getModItem(MOD_ID_RC, "track.speed", 1, 26865); if (tRailSTt != null) { NBTTagCompound tTagRSTt = new NBTTagCompound(); tTagRSTt.setString("track", "railcraft:track.speed.transition"); @@ -21272,7 +21113,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Electric Switch Track --- - ItemStack tRailES = GT_ModHandler.getModItem(MOD_ID_RC, "track.electric", 1, 10488); + ItemStack tRailES = getModItem(MOD_ID_RC, "track.electric", 1, 10488); if (tRailES != null) { NBTTagCompound tTagES = new NBTTagCompound(); tTagES.setString("track", "railcraft:track.electric.switch"); @@ -21350,7 +21191,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Electric Wye Track --- - ItemStack tRailEw = GT_ModHandler.getModItem(MOD_ID_RC, "track.electric", 1); + ItemStack tRailEw = getModItem(MOD_ID_RC, "track.electric", 1); if (tRailEw != null) { NBTTagCompound tTagEw = new NBTTagCompound(); tTagEw.setString("track", "railcraft:track.electric.wye"); @@ -21428,7 +21269,7 @@ public class GT_MachineRecipeLoader implements Runnable { 480); } // --- Electric Junction Track --- - ItemStack tRailEJ = GT_ModHandler.getModItem(MOD_ID_RC, "track.electric", 1); + ItemStack tRailEJ = getModItem(MOD_ID_RC, "track.electric", 1); if (tRailEJ != null) { NBTTagCompound tTagREJ = new NBTTagCompound(); tTagREJ.setString("track", "railcraft:track.electric.junction"); @@ -21589,7 +21430,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Cover_Controller.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 4L, 0), + getModItem(MOD_ID_RC, "part.circuit", 4L, 0), 300, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -21599,17 +21440,17 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Sensor_LV.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 4L, 1), + getModItem(MOD_ID_RC, "part.circuit", 4L, 1), 300, 30); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - GT_ModHandler.getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) + getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 4L, 2), + getModItem(MOD_ID_RC, "part.circuit", 4L, 2), 300, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -21619,7 +21460,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Cover_Controller.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 8L, 0), + getModItem(MOD_ID_RC, "part.circuit", 8L, 0), 400, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -21629,17 +21470,17 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Sensor_LV.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 8L, 1), + getModItem(MOD_ID_RC, "part.circuit", 8L, 1), 400, 30); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - GT_ModHandler.getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) + getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 8L, 2), + getModItem(MOD_ID_RC, "part.circuit", 8L, 2), 400, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -21649,7 +21490,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Cover_Controller.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 16L, 0), + getModItem(MOD_ID_RC, "part.circuit", 16L, 0), 500, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -21659,17 +21500,17 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Sensor_LV.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 16L, 1), + getModItem(MOD_ID_RC, "part.circuit", 16L, 1), 500, 30); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Epoxy_Advanced.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - GT_ModHandler.getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) + getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "part.circuit", 16L, 2), + getModItem(MOD_ID_RC, "part.circuit", 16L, 2), 500, 30); // chunkloader upgrade OC @@ -21677,12 +21518,12 @@ public class GT_MachineRecipeLoader implements Runnable { new ItemStack[] { ItemList.Circuit_Board_Plastic_Advanced.get(1L), GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2L), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 1L, 0), - GT_ModHandler.getModItem("OpenComputers", "item", 1L, 26), + getModItem(MOD_ID_RC, "machine.alpha", 1L, 0), + getModItem("OpenComputers", "item", 1L, 26), GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(144L * tMultiplier / 2L), - GT_ModHandler.getModItem("OpenComputers", "item", 1L, 62), + getModItem("OpenComputers", "item", 1L, 62), 250, 256); } @@ -21696,7 +21537,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, Materials.SeedOil.getFluid(250L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.EngineCore", 1L, 0), + getModItem(MOD_ID_DC, "item.EngineCore", 1L, 0), 100, 16); GT_Values.RA.addAssemblerRecipe( @@ -21707,48 +21548,48 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, Materials.Lubricant.getFluid(125L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.EngineCore", 1L, 0), + getModItem(MOD_ID_DC, "item.EngineCore", 1L, 0), 100, 16); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem("ExtraUtilities", "trashcan", 1L, 0), + getModItem("ExtraUtilities", "trashcan", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4L), GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 11), + getModItem(MOD_ID_RC, "machine.beta", 1L, 11), 200, 16); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem(MOD_ID_DC, "item.EngineCore", 1L), + getModItem(MOD_ID_DC, "item.EngineCore", 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10L), GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 7), + getModItem(MOD_ID_RC, "machine.beta", 1L, 7), 200, 16); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem(MOD_ID_DC, "item.EngineCore", 1L), + getModItem(MOD_ID_DC, "item.EngineCore", 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10L), GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 8), + getModItem(MOD_ID_RC, "machine.beta", 1L, 8), 200, 16); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem(MOD_ID_DC, "item.EngineCore", 1L), + getModItem(MOD_ID_DC, "item.EngineCore", 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10L), GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 9), + getModItem(MOD_ID_RC, "machine.beta", 1L, 9), 200, 16); GT_Values.RA.addAssemblerRecipe( @@ -21760,14 +21601,14 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 1, 0), + getModItem(MOD_ID_RC, "machine.alpha", 1, 0), 600, 480); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), GT_Utility.getIntegratedCircuit(20), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 0), + getModItem(MOD_ID_RC, "machine.beta", 1L, 0), 600, 30); GT_Values.RA.addAssemblerRecipe( @@ -21777,17 +21618,17 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 2L, 1), + getModItem(MOD_ID_RC, "machine.beta", 2L, 1), 800, 30); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 2L, 1), + getModItem(MOD_ID_RC, "machine.beta", 2L, 1), 800, 30); GT_Values.RA.addAssemblerRecipe( @@ -21797,7 +21638,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 2), + getModItem(MOD_ID_RC, "machine.beta", 1L, 2), 800, 30); GT_Values.RA.addAssemblerRecipe( @@ -21806,7 +21647,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 13), + getModItem(MOD_ID_RC, "machine.beta", 1L, 13), 200, 64); GT_Values.RA.addAssemblerRecipe( @@ -21816,33 +21657,33 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 2L, 14), + getModItem(MOD_ID_RC, "machine.beta", 2L, 14), 400, 64); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 2L, 14), + getModItem(MOD_ID_RC, "machine.beta", 2L, 14), 400, 64); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.SteelBars", 2L), + getModItem(MOD_ID_DC, "item.SteelBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 15), + getModItem(MOD_ID_RC, "machine.beta", 1L, 15), 400, 64); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), GT_Utility.getIntegratedCircuit(20), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), 600, 120); GT_Values.RA.addAssemblerRecipe( @@ -21852,27 +21693,27 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), 800, 120); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), 800, 120); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.AluminiumBars", 2L), + getModItem(MOD_ID_DC, "item.AluminiumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), 800, 120); GT_Values.RA.addAssemblerRecipe( @@ -21881,7 +21722,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), 200, 256); GT_Values.RA.addAssemblerRecipe( @@ -21891,33 +21732,33 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 4), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 4), 400, 256); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 4), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 4), 400, 256); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.StainlessSteelBars", 2L), + getModItem(MOD_ID_DC, "item.StainlessSteelBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), 400, 256); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), GT_Utility.getIntegratedCircuit(20), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), 600, 480); GT_Values.RA.addAssemblerRecipe( @@ -21927,27 +21768,27 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), 800, 480); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), 800, 480); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.TitaniumBars", 2L), + getModItem(MOD_ID_DC, "item.TitaniumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), 800, 480); GT_Values.RA.addAssemblerRecipe( @@ -21956,7 +21797,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), 200, 960); GT_Values.RA.addAssemblerRecipe( @@ -21966,33 +21807,33 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 10), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 10), 400, 960); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 10), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 10), 400, 960); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.TungstenSteelBars", 2L), + getModItem(MOD_ID_DC, "item.TungstenSteelBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), 400, 960); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), GT_Utility.getIntegratedCircuit(20), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), 600, 1920); GT_Values.RA.addAssemblerRecipe( @@ -22002,27 +21843,27 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), 800, 1920); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), + getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), 800, 1920); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.ChromeBars", 2L), + getModItem(MOD_ID_DC, "item.ChromeBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), 800, 1920); GT_Values.RA.addAssemblerRecipe( @@ -22031,7 +21872,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 0), + getModItem(MOD_ID_RC, "machine.eta", 1L, 0), 200, 4096); GT_Values.RA.addAssemblerRecipe( @@ -22041,33 +21882,33 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 2L, 1), + getModItem(MOD_ID_RC, "machine.eta", 2L, 1), 400, 4096); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 2L, 1), + getModItem(MOD_ID_RC, "machine.eta", 2L, 1), 400, 4096); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.IridiumBars", 2L), + getModItem(MOD_ID_DC, "item.IridiumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 2), + getModItem(MOD_ID_RC, "machine.eta", 1L, 2), 400, 4096); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), GT_Utility.getIntegratedCircuit(20), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 3), + getModItem(MOD_ID_RC, "machine.eta", 1L, 3), 600, 7680); GT_Values.RA.addAssemblerRecipe( @@ -22077,27 +21918,27 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 2L, 4), + getModItem(MOD_ID_RC, "machine.eta", 2L, 4), 800, 7680); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 2L, 4), + getModItem(MOD_ID_RC, "machine.eta", 2L, 4), 800, 7680); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.OsmiumBars", 2L), + getModItem(MOD_ID_DC, "item.OsmiumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 5), + getModItem(MOD_ID_RC, "machine.eta", 1L, 5), 800, 7680); GT_Values.RA.addAssemblerRecipe( @@ -22106,7 +21947,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 6), + getModItem(MOD_ID_RC, "machine.eta", 1L, 6), 200, 30720); GT_Values.RA.addAssemblerRecipe( @@ -22116,27 +21957,27 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 2L, 7), + getModItem(MOD_ID_RC, "machine.eta", 2L, 7), 400, 30720); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), - GT_ModHandler.getModItem("TConstruct", "GlassPane", 2L, 0), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 2L, 7), + getModItem(MOD_ID_RC, "machine.eta", 2L, 7), 400, 30720); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L), - GT_ModHandler.getModItem(MOD_ID_DC, "item.NeutroniumBars", 2L), + getModItem(MOD_ID_DC, "item.NeutroniumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 8), + getModItem(MOD_ID_RC, "machine.eta", 1L, 8), 400, 30720); // Water Tank @@ -22146,7 +21987,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) }, Materials.Glue.getFluid(36L), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), + getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), 200, 8, false); @@ -22156,7 +21997,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) }, Materials.Glue.getFluid(36L), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), + getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), 200, 8, false); @@ -22166,7 +22007,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) }, Materials.Glue.getFluid(36L), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), + getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), 200, 8, false); @@ -22176,7 +22017,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4L) }, Materials.Glue.getFluid(72L), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 3L, 14), + getModItem(MOD_ID_RC, "machine.alpha", 3L, 14), 400, 30, false); @@ -22186,7 +22027,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1L) }, Materials.Plastic.getMolten(36L), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 3L, 14), + getModItem(MOD_ID_RC, "machine.alpha", 3L, 14), 400, 30, false); @@ -22196,7 +22037,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4L) }, Materials.Plastic.getMolten(72L), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.alpha", 9L, 14), + getModItem(MOD_ID_RC, "machine.alpha", 9L, 14), 400, 120, false); @@ -22204,13 +22045,13 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe( ItemList.IC2_Item_Casing_Iron.get(6L), GT_Utility.getIntegratedCircuit(6), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 3), + getModItem(MOD_ID_RC, "machine.beta", 1L, 3), 400, 30); GT_Values.RA.addAssemblerRecipe( ItemList.IC2_Item_Casing_Steel.get(6L), GT_Utility.getIntegratedCircuit(6), - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 4), + getModItem(MOD_ID_RC, "machine.beta", 1L, 4), 400, 64); @@ -22376,13 +22217,13 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L), Materials.Glass.getMolten(864L), GT_Values.NF, - GT_ModHandler.getModItem(MOD_ID_RC, "tile.railcraft.glass", 6L), + getModItem(MOD_ID_RC, "tile.railcraft.glass", 6L), 50); GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), Materials.Creosote.getFluid(100L), - GT_ModHandler.getModItem(MOD_ID_RC, "cube", 1L, 8), + getModItem(MOD_ID_RC, "cube", 1L, 8), GT_Values.NI, GT_Values.NI, null, @@ -22392,12 +22233,12 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Anvil.get(0L), Materials.Steel.getMolten(4464L), - GT_ModHandler.getModItem(MOD_ID_RC, "tile.railcraft.anvil", 1L, 0), + getModItem(MOD_ID_RC, "tile.railcraft.anvil", 1L, 0), 128, 16); GT_ModHandler.addPulverisationRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "cube.crushed.obsidian", 1L), + getModItem(MOD_ID_RC, "cube.crushed.obsidian", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L), GT_Values.NI, 0, @@ -22405,13 +22246,13 @@ public class GT_MachineRecipeLoader implements Runnable { // recycling RC Tanks // Iron GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 0), + getModItem(MOD_ID_RC, "machine.beta", 1L, 0), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L)}, new int[] {10000}, 300, 2); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 1), + getModItem(MOD_ID_RC, "machine.beta", 1L, 1), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22420,7 +22261,7 @@ public class GT_MachineRecipeLoader implements Runnable { 300, 2); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 2), + getModItem(MOD_ID_RC, "machine.beta", 1L, 2), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3L) @@ -22429,13 +22270,13 @@ public class GT_MachineRecipeLoader implements Runnable { 300, 2); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 0), + getModItem(MOD_ID_RC, "machine.beta", 1L, 0), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)}, null, 150, 90); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 1), + getModItem(MOD_ID_RC, "machine.beta", 1L, 1), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -22444,7 +22285,7 @@ public class GT_MachineRecipeLoader implements Runnable { 150, 90); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 2), + getModItem(MOD_ID_RC, "machine.beta", 1L, 2), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6) @@ -22453,21 +22294,21 @@ public class GT_MachineRecipeLoader implements Runnable { 150, 90); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 0), + getModItem(MOD_ID_RC, "machine.beta", 1L, 0), GT_Values.NI, Materials.Iron.getMolten(288), 10000, 300, 60); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 1), + getModItem(MOD_ID_RC, "machine.beta", 1L, 1), GT_Values.NI, Materials.Iron.getMolten(144), 10000, 300, 60); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 2), + getModItem(MOD_ID_RC, "machine.beta", 1L, 2), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6), Materials.Bronze.getMolten(1728), 10000, @@ -22475,13 +22316,13 @@ public class GT_MachineRecipeLoader implements Runnable { 60); // Steel GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 13), + getModItem(MOD_ID_RC, "machine.beta", 1L, 13), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2L)}, new int[] {10000}, 300, 2); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 14), + getModItem(MOD_ID_RC, "machine.beta", 1L, 14), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22490,7 +22331,7 @@ public class GT_MachineRecipeLoader implements Runnable { 300, 2); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 15), + getModItem(MOD_ID_RC, "machine.beta", 1L, 15), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3L) @@ -22499,13 +22340,13 @@ public class GT_MachineRecipeLoader implements Runnable { 300, 2); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 13), + getModItem(MOD_ID_RC, "machine.beta", 1L, 13), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)}, null, 180, 120); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 14), + getModItem(MOD_ID_RC, "machine.beta", 1L, 14), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -22514,7 +22355,7 @@ public class GT_MachineRecipeLoader implements Runnable { 180, 120); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 15), + getModItem(MOD_ID_RC, "machine.beta", 1L, 15), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L) @@ -22523,21 +22364,21 @@ public class GT_MachineRecipeLoader implements Runnable { 180, 120); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 13), + getModItem(MOD_ID_RC, "machine.beta", 1L, 13), GT_Values.NI, Materials.Steel.getMolten(288), 10000, 400, 90); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 14), + getModItem(MOD_ID_RC, "machine.beta", 1L, 14), GT_Values.NI, Materials.Steel.getMolten(144), 10000, 400, 90); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.beta", 1L, 15), + getModItem(MOD_ID_RC, "machine.beta", 1L, 15), GT_Values.NI, Materials.Steel.getMolten(1836), 10000, @@ -22545,13 +22386,13 @@ public class GT_MachineRecipeLoader implements Runnable { 90); // Aluminium GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2L)}, new int[] {10000}, 450, 8); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22560,7 +22401,7 @@ public class GT_MachineRecipeLoader implements Runnable { 450, 8); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3L) @@ -22569,19 +22410,19 @@ public class GT_MachineRecipeLoader implements Runnable { 450, 8); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L)}, null, 210, 150); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3)}, null, 210, 150); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L) @@ -22590,21 +22431,21 @@ public class GT_MachineRecipeLoader implements Runnable { 210, 150); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), GT_Values.NI, Materials.Aluminium.getMolten(288), 10000, 500, 120); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), GT_Values.NI, Materials.Aluminium.getMolten(144), 10000, 500, 120); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), Materials.Aluminium.getMolten(108L), 10000, @@ -22612,13 +22453,13 @@ public class GT_MachineRecipeLoader implements Runnable { 120); // Stainless Steel GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2L)}, new int[] {10000}, 600, 16); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22627,7 +22468,7 @@ public class GT_MachineRecipeLoader implements Runnable { 600, 16); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3L) @@ -22636,13 +22477,13 @@ public class GT_MachineRecipeLoader implements Runnable { 600, 16); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L)}, null, 240, 180); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -22651,7 +22492,7 @@ public class GT_MachineRecipeLoader implements Runnable { 240, 180); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L) @@ -22660,21 +22501,21 @@ public class GT_MachineRecipeLoader implements Runnable { 240, 180); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), GT_Values.NI, Materials.StainlessSteel.getMolten(288), 10000, 600, 180); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), GT_Values.NI, Materials.StainlessSteel.getMolten(144), 10000, 600, 180); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), GT_Values.NI, Materials.StainlessSteel.getMolten(1836), 10000, @@ -22682,13 +22523,13 @@ public class GT_MachineRecipeLoader implements Runnable { 180); // Titanium GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2L)}, new int[] {10000}, 600, 30); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22697,7 +22538,7 @@ public class GT_MachineRecipeLoader implements Runnable { 600, 30); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3L) @@ -22706,13 +22547,13 @@ public class GT_MachineRecipeLoader implements Runnable { 600, 30); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L)}, null, 270, 210); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -22721,7 +22562,7 @@ public class GT_MachineRecipeLoader implements Runnable { 270, 210); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L) @@ -22730,21 +22571,21 @@ public class GT_MachineRecipeLoader implements Runnable { 270, 210); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), GT_Values.NI, Materials.Titanium.getMolten(288), 10000, 700, 240); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), GT_Values.NI, Materials.Titanium.getMolten(144), 10000, 700, 240); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), GT_Values.NI, Materials.Titanium.getMolten(1836), 10000, @@ -22752,13 +22593,13 @@ public class GT_MachineRecipeLoader implements Runnable { 240); // Tungesten Steel GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2L)}, new int[] {10000}, 600, 30); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22767,7 +22608,7 @@ public class GT_MachineRecipeLoader implements Runnable { 600, 30); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3L) @@ -22776,13 +22617,13 @@ public class GT_MachineRecipeLoader implements Runnable { 600, 30); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L)}, null, 300, 240); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -22791,7 +22632,7 @@ public class GT_MachineRecipeLoader implements Runnable { 300, 240); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L) @@ -22800,21 +22641,21 @@ public class GT_MachineRecipeLoader implements Runnable { 300, 240); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), GT_Values.NI, Materials.TungstenSteel.getMolten(288), 10000, 800, 360); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), GT_Values.NI, Materials.TungstenSteel.getMolten(144), 10000, 800, 360); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), GT_Values.NI, Materials.TungstenSteel.getMolten(1836), 10000, @@ -22822,13 +22663,13 @@ public class GT_MachineRecipeLoader implements Runnable { 360); // Palladium GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2L)}, new int[] {10000}, 750, 64); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22837,7 +22678,7 @@ public class GT_MachineRecipeLoader implements Runnable { 750, 64); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3L) @@ -22846,13 +22687,13 @@ public class GT_MachineRecipeLoader implements Runnable { 750, 64); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L)}, null, 330, 270); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -22861,7 +22702,7 @@ public class GT_MachineRecipeLoader implements Runnable { 330, 270); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L) @@ -22870,21 +22711,21 @@ public class GT_MachineRecipeLoader implements Runnable { 330, 270); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), GT_Values.NI, Materials.Palladium.getMolten(288), 10000, 900, 480); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), GT_Values.NI, Materials.Palladium.getMolten(144), 10000, 900, 480); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), + getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L), Materials.NiobiumTitanium.getMolten(1728), 10000, @@ -22892,13 +22733,13 @@ public class GT_MachineRecipeLoader implements Runnable { 480); // Iridium GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 0), + getModItem(MOD_ID_RC, "machine.eta", 1L, 0), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2L)}, new int[] {10000}, 900, 120); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 1), + getModItem(MOD_ID_RC, "machine.eta", 1L, 1), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22907,7 +22748,7 @@ public class GT_MachineRecipeLoader implements Runnable { 900, 120); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 2), + getModItem(MOD_ID_RC, "machine.eta", 1L, 2), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3L) @@ -22916,13 +22757,13 @@ public class GT_MachineRecipeLoader implements Runnable { 900, 120); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 0), + getModItem(MOD_ID_RC, "machine.eta", 1L, 0), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L)}, null, 360, 300); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 1), + getModItem(MOD_ID_RC, "machine.eta", 1L, 1), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -22931,7 +22772,7 @@ public class GT_MachineRecipeLoader implements Runnable { 360, 300); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 2), + getModItem(MOD_ID_RC, "machine.eta", 1L, 2), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L) @@ -22940,21 +22781,21 @@ public class GT_MachineRecipeLoader implements Runnable { 360, 300); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 0), + getModItem(MOD_ID_RC, "machine.eta", 1L, 0), GT_Values.NI, Materials.Iridium.getMolten(288), 10000, 1000, 720); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 1), + getModItem(MOD_ID_RC, "machine.eta", 1L, 1), GT_Values.NI, Materials.Iridium.getMolten(144), 10000, 1000, 720); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 2), + getModItem(MOD_ID_RC, "machine.eta", 1L, 2), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L), Materials.Enderium.getMolten(1728), 10000, @@ -22962,13 +22803,13 @@ public class GT_MachineRecipeLoader implements Runnable { 720); // Osmium GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 3), + getModItem(MOD_ID_RC, "machine.eta", 1L, 3), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2L)}, new int[] {10000}, 1050, 256); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 4), + getModItem(MOD_ID_RC, "machine.eta", 1L, 4), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -22977,7 +22818,7 @@ public class GT_MachineRecipeLoader implements Runnable { 1050, 256); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 5), + getModItem(MOD_ID_RC, "machine.eta", 1L, 5), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3L) @@ -22986,13 +22827,13 @@ public class GT_MachineRecipeLoader implements Runnable { 1050, 256); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 3), + getModItem(MOD_ID_RC, "machine.eta", 1L, 3), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L)}, null, 360, 330); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 4), + getModItem(MOD_ID_RC, "machine.eta", 1L, 4), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -23001,7 +22842,7 @@ public class GT_MachineRecipeLoader implements Runnable { 360, 330); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 5), + getModItem(MOD_ID_RC, "machine.eta", 1L, 5), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L) @@ -23010,21 +22851,21 @@ public class GT_MachineRecipeLoader implements Runnable { 360, 330); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 3), + getModItem(MOD_ID_RC, "machine.eta", 1L, 3), GT_Values.NI, Materials.Osmium.getMolten(288), 10000, 1100, 960); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 4), + getModItem(MOD_ID_RC, "machine.eta", 1L, 4), GT_Values.NI, Materials.Osmium.getMolten(144), 10000, 1100, 960); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 5), + getModItem(MOD_ID_RC, "machine.eta", 1L, 5), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L), Materials.Naquadah.getMolten(1728), 10000, @@ -23032,13 +22873,13 @@ public class GT_MachineRecipeLoader implements Runnable { 960); // Neutronium GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 6), + getModItem(MOD_ID_RC, "machine.eta", 1L, 6), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2L)}, new int[] {10000}, 1200, 480); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 7), + getModItem(MOD_ID_RC, "machine.eta", 1L, 7), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) @@ -23047,7 +22888,7 @@ public class GT_MachineRecipeLoader implements Runnable { 1200, 480); GT_Values.RA.addPulveriserRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 8), + getModItem(MOD_ID_RC, "machine.eta", 1L, 8), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3L) @@ -23056,13 +22897,13 @@ public class GT_MachineRecipeLoader implements Runnable { 1200, 480); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 6), + getModItem(MOD_ID_RC, "machine.eta", 1L, 6), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L)}, null, 360, 360); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 7), + getModItem(MOD_ID_RC, "machine.eta", 1L, 7), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) @@ -23071,7 +22912,7 @@ public class GT_MachineRecipeLoader implements Runnable { 360, 360); GT_Values.RA.addArcFurnaceRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 8), + getModItem(MOD_ID_RC, "machine.eta", 1L, 8), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L) @@ -23080,21 +22921,21 @@ public class GT_MachineRecipeLoader implements Runnable { 360, 360); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 6), + getModItem(MOD_ID_RC, "machine.eta", 1L, 6), GT_Values.NI, Materials.Neutronium.getMolten(288), 10000, 1200, 1440); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 7), + getModItem(MOD_ID_RC, "machine.eta", 1L, 7), GT_Values.NI, Materials.Neutronium.getMolten(144), 10000, 1200, 1440); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_RC, "machine.eta", 1L, 8), + getModItem(MOD_ID_RC, "machine.eta", 1L, 8), GT_Values.NI, Materials.Neutronium.getMolten(1836), 10000, @@ -23164,7 +23005,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( EnumCube.COKE_BLOCK.getItem(), ItemList.MSFMixture.get(2), - GT_ModHandler.getModItem(MOD_ID_TC, "ItemResource", 4), + getModItem(MOD_ID_TC, "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -23176,7 +23017,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( EnumCube.COKE_BLOCK.getItem(), ItemList.MSFMixture.get(2), - GT_ModHandler.getModItem(MOD_ID_TC, "ItemResource", 4), + getModItem(MOD_ID_TC, "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index bfbfd3ffd8..9fa4059d5a 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -1,10 +1,13 @@ package gregtech.loaders.postload.chains; +import static gregtech.api.enums.GT_Values.MOD_ID_DC; +import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; +import static gregtech.api.util.GT_ModHandler.getModItem; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -15,9 +18,9 @@ public class GT_NaniteChain { public static void run() { - ItemStack aUVTierLens = GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0); - ItemStack aUHVTierLens = GT_ModHandler.getModItem("dreamcraft", "item.ChromaticLens", 0); - ItemStack aUEVTierLens = GT_ModHandler.getModItem("dreamcraft", "item.RadoxPolymerLens", 0); + ItemStack aUVTierLens = getModItem(MOD_ID_DC, "item.MysteriousCrystalLens", 0); + ItemStack aUHVTierLens = getModItem(MOD_ID_DC, "item.ChromaticLens", 0); + ItemStack aUEVTierLens = getModItem(MOD_ID_DC, "item.RadoxPolymerLens", 0); ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0); ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false); @@ -75,17 +78,17 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUVTierLens, - GT_ModHandler.getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), + getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), ItemList.Circuit_Chip_SoC.get(64) }, - new FluidStack[] {Materials.UUMatter.getFluid(200000)}, + new FluidStack[] {Materials.UUMatter.getFluid(200_000)}, new ItemStack[] { Materials.Carbon.getNanite(64), }, null, null, 500 * 20, - 10000000, + 10_000_000, 1); // Silver Nanites - Used in Tier 2 PCB Factory to improve board production @@ -96,7 +99,7 @@ public class GT_NaniteChain { null, null, 750 * 20, - 10000000, + 10_000_000, 2); // Neutronium Nanites - Used to upgrade the Nano Forge to Tier 2 @@ -112,7 +115,7 @@ public class GT_NaniteChain { null, null, 100 * 20, - 100000000, + 100_000_000, 1); // Gold Nanites - Used in Tier 3 PCB Factory to improve board production @@ -122,8 +125,8 @@ public class GT_NaniteChain { new ItemStack[] {Materials.Gold.getNanite(1)}, null, null, - 1000 * 20, - 100000000, + 1_000 * 20, + 100_000_000, 3); // Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3 @@ -140,7 +143,59 @@ public class GT_NaniteChain { null, null, 750 * 20, - 1000000000, + 1_000_000_000, 2); + + // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. + GT_Values.RA.addNanoForgeRecipe( + new ItemStack[] { + aUMVTierLens, + GT_OreDictUnificator.get("lensMagnetoResonatic", 0), + getModItem( + MOD_ID_GTPP, + "MU-metaitem.01", + 0, + 32105), // Quantum Anomaly, couldn't find any better naming + Materials.WhiteDwarfMatter.getBlocks(8), + getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + }, + new FluidStack[] { + Materials.UUMatter.getFluid(500_000), + Materials.RawStarMatter.getFluid(50_000), + FluidRegistry.getFluidStack("space", 720), + }, + new ItemStack[] {Materials.WhiteDwarfMatter.getNanite(4)}, + null, + null, + 750 * 20, + 2_000_000_000, + 3); + + // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. + GT_Values.RA.addNanoForgeRecipe( + new ItemStack[] { + aUMVTierLens, + GT_OreDictUnificator.get("lensMagnetoResonatic", 0), + getModItem( + MOD_ID_GTPP, + "MU-metaitem.01", + 0, + 32105), // Quantum Anomaly, couldn't find any better naming + Materials.BlackDwarfMatter.getBlocks(8), + getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + }, + new FluidStack[] { + Materials.UUMatter.getFluid(500_000), + Materials.RawStarMatter.getFluid(50_000), + FluidRegistry.getFluidStack("time", 720), + }, + new ItemStack[] {Materials.BlackDwarfMatter.getNanite(4)}, + null, + null, + 750 * 20, + 2_000_000_000, + 3); } } diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 7cf487b162..2b6eaf212a 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload.chains; +import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -62,7 +64,7 @@ public class GT_PCBFactoryRecipes { (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem("miscutils", "blockFrameGtCelestialTungsten", 1), + GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtCelestialTungsten", 1), Materials.get("Quantum").getPlates(6) }, null, @@ -71,7 +73,7 @@ public class GT_PCBFactoryRecipes { (int) GT_Values.VP[11]); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem("miscutils", "blockFrameGtHypogen", 1), + GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtHypogen", 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) }, diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 7acdfc6935..37640192b1 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -724,7 +724,9 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { MaterialsKevlar.NickelAluminide, Materials.SpaceTime, Materials.TranscendentMetal, - Materials.Oriharukon + Materials.Oriharukon, + Materials.WhiteDwarfMatter, + Materials.BlackDwarfMatter }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); @@ -1255,6 +1257,31 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTEC, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder(Materials.RawStarMatter.mName) + .withLocalizedName(Materials.RawStarMatter.mLocalizedName) + .withStateAndTemperature(LIQUID, 10_000_000) + .buildAndRegister() + .configureMaterials(Materials.RawStarMatter) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.RawStarMatter, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder(Materials.Space.mName) + .withLocalizedName(Materials.Space.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0) + .buildAndRegister() + .configureMaterials(Materials.Space) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L), ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder(Materials.Time.mName) + .withLocalizedName(Materials.Time.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0) + .buildAndRegister() + .configureMaterials(Materials.Time) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("fieryblood") .withLocalizedName("Fiery Blood") .withStateAndTemperature(LIQUID, 6400) @@ -1263,6 +1290,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("holywater") .withLocalizedName("Holy Water") .withStateAndTemperature(LIQUID, 295) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 50976ab037..0af16057bd 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1267,7 +1267,6 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 'P', ItemList.Electric_Pump_MV }); - // 1234 ItemList.Hatch_Energy_ULV.set( new GT_MetaTileEntity_Hatch_Energy(40, "hatch.energy.tier.00", "ULV Energy Hatch", 0).getStackForm(1L)); diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 0056a5b866..4b9b5d1493 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -2,6 +2,7 @@ package gregtech.loaders.preload; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_Values.MOD_ID_AE; +import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.Loader; @@ -117,7 +118,7 @@ public class GT_PreLoad { public static void initCompat() { GregTech_API.mIC2Classic = Loader.isModLoaded("IC2-Classic-Spmod"); - GregTech_API.mGTPlusPlus = Loader.isModLoaded("miscutils"); + GregTech_API.mGTPlusPlus = Loader.isModLoaded(MOD_ID_GTPP); GregTech_API.mTranslocator = Loader.isModLoaded("Translocator"); GregTech_API.mTConstruct = Loader.isModLoaded("TConstruct"); GregTech_API.mGalacticraft = Loader.isModLoaded("GalacticraftCore"); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.png Binary files differnew file mode 100644 index 0000000000..01d0e471e3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.png.mcmeta new file mode 100644 index 0000000000..0645f48c62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.png Binary files differnew file mode 100644 index 0000000000..4acabc510c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.png.mcmeta new file mode 100644 index 0000000000..24f9c2fae3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.png Binary files differnew file mode 100644 index 0000000000..dd90dd2d32 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.png.mcmeta new file mode 100644 index 0000000000..0645f48c62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png Binary files differnew file mode 100644 index 0000000000..f35749d548 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png.mcmeta new file mode 100644 index 0000000000..0645f48c62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png Binary files differnew file mode 100644 index 0000000000..bd46a8408c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png.mcmeta new file mode 100644 index 0000000000..0645f48c62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLACKDWARFMATTER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLACKDWARFMATTER.png Binary files differnew file mode 100644 index 0000000000..6650235ea7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLACKDWARFMATTER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_WHITEDWARFMATTER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_WHITEDWARFMATTER.png Binary files differnew file mode 100644 index 0000000000..9f88aa9256 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_WHITEDWARFMATTER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.png Binary files differnew file mode 100644 index 0000000000..630629e3ff --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.png.mcmeta new file mode 100644 index 0000000000..dd8674956c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block1.png Binary files differnew file mode 100644 index 0000000000..acfe6b350e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block1.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block2.png Binary files differnew file mode 100644 index 0000000000..b66582525f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block2.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block3.png Binary files differnew file mode 100644 index 0000000000..c8b26802cf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block3.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block4.png Binary files differnew file mode 100644 index 0000000000..e37e6af94f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block4.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block5.png Binary files differnew file mode 100644 index 0000000000..ec3d281f69 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block5.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block6.png Binary files differnew file mode 100644 index 0000000000..de047a3e69 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block6.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/foil.png Binary files differnew file mode 100644 index 0000000000..ce83b0c7eb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/foil.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/frameGt.png Binary files differnew file mode 100644 index 0000000000..ddf4dc2c3d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/frameGt.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/ore.png Binary files differnew file mode 100644 index 0000000000..d58c05e202 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/ore.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/oreSmall.png Binary files differnew file mode 100644 index 0000000000..382061a810 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/oreSmall.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeHuge.png Binary files differnew file mode 100644 index 0000000000..e31a7e3216 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeHuge.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeLarge.png Binary files differnew file mode 100644 index 0000000000..74d1ddfca0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeLarge.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeMedium.png Binary files differnew file mode 100644 index 0000000000..bfcdac3338 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeMedium.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeNonuple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeNonuple.png Binary files differnew file mode 100644 index 0000000000..07b8a03f9f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeNonuple.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeQuadruple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeQuadruple.png Binary files differnew file mode 100644 index 0000000000..ddb9ea7b1b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSide.png Binary files differnew file mode 100644 index 0000000000..091948e379 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSide.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSmall.png Binary files differnew file mode 100644 index 0000000000..819e44109c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSmall.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeTiny.png Binary files differnew file mode 100644 index 0000000000..25e11914bc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeTiny.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/void.png Binary files differnew file mode 100644 index 0000000000..cb89a2e2ac --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/void.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/wire.png Binary files differnew file mode 100644 index 0000000000..2d7591b4a2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/wire.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/729.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/729.png Binary files differnew file mode 100644 index 0000000000..f1ac2bd6fa --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/729.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/730.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/730.png Binary files differnew file mode 100644 index 0000000000..c57b91f16f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/730.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/731.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/731.png Binary files differnew file mode 100644 index 0000000000..4066648f37 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/731.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/732.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/732.png Binary files differnew file mode 100644 index 0000000000..671bd0daca --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/732.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/733.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/733.png Binary files differnew file mode 100644 index 0000000000..505ec90078 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/733.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/734.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/734.png Binary files differnew file mode 100644 index 0000000000..f2496a6594 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/734.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/735.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/735.png Binary files differnew file mode 100644 index 0000000000..cb207c9b1c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/735.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/736.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/736.png Binary files differnew file mode 100644 index 0000000000..8b2d8ae2e1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/736.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/737.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/737.png Binary files differnew file mode 100644 index 0000000000..fb7396d75a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/737.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/738.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/738.png Binary files differnew file mode 100644 index 0000000000..07c38aef3d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/738.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/739.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/739.png Binary files differnew file mode 100644 index 0000000000..f824cad6b4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/739.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/740.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/740.png Binary files differnew file mode 100644 index 0000000000..4ee3ced605 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/740.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/741.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/741.png Binary files differnew file mode 100644 index 0000000000..529f336de6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/741.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/742.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/742.png Binary files differnew file mode 100644 index 0000000000..b615fd56c0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/742.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/743.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/743.png Binary files differnew file mode 100644 index 0000000000..6274e9ff3e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/743.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/744.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/744.png Binary files differnew file mode 100644 index 0000000000..998a238690 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/744.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/745.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/745.png Binary files differnew file mode 100644 index 0000000000..55be6e9837 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/745.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/746.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/746.png Binary files differnew file mode 100644 index 0000000000..921c924775 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/746.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/747.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/747.png Binary files differnew file mode 100644 index 0000000000..72916e284b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/747.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/748.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/748.png Binary files differnew file mode 100644 index 0000000000..1d460749ec --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/748.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/749.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/749.png Binary files differnew file mode 100644 index 0000000000..5db9c22503 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/749.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/750.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/750.png Binary files differnew file mode 100644 index 0000000000..dc4e037561 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/750.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/751.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/751.png Binary files differnew file mode 100644 index 0000000000..95808404c6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/751.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/752.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/752.png Binary files differnew file mode 100644 index 0000000000..53db7a7e80 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/752.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/753.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/753.png Binary files differnew file mode 100644 index 0000000000..cb207e3d4a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/753.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/754.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/754.png Binary files differnew file mode 100644 index 0000000000..9b601e82d5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/754.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/755.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/755.png Binary files differnew file mode 100644 index 0000000000..633ce8783d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/755.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/756.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/756.png Binary files differnew file mode 100644 index 0000000000..c95d3ab29d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/756.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.png Binary files differnew file mode 100644 index 0000000000..775b32ebd2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..1fd54c45b9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.png Binary files differnew file mode 100644 index 0000000000..ae9551dd90 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..979944464f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.png Binary files differnew file mode 100644 index 0000000000..ae9551dd90 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..3332cbc1f6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.png Binary files differnew file mode 100644 index 0000000000..0cb66933f1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..33336d7ff8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.png Binary files differnew file mode 100644 index 0000000000..be38c8e8bf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..b95da3573a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.png Binary files differnew file mode 100644 index 0000000000..f303ec894f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.png Binary files differnew file mode 100644 index 0000000000..f303ec894f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..1c93293744 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..f02365b9ff --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust.png Binary files differnew file mode 100644 index 0000000000..7ec2050c3f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..64d56b48ea --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtDust_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem.png Binary files differnew file mode 100644 index 0000000000..dc15bb756f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..9798a597e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtGem_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot.png Binary files differnew file mode 100644 index 0000000000..a1569a2bd7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..2f0577d65f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtIngot_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate.png Binary files differnew file mode 100644 index 0000000000..d906445d4c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..ae6d73b7a6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crateGtPlate_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed.png Binary files differnew file mode 100644 index 0000000000..6f0b5929af --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged.png Binary files differnew file mode 100644 index 0000000000..f01bcb5302 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..2db0780322 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedCentrifuged_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified.png Binary files differnew file mode 100644 index 0000000000..a4fca07c30 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..e8e5df419b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushedPurified_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..fcf4ef8b14 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/crushed_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust.png Binary files differnew file mode 100644 index 0000000000..df90a93360 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure.png Binary files differnew file mode 100644 index 0000000000..df90a93360 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..e08a61a7a2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustImpure_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure.png Binary files differnew file mode 100644 index 0000000000..df90a93360 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..f536d0d418 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustPure_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall.png Binary files differnew file mode 100644 index 0000000000..79877f4fd7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..ed629461a7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny.png Binary files differnew file mode 100644 index 0000000000..0134c3c66a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..ce1019e757 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dustTiny_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..89a0b18370 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/dust_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil.png Binary files differnew file mode 100644 index 0000000000..3ca92fb205 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..c32f825e6f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/foil_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt.png Binary files differnew file mode 100644 index 0000000000..1e3afd4ba9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall.png Binary files differnew file mode 100644 index 0000000000..87f2756cef --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..dcfdd630be --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGtSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..430931d23f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gearGt_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem.png Binary files differnew file mode 100644 index 0000000000..ef8d1e7955 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped.png Binary files differnew file mode 100644 index 0000000000..db631d342e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..f6d1d6eb57 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemChipped_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite.png Binary files differnew file mode 100644 index 0000000000..d58d83dd13 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..3c61ce0205 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemExquisite_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed.png Binary files differnew file mode 100644 index 0000000000..65c4ebe852 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..b121fe42ce --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawed_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless.png Binary files differnew file mode 100644 index 0000000000..d61f118b14 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..f2f58a00c4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gemFlawless_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..7e38a79218 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/gem_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet.png Binary files differnew file mode 100644 index 0000000000..c6bfdb925e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/handleMallet_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot.png Binary files differnew file mode 100644 index 0000000000..d6d8d77fd9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble.png Binary files differnew file mode 100644 index 0000000000..b90af50323 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..aa90ed329c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotDouble_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot.png Binary files differnew file mode 100644 index 0000000000..b2ea4e01d1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..ebf9b80323 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotHot_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple.png Binary files differnew file mode 100644 index 0000000000..926083ae1f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..33c37ebc5d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuadruple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple.png Binary files differnew file mode 100644 index 0000000000..1dc453d23c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..3c185f7558 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotQuintuple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple.png Binary files differnew file mode 100644 index 0000000000..8e77a1123c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..45d1543055 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingotTriple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..2a59a8d2fc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ingot_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens.png Binary files differnew file mode 100644 index 0000000000..471bc709b8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..578850555a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/lens_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget.png Binary files differnew file mode 100644 index 0000000000..5bed1afda6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..1b80840677 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/nugget_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate.png Binary files differnew file mode 100644 index 0000000000..8f0ac816ff --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense.png Binary files differnew file mode 100644 index 0000000000..0a94f458b2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..1e70313b89 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDense_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble.png Binary files differnew file mode 100644 index 0000000000..f1fa027d38 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..02ed9afc33 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateDouble_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple.png Binary files differnew file mode 100644 index 0000000000..6311edc393 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..191ac9ed3e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuadruple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple.png Binary files differnew file mode 100644 index 0000000000..7eab069c2d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..9f18a838b7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateQuintuple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple.png Binary files differnew file mode 100644 index 0000000000..e1bf2732fd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..bb1ce5bebd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateTriple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..308924205d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plate_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring.png Binary files differnew file mode 100644 index 0000000000..83c5c3a116 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..c42ef7edbd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/ring_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor.png Binary files differnew file mode 100644 index 0000000000..5f00174006 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..9a0a19f008 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/rotor_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round.png Binary files differnew file mode 100644 index 0000000000..8d65a7e283 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..414f1cb19e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/round_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw.png Binary files differnew file mode 100644 index 0000000000..07e091b886 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..1f8da185b7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/screw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring.png Binary files differnew file mode 100644 index 0000000000..b6b1a13c7e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall.png Binary files differnew file mode 100644 index 0000000000..174793181f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..a7309c8ad7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/springSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..7cec03d2f9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/spring_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick.png Binary files differnew file mode 100644 index 0000000000..5f44b6bac0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong.png Binary files differnew file mode 100644 index 0000000000..58ce6afc1b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..9a13b83678 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stickLong_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..86b4ba128d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/stick_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow.png Binary files differnew file mode 100644 index 0000000000..fb77e024d4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..a7d165a7a9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadArrow_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe.png Binary files differnew file mode 100644 index 0000000000..ce443f01d1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..c4d74a7441 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadAxe_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw.png Binary files differnew file mode 100644 index 0000000000..0c83dbd2de --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..30bfad094a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadBuzzSaw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw.png Binary files differnew file mode 100644 index 0000000000..3adbbf2974 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..5f10122716 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadChainsaw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill.png Binary files differnew file mode 100644 index 0000000000..3d9a1853f6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..71db112fcb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadDrill_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile.png Binary files differnew file mode 100644 index 0000000000..2ac0d6970d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..632081f39d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadFile_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer.png Binary files differnew file mode 100644 index 0000000000..7d2306ad9b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..0d556fcacf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHammer_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe.png Binary files differnew file mode 100644 index 0000000000..7552dc1f21 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..2ce156a869 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadHoe_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet.png Binary files differnew file mode 100644 index 0000000000..7a137bf3fb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..a91eb1e9b2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadMallet_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe.png Binary files differnew file mode 100644 index 0000000000..82980d3f31 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..31c8fcbdae --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPickaxe_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow.png Binary files differnew file mode 100644 index 0000000000..37bc973dda --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..51719b6bf0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadPlow_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw.png Binary files differnew file mode 100644 index 0000000000..8ec45d7ace --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..c47608d91d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSaw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png Binary files differnew file mode 100644 index 0000000000..9408524220 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..e2f2bbd425 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense.png Binary files differnew file mode 100644 index 0000000000..d2516a45bc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..739af48033 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSense_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel.png Binary files differnew file mode 100644 index 0000000000..a02474f43f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..ab876e05dc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadShovel_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering.png Binary files differnew file mode 100644 index 0000000000..19ed5c14c0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..f54cc4afd9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSoldering_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword.png Binary files differnew file mode 100644 index 0000000000..426a19a537 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..fd8f3ff9a0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadSword_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade.png Binary files differnew file mode 100644 index 0000000000..6237c48293 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..552dada203 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadUniversalSpade_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench.png Binary files differnew file mode 100644 index 0000000000..593f38e288 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..9e2d17c3d7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadWrench_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade.png Binary files differnew file mode 100644 index 0000000000..775b32ebd2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..7a40475a1f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/turbineBlade_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void.png Binary files differnew file mode 100644 index 0000000000..0360f7046b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/void_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine.png Binary files differnew file mode 100644 index 0000000000..a9d441afa3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..1174299719 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/wireFine_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/TURBINE_BLADE.png Binary files differnew file mode 100644 index 0000000000..ea71724c14 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/TURBINE_BLADE.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/TURBINE_BLADE_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/TURBINE_BLADE_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/TURBINE_BLADE_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtPlastic.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtPlastic.png Binary files differnew file mode 100644 index 0000000000..cc908dd1c6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtPlastic.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtPlastic_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtPlastic_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..3ffb9e31e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtPlastic_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtWood.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtWood.png Binary files differnew file mode 100644 index 0000000000..74f785014e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtWood.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtWood_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtWood_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..948953f827 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/arrowGtWood_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/bolt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/bolt.png Binary files differnew file mode 100644 index 0000000000..6c93583b9f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/bolt.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/bolt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/bolt_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/bolt_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/casingSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/casingSmall.png Binary files differnew file mode 100644 index 0000000000..2495153b1e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/casingSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/casingSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/casingSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/casingSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cell.png Binary files differnew file mode 100644 index 0000000000..2eef05e512 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cell.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cellPlasma.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cellPlasma.png Binary files differnew file mode 100644 index 0000000000..fc8766cca9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cellPlasma.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cellPlasma_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cellPlasma_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..1c93293744 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cellPlasma_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cell_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..f02365b9ff --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/cell_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtDust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtDust.png Binary files differnew file mode 100644 index 0000000000..ccfe910fa5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtDust.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtDust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtDust_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..64d56b48ea --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtDust_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtGem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtGem.png Binary files differnew file mode 100644 index 0000000000..4cc774bb13 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtGem.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtGem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtGem_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..9798a597e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtGem_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtIngot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtIngot.png Binary files differnew file mode 100644 index 0000000000..ed77e52b68 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtIngot.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtIngot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtIngot_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..2f0577d65f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtIngot_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtPlate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtPlate.png Binary files differnew file mode 100644 index 0000000000..241b384d00 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtPlate.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtPlate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtPlate_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..ae6d73b7a6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crateGtPlate_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushed.png Binary files differnew file mode 100644 index 0000000000..d9b887aead --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushed.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedCentrifuged.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedCentrifuged.png Binary files differnew file mode 100644 index 0000000000..a9c7c0f478 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedCentrifuged.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedCentrifuged_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedCentrifuged_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedCentrifuged_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedPurified.png Binary files differnew file mode 100644 index 0000000000..fe903d843d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedPurified.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedPurified_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedPurified_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushedPurified_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushed_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..a1600cad7c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/crushed_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dust.png Binary files differnew file mode 100644 index 0000000000..b1f2b39ace --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dust.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustImpure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustImpure.png Binary files differnew file mode 100644 index 0000000000..88ab623139 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustImpure.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustImpure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustImpure_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..bd9fbe8192 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustImpure_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustPure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustPure.png Binary files differnew file mode 100644 index 0000000000..c0edbaa35f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustPure.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustPure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustPure_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..0eeb49eb26 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustPure_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustSmall.png Binary files differnew file mode 100644 index 0000000000..5386e3584a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustTiny.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustTiny.png Binary files differnew file mode 100644 index 0000000000..534cda563c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustTiny.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustTiny_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustTiny_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dustTiny_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dust_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/dust_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/foil.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/foil.png Binary files differnew file mode 100644 index 0000000000..2a7678f7fb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/foil.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/foil_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/foil_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/foil_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGt.png Binary files differnew file mode 100644 index 0000000000..1c762edc25 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGt.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGtSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGtSmall.png Binary files differnew file mode 100644 index 0000000000..a546f587c5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGtSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGtSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGtSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGtSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGt_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gearGt_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gem.png Binary files differnew file mode 100644 index 0000000000..d40938c4db --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gem.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemChipped.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemChipped.png Binary files differnew file mode 100644 index 0000000000..c241dc5b2f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemChipped.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemChipped_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemChipped_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemChipped_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemExquisite.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemExquisite.png Binary files differnew file mode 100644 index 0000000000..773168574f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemExquisite.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemExquisite_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemExquisite_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemExquisite_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawed.png Binary files differnew file mode 100644 index 0000000000..da1f851920 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawed.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawed_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawed_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawless.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawless.png Binary files differnew file mode 100644 index 0000000000..8cedfb5863 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawless.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawless_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawless_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gemFlawless_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gem_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/gem_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/handleMallet.png Binary files differnew file mode 100644 index 0000000000..742addf838 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/handleMallet.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/handleMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/handleMallet_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/handleMallet_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingot.png Binary files differnew file mode 100644 index 0000000000..7347bfda46 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingot.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble.png Binary files differnew file mode 100644 index 0000000000..8638d0621d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotHot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotHot.png Binary files differnew file mode 100644 index 0000000000..7e940231f9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotHot.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotHot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotHot_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..ebf9b80323 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotHot_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple.png Binary files differnew file mode 100644 index 0000000000..26039916a3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple.png Binary files differnew file mode 100644 index 0000000000..f1619eac70 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple.png Binary files differnew file mode 100644 index 0000000000..69db5aa450 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingot_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingot_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/lens.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/lens.png Binary files differnew file mode 100644 index 0000000000..002157948c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/lens.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/lens_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..51cb4b73a0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/lens_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites.png Binary files differnew file mode 100644 index 0000000000..6794d8aedf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..b0ef0371e2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nanites_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nugget.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nugget.png Binary files differnew file mode 100644 index 0000000000..214469b9bc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nugget.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nugget_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nugget_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/nugget_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plate.png Binary files differnew file mode 100644 index 0000000000..3683b140ce --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plate.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDense.png Binary files differnew file mode 100644 index 0000000000..9d0e874c32 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDense.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDense_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDense_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDouble.png Binary files differnew file mode 100644 index 0000000000..12c8c1688e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDouble.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDouble_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateDouble_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuadruple.png Binary files differnew file mode 100644 index 0000000000..671d09080b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuadruple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuadruple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuintuple.png Binary files differnew file mode 100644 index 0000000000..9ed9219995 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuintuple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuintuple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateQuintuple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateTriple.png Binary files differnew file mode 100644 index 0000000000..b78acb1171 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateTriple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateTriple_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateTriple_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plate_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plate_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ring.png Binary files differnew file mode 100644 index 0000000000..58557d0f28 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ring.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ring_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d5a0c95c2e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ring_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/rotor.png Binary files differnew file mode 100644 index 0000000000..8edca3af6b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/rotor.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/rotor_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/rotor_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/rotor_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/round.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/round.png Binary files differnew file mode 100644 index 0000000000..0f64abecaa --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/round.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/round_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/round_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/round_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/screw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/screw.png Binary files differnew file mode 100644 index 0000000000..b799ba68f8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/screw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/screw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/screw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/screw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/spring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/spring.png Binary files differnew file mode 100644 index 0000000000..bb59967cda --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/spring.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/springSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/springSmall.png Binary files differnew file mode 100644 index 0000000000..7c21093614 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/springSmall.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/springSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/springSmall_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/springSmall_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/spring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/spring_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/spring_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stick.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stick.png Binary files differnew file mode 100644 index 0000000000..a3bb0c742e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stick.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stickLong.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stickLong.png Binary files differnew file mode 100644 index 0000000000..50f9fce475 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stickLong.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stickLong_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stickLong_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stick_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stick_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/stick_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadArrow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadArrow.png Binary files differnew file mode 100644 index 0000000000..0504737b3e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadArrow.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadArrow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadArrow_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadArrow_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadAxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadAxe.png Binary files differnew file mode 100644 index 0000000000..1db6441a2d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadAxe.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadAxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadAxe_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadAxe_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadBuzzSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadBuzzSaw.png Binary files differnew file mode 100644 index 0000000000..6f85b71c92 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadBuzzSaw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadBuzzSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadBuzzSaw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadBuzzSaw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadChainsaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadChainsaw.png Binary files differnew file mode 100644 index 0000000000..640f39f69e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadChainsaw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadChainsaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadChainsaw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadChainsaw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadDrill.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadDrill.png Binary files differnew file mode 100644 index 0000000000..5dabe4282d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadDrill.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadDrill_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadDrill_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadDrill_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadFile.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadFile.png Binary files differnew file mode 100644 index 0000000000..01dcd15ec5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadFile.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadFile_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadFile_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadFile_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHammer.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHammer.png Binary files differnew file mode 100644 index 0000000000..0c26b01d49 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHammer.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHammer_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHammer_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHammer_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHoe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHoe.png Binary files differnew file mode 100644 index 0000000000..7476371328 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHoe.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHoe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHoe_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadHoe_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadMallet.png Binary files differnew file mode 100644 index 0000000000..a12dd664e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadMallet.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadMallet_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadMallet_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPickaxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPickaxe.png Binary files differnew file mode 100644 index 0000000000..dab804f99d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPickaxe.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPickaxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPickaxe_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPickaxe_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPlow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPlow.png Binary files differnew file mode 100644 index 0000000000..3c6ed9237a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPlow.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPlow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPlow_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadPlow_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSaw.png Binary files differnew file mode 100644 index 0000000000..25cba85ab8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSaw.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSaw_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSaw_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadScrewdriver.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadScrewdriver.png Binary files differnew file mode 100644 index 0000000000..829f243644 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadScrewdriver.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadScrewdriver_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadScrewdriver_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadScrewdriver_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSense.png Binary files differnew file mode 100644 index 0000000000..a3f68e4102 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSense.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSense_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSense_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadShovel.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadShovel.png Binary files differnew file mode 100644 index 0000000000..d575320b59 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadShovel.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadShovel_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadShovel_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadShovel_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSoldering.png Binary files differnew file mode 100644 index 0000000000..b9ef9ce7b3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSoldering.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSoldering_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSoldering_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSoldering_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSword.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSword.png Binary files differnew file mode 100644 index 0000000000..df9d8292e3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSword.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSword_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSword_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadSword_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadUniversalSpade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadUniversalSpade.png Binary files differnew file mode 100644 index 0000000000..682ab89ea4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadUniversalSpade.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadUniversalSpade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadUniversalSpade_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadUniversalSpade_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadWrench.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadWrench.png Binary files differnew file mode 100644 index 0000000000..8217380f61 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadWrench.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadWrench_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadWrench_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/toolHeadWrench_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/turbineBlade.png Binary files differnew file mode 100644 index 0000000000..ed739def6c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/turbineBlade.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/turbineBlade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/turbineBlade_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/turbineBlade_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/void.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/void.png Binary files differnew file mode 100644 index 0000000000..2997b29c3c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/void.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/void_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/void_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/void_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/wireFine.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/wireFine.png Binary files differnew file mode 100644 index 0000000000..3dd4d78fbb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/wireFine.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/wireFine_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/wireFine_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..5e9e05d5b0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/wireFine_OVERLAY.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble.png Binary files differindex 678c35518b..95b320238f 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple.png Binary files differindex b62d361f19..1b6458c18b 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple.png Binary files differindex e3ab084563..abfb36cf0d 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple.png Binary files differindex b8853a770e..7afbd91cb9 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble_OVERLAY.png Binary files differdeleted file mode 100644 index c844854d37..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble_OVERLAY.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingot_OVERLAY.png Binary files differdeleted file mode 100644 index c59ef7b1bb..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingot_OVERLAY.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingot.png Binary files differindex 8f19e1ff7e..fd4561a909 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingot.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple.png Binary files differindex b62d361f19..f8f8b9d7ba 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple.png Binary files differindex e3ab084563..41186cb1bb 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple.png diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple.png Binary files differindex b8853a770e..38fad53ea7 100644 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple.png |
