diff options
author | chochem <40274384+chochem@users.noreply.github.com> | 2024-07-09 00:02:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-09 00:02:44 +0100 |
commit | b1e8a3ff54c87e297d70d944420170e101da08c8 (patch) | |
tree | 8a0390570b379b7f3fbcf03d3538c477681c91ac /src/main/java | |
parent | 868735bd6efc935aab3cf06f073931a132e09395 (diff) | |
download | GT5-Unofficial-b1e8a3ff54c87e297d70d944420170e101da08c8.tar.gz GT5-Unofficial-b1e8a3ff54c87e297d70d944420170e101da08c8.tar.bz2 GT5-Unofficial-b1e8a3ff54c87e297d70d944420170e101da08c8.zip |
Firebrick fixes (#2712)
* fix firebrick
* fix forgehammer recipe
Diffstat (limited to 'src/main/java')
4 files changed, 5 insertions, 23 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 3293ce94db..31b730e7a8 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -797,7 +797,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials RedMud = new MaterialBuilder(743, TextureSet.SET_FLUID, "Red Mud").addCell().addFluid().setRGB(140, 22, 22).setColor(Dyes.dyeRed).constructMaterial(); public static Materials Brick = new MaterialBuilder(625, TextureSet.SET_ROUGH , "Brick").addDustItems().setRGB(155, 86, 67).setColor(Dyes.dyeBrown).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 4), new MaterialStack(Oxygen, 11)).constructMaterial(); - public static Materials Fireclay = new MaterialBuilder(626, TextureSet.SET_ROUGH , "Fireclay").addDustItems().setRGB(173, 160, 155).setExtraData(2).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick, 1)).constructMaterial(); + public static Materials Fireclay = new MaterialBuilder(626, TextureSet.SET_ROUGH , "Fireclay").addDustItems().setRGB(173, 160, 155).setExtraData(2).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick, 1), new MaterialStack(Clay, 1)).constructMaterial(); // Polybenzimidazole stuff public static Materials PotassiumNitrade = new MaterialBuilder(590, TextureSet.SET_DULL , "Potassium Nitrate").setName("PotassiumNitrate").addDustItems().setRGB(129, 34, 141).setColor(Dyes.dyePurple).setMaterialList(new MaterialStack(Potassium, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 3)).addElectrolyzerRecipe().constructMaterial(); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 00699f537f..0a977aecfa 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -669,7 +669,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { OrePrefixes.stick.get(Materials.Steel) }); ItemList.CompressedFireclay.set(addItem(Compressed_Fireclay.ID, "Compressed Fireclay", "Brick-shaped")); + GT_OreDictUnificator.addItemDataFromInputs(ItemList.CompressedFireclay.get(1), Materials.Fireclay.getDust(1)); + ItemList.Firebrick.set(addItem(Firebrick.ID, "Firebrick", "Heat resistant")); + GT_OreDictUnificator.addItemDataFromInputs(ItemList.Firebrick.get(1), Materials.Fireclay.getDust(1)); ItemList.Shape_Empty.set( addItem( diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index 6ac00b96bd..85b03f64c3 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -124,7 +124,7 @@ public class ForgeHammerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Firebrick.get(1)) - .itemOutputs(Materials.Brick.getDust(1)) + .itemOutputs(Materials.Fireclay.getDust(1)) .duration(10 * TICKS) .eut(16) .addTo(hammerRecipes); diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index c24dd2dbae..14bebd9f56 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -539,27 +539,6 @@ public class Pulverizer implements Runnable { .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.CompressedFireclay.get(1)) - .itemOutputs(Materials.Fireclay.getDustSmall(1)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Firebrick.get(1)) - .itemOutputs(Materials.Brick.getDust(1)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Casing_Firebricks.get(1)) - .itemOutputs(Materials.Brick.getDust(4)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder() .itemInputs(ItemList.Machine_Bricked_BlastFurnace.get(1)) .itemOutputs(Materials.Brick.getDust(8), Materials.Iron.getDust(1)) .duration(20 * SECONDS) |