diff options
author | Martin Robertz <dream-master@gmx.net> | 2022-03-02 23:00:37 +0100 |
---|---|---|
committer | Martin Robertz <dream-master@gmx.net> | 2022-03-02 23:00:37 +0100 |
commit | fcd5131b0d69cab7e83922b4a33c437d0942c77b (patch) | |
tree | d51fd6e53546e684a39a8294bf32c3d6dae12071 /src/main/java | |
parent | 495432a979944730cde01bed387ee39910c2d933 (diff) | |
download | GT5-Unofficial-fcd5131b0d69cab7e83922b4a33c437d0942c77b.tar.gz GT5-Unofficial-fcd5131b0d69cab7e83922b4a33c437d0942c77b.tar.bz2 GT5-Unofficial-fcd5131b0d69cab7e83922b4a33c437d0942c77b.zip |
adding recipes for the multis
cleaning up imports
rename item list class to lanthitemlist
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java | 4 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java (renamed from src/main/java/com/elisis/gtnhlanth/common/register/ItemList.java) | 6 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 47 |
3 files changed, 20 insertions, 37 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index a37b59e858..d52352f6e6 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -5,7 +5,7 @@ import java.util.logging.Logger; import com.elisis.gtnhlanth.common.CommonProxy;
import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
-import com.elisis.gtnhlanth.common.register.ItemList;
+import com.elisis.gtnhlanth.common.register.LanthItemList;
import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
import com.elisis.gtnhlanth.loader.BotRecipes;
import com.elisis.gtnhlanth.loader.RecipeLoader;
@@ -46,7 +46,7 @@ public class GTNHLanthanides { public static void preInit(FMLPreInitializationEvent e) {
WerkstoffAdderRegistry.addWerkstoffAdder(new WerkstoffMaterialPool());
WerkstoffAdderRegistry.addWerkstoffAdder(new BotWerkstoffMaterialPool());
- ItemList.register();
+ LanthItemList.register();
proxy.preInit(e);
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/ItemList.java b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java index aeea5b1236..14f58394d6 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/ItemList.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java @@ -5,15 +5,15 @@ import com.elisis.gtnhlanth.common.tileentity.DissolutionTank; import net.minecraft.item.ItemStack; -public final class ItemList { +public final class LanthItemList { public static ItemStack DIGESTER; public static ItemStack DISSOLUTION_TANK; public static void register() { - ItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L); - ItemList.DISSOLUTION_TANK = new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L); + LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L); + LanthItemList.DISSOLUTION_TANK = new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L); } diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 7aa0a5a3f6..bc4bcd8b4d 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -1,30 +1,22 @@ package com.elisis.gtnhlanth.loader; -import java.util.Arrays; -import java.util.HashSet; - import com.elisis.gtnhlanth.Tags; import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool; +import com.elisis.gtnhlanth.common.register.LanthItemList; import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - -import goodgenerator.crossmod.LoadedList; import goodgenerator.items.MyMaterial; 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.GTPP_Recipe; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells; +import gregtech.api.util.*; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.HashSet; + public class RecipeLoader { private static final Materials[] BLACKLIST = null; @@ -1008,21 +1000,6 @@ public class RecipeLoader { 800, 1920 ); - - - - - - - - - - - - - - - } public static void addRandomChemCrafting() { @@ -1154,10 +1131,16 @@ public class RecipeLoader { 900, 480 ); - - - - } + //Digester Control Block + GT_Values.RA.addAssemblerRecipe(new ItemStack[] + {ItemList.Hull_IV.get(1L), ItemList.Super_Tank_EV.get(2L), ItemList.Electric_Motor_IV.get(4L), ItemList.Electric_Pump_IV.get(4L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L), ItemList.Circuit_Master.get(2L), GT_Utility.getIntegratedCircuit(1)}, + Materials.Polytetrafluoroethylene.getMolten(1440), LanthItemList.DIGESTER, 600, 4096); + + //Dissolution Tank + GT_Values.RA.addAssemblerRecipe(new ItemStack[] + {ItemList.Hull_EV.get(1L), ItemList.Super_Tank_HV.get(2L), ItemList.Electric_Motor_EV.get(4L), ItemList.Electric_Pump_EV.get(2L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L), ItemList.Circuit_Data.get(2L), GT_Utility.getIntegratedCircuit(1)}, + Materials.Polytetrafluoroethylene.getMolten(720), LanthItemList.DISSOLUTION_TANK, 400, 960); + } //public static void loadZylon |