aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kubatech/loaders
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-05-30 18:26:10 +0100
committerGitHub <noreply@github.com>2024-05-30 19:26:10 +0200
commit337594e83a74c432c140b3df3287575b81bce467 (patch)
treeabe57b3390d3dd037ea1442f83c4519ebcb9de07 /src/main/java/kubatech/loaders
parent752f262ccd545bdb785ef0e9ce922bf1117d23d6 (diff)
downloadGT5-Unofficial-337594e83a74c432c140b3df3287575b81bce467.tar.gz
GT5-Unofficial-337594e83a74c432c140b3df3287575b81bce467.tar.bz2
GT5-Unofficial-337594e83a74c432c140b3df3287575b81bce467.zip
Complete backend rework of the EIG (#2616)
* Complete backend rework of the EIG * Mergening Related Updates Also some loader references refactoring * fix (cherry picked from commit 7fd5d7417bddfb6e49ede3986d9a547f15b21289) * More Mergening fixes Updates the declaration of the stem mixin to match the new format. * Inline EIG IC2 bucket constants addresses: https://github.com/GTNewHorizons/GT5-Unofficial/pull/2616#discussion_r1620596497 * Fix Seed Removal in regular seed simulations Should address https://github.com/GTNewHorizons/GT5-Unofficial/pull/2616#discussion_r1620583338 --------- Co-authored-by: Guillaume Mercier <10gui-gui10@live.ca> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/kubatech/loaders')
-rw-r--r--src/main/java/kubatech/loaders/EIGBucketLoader.java27
-rw-r--r--src/main/java/kubatech/loaders/RecipeLoader.java11
2 files changed, 38 insertions, 0 deletions
diff --git a/src/main/java/kubatech/loaders/EIGBucketLoader.java b/src/main/java/kubatech/loaders/EIGBucketLoader.java
new file mode 100644
index 0000000000..4dbf83112b
--- /dev/null
+++ b/src/main/java/kubatech/loaders/EIGBucketLoader.java
@@ -0,0 +1,27 @@
+package kubatech.loaders;
+
+import static gregtech.api.enums.Mods.ThaumicBases;
+
+import kubatech.api.enums.EIGModes;
+import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGFlowerBucket;
+import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGIC2Bucket;
+import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGRainbowCactusBucket;
+import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGSeedBucket;
+import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGStemBucket;
+
+public class EIGBucketLoader {
+
+ public static void LoadEIGBuckets() {
+ // IC2 buckets
+ EIGModes.IC2.addLowPriorityFactory(EIGIC2Bucket.factory);
+
+ // Regular Mode Buckets
+ if (ThaumicBases.isModLoaded()) {
+ EIGModes.Normal.addLowPriorityFactory(EIGRainbowCactusBucket.factory);
+ }
+ EIGModes.Normal.addLowPriorityFactory(EIGFlowerBucket.factory);
+ EIGModes.Normal.addLowPriorityFactory(EIGStemBucket.factory);
+ EIGModes.Normal.addLowPriorityFactory(EIGSeedBucket.factory);
+ }
+
+}
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index 7d609021b6..3ebba3fea6 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -76,6 +76,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.plugins.PluginCore;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -83,6 +84,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
+import ic2.core.Ic2Items;
import kubatech.api.enums.ItemList;
import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter;
import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher;
@@ -154,6 +156,15 @@ public class RecipeLoader {
? GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 11104) // IV World Accelerator
: gregtech.api.enums.ItemList.Robot_Arm_IV,
'Z', OrePrefixes.circuit.get(Materials.Ultimate) });
+
+ // Vanilla should always be loaded
+ GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15));
+ // IC2 should always be loaded
+ GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(Ic2Items.fertilizer);
+ if (Forestry.isModLoaded()) {
+ GT_MetaTileEntity_ExtremeIndustrialGreenhouse
+ .addFertilizerItem(PluginCore.items.fertilizerCompound.getItemStack(1));
+ }
}
if (registerMTEUsingID(
5_001,