diff options
Diffstat (limited to 'src/main/java/GoodGenerator')
5 files changed, 62 insertions, 66 deletions
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java index 398d14ce4b..4ae9073e26 100644 --- a/src/main/java/GoodGenerator/Items/MyMaterial.java +++ b/src/main/java/GoodGenerator/Items/MyMaterial.java @@ -1,5 +1,6 @@ package GoodGenerator.Items; +import GoodGenerator.util.MaterialFix; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.TextureSet; @@ -276,6 +277,9 @@ public class MyMaterial implements Runnable { 31022, TextureSet.SET_DIAMOND ); + @Override - public void run() { } + public void run() { + + } } diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java index c2a475aa9e..adaf0d1b99 100644 --- a/src/main/java/GoodGenerator/Loader/Loaders.java +++ b/src/main/java/GoodGenerator/Loader/Loaders.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; public class Loaders { diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 7811f1b824..7f580092e7 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -1,6 +1,7 @@ package GoodGenerator.Loader; import GoodGenerator.Items.MyMaterial; +import GoodGenerator.util.MaterialFix; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; @@ -9,8 +10,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import gregtech.api.util.GT_Utility; -import static net.minecraft.init.Blocks.furnace; - public class RecipeLoader { public static void RecipeLoad(){ @@ -541,68 +540,9 @@ public class RecipeLoader { 450, 960 ); + } - GT_Values.RA.addFluidExtractionRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot,1), - null, - MyMaterial.atomicSeparationCatalyst.getMolten(144), - 0, - 32, - 7 - ); - - GT_Values.RA.addFluidExtractionRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.stickLong,1), - null, - MyMaterial.atomicSeparationCatalyst.getMolten(144), - 0, - 32, - 7 - ); - - GT_Values.RA.addFluidExtractionRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.plate,1), - null, - MyMaterial.atomicSeparationCatalyst.getMolten(144), - 0, - 32, - 7 - ); - - GT_Values.RA.addFluidExtractionRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.stick,1), - null, - MyMaterial.atomicSeparationCatalyst.getMolten(72), - 0, - 16, - 7 - ); - - GT_Values.RA.addFluidExtractionRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.nugget,1), - null, - MyMaterial.atomicSeparationCatalyst.getMolten(16), - 0, - 8, - 7 - ); - - GT_Values.RA.addFluidExtractionRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.gearGt,1), - null, - MyMaterial.atomicSeparationCatalyst.getMolten(576), - 0, - 128, - 7 - ); - - GT_Values.RA.addFluidExtractionRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.gearGtSmall,1), - null, - MyMaterial.atomicSeparationCatalyst.getMolten(144), - 0, - 32, - 7 - ); + public static void Fixer(){ + MaterialFix.MaterialFluidExtractionFix(MyMaterial.atomicSeparationCatalyst); } } diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java index 71f9fc83da..074020e074 100644 --- a/src/main/java/GoodGenerator/Main/GoodGenerator.java +++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java @@ -33,7 +33,6 @@ public final class GoodGenerator { @Mod.EventHandler public static void preInit(FMLPreInitializationEvent event){ WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial()); - addOreDic(); proxy.preInit(event); } @Mod.EventHandler @@ -41,7 +40,9 @@ public final class GoodGenerator { proxy.init(event); Loaders.Register(); RecipeLoader.RecipeLoad(); + RecipeLoader.Fixer(); FuelRecipeLoader.RegisterFuel(); + addOreDic(); } @Mod.EventHandler public static void postInit(FMLPostInitializationEvent event){ diff --git a/src/main/java/GoodGenerator/util/MaterialFix.java b/src/main/java/GoodGenerator/util/MaterialFix.java new file mode 100644 index 0000000000..8247d49c12 --- /dev/null +++ b/src/main/java/GoodGenerator/util/MaterialFix.java @@ -0,0 +1,50 @@ +package GoodGenerator.util; + +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; + +public class MaterialFix { + public static void MaterialFluidExtractionFix(Werkstoff material){ + if (material.hasItemType(OrePrefixes.ingot)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.ingot),null,material.getMolten(144),0,32,8); + if (material.hasItemType(OrePrefixes.plate)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.plate),null,material.getMolten(144),0,32,8); + if (material.hasItemType(OrePrefixes.gearGtSmall)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.gearGtSmall),null,material.getMolten(144),0,32,8); + if (material.hasItemType(OrePrefixes.stickLong)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.stickLong),null,material.getMolten(144),0,32,8); + if (material.hasItemType(OrePrefixes.spring)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.spring),null,material.getMolten(144),0,32,8); + if (material.hasItemType(OrePrefixes.stick)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.stick),null,material.getMolten(72),0,16,8); + if (material.hasItemType(OrePrefixes.itemCasing)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.itemCasing),null,material.getMolten(72),0,16,8); + if (material.hasItemType(OrePrefixes.wireGt01)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.wireGt01),null,material.getMolten(72),0,16,8); + if (material.hasItemType(OrePrefixes.cableGt01)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.cableGt01), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash,2),material.getMolten(72),10000,16,8); + if (material.hasItemType(OrePrefixes.foil)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.foil),null,material.getMolten(36),0,8,8); + if (material.hasItemType(OrePrefixes.springSmall)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.springSmall),null,material.getMolten(36),0,8,8); + if (material.hasItemType(OrePrefixes.ring)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.ring),null,material.getMolten(36),0,8,8); + if (material.hasItemType(OrePrefixes.bolt)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.bolt),null,material.getMolten(18),0,4,8); + if (material.hasItemType(OrePrefixes.wireFine)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.wireFine),null,material.getMolten(18),0,4,8); + if (material.hasItemType(OrePrefixes.round)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.round),null,material.getMolten(16),0,4,8); + if (material.hasItemType(OrePrefixes.screw)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.screw),null,material.getMolten(16),0,4,8); + if (material.hasItemType(OrePrefixes.nugget)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.nugget),null,material.getMolten(16),0,4,8); + if (material.hasItemType(OrePrefixes.rotor)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.rotor),null,material.getMolten(612),0,136,8); + if (material.hasItemType(OrePrefixes.gearGt)) + GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.gearGt),null,material.getMolten(576),0,128,8); + } +} |