aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dependencies.gradle18
-rw-r--r--src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java4
-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.java47
4 files changed, 29 insertions, 46 deletions
diff --git a/dependencies.gradle b/dependencies.gradle
index 2e131b6ac5..e65a8385d6 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,22 +2,20 @@
dependencies {
- compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.31:dev")
- compile("com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.20:dev")
- compile("com.github.GTNewHorizons:StructureLib:1.0.14:dev")
+ compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.39:dev")
+ compile("com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.21:dev")
+ compile("com.github.GTNewHorizons:StructureLib:1.0.16:dev")
compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
- compile("com.github.GTNewHorizons:NotEnoughItems:2.2.5-GTNH:dev")
- //compile files('NotEnoughItems-1.7.10-2.2.8-GTNH.dirty-dev.jar')
+ compile("com.github.GTNewHorizons:NotEnoughItems:2.2.8-GTNH:dev")
compileOnly("com.github.GTNewHorizons:EnderCore:0.2.6:dev") {
transitive = false
}
- compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-75-GTNH:dev")
+ compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-79-GTNH:dev")
- compile("com.github.GTNewHorizons:bartworks:0.5.36:dev")
- compile files('bartworks-1.7.10-0.5.34.dirty-dev.jar')
+ compile("com.github.GTNewHorizons:bartworks:0.5.39:dev")
compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.27:dev") {
transitive = false
}
@@ -55,7 +53,9 @@ dependencies {
/* compileOnly("com.github.GTNewHorizons:Avaritia:1.2.3) {
setChanging(true)
}*/
- compile files('Thaumcraft-1.7.10-4.2.3.5.deobf.jar')
+ compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
+ transitive = false
+ }
//compile files('ThaumicTinkerer-1.7.10-2.5-4-dev.jar')
} \ No newline at end of file
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..db57fc8db6 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), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L), 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), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), GT_Utility.getIntegratedCircuit(1)},
+ Materials.Polytetrafluoroethylene.getMolten(720), LanthItemList.DISSOLUTION_TANK, 400, 960);
+ }
//public static void loadZylon
generated by cgit (git 2.46.0) at 2025-03-11 19:26:49 +0000