Fix Compiling, Improve DME Sim Chamber

Nomi-CEu · Apr 22, 2024 · bc138df · bc138df
1 parent 936e64a
commit bc138df
Show file tree

Hide file tree

Showing 24 changed files with 355 additions and 67 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -92,6 +92,9 @@ dependencies {
     // AE2, Used in Naquadah Reactors (AE2 Unofficial Extended Life used) (from CurseForge)
     compileOnly rfg.deobf("curse.maven:ae2-extended-life-570458:4851091") // Version 0.55.27
 
+    // DeepMobEvolution, Used in DME Data Hatch (from CurseForge)
+    compileOnly rfg.deobf("curse.maven:dme-737252:5043404") // Version 1.2.2
+
     // Extended Crafting, Used in Naquadah Reactors (Nomifactory Fork Used) (from CurseForge)
     compileOnly rfg.deobf("curse.maven:extended-crafting-nomifactory-edition-398267:4592627") // Version 1.7.0.6
 
@@ -166,6 +169,12 @@ dependencies {
         runtimeOnly "curse.maven:ae2-extended-life-570458:4851091" // Version 0.55.27
     }
 
+    if (project.enable_dme.toBoolean()) {
+        // Dep: Patchouli
+        runtimeOnly "curse.maven:patchouli-306770:3162874" // Version 1.0-23.6
+        runtimeOnly "curse.maven:dme-737252:5043404" // Version 1.2.2
+    }
+
     if (project.enable_extended_crafting.toBoolean()) {
         runtimeOnly "curse.maven:extended-crafting-nomifactory-edition-398267:4592627" // Version 1.7.0.6
         runtimeOnly "curse.maven:cucumber-272335:2645867" // Version 1.1.3

diff --git a/gradle.properties b/gradle.properties
@@ -153,7 +153,8 @@ curseForgeRelations = requiredDependency:codechicken-lib-1-8;\
   optionalDependency:effortless-building;\
   optionalDependency:better-questing-unofficial;\
   optionalDependency:controlling;\
-  optionalDependency:default-world-generator-port;
+  optionalDependency:default-world-generator-port;\
+  optionalDependency:dme;
 
 # This project's release type on CurseForge and/or Modrinth
 # Alternatively this can be set with the 'RELEASE_TYPE' environment variable.
@@ -224,6 +225,9 @@ enable_chisel = false
 # If this is set to false, those blocks will be set to air.
 enable_ae2 = false
 
+# Whether to enable DME in runtime. Enables the DME Dat Hatch.
+enable_dme = false
+
 # Whether to enable Extended Crafting in runtime. Enables Extended Crafting Blocks in DME Sim Chamber and Naq Reactors.
 # If this is set to false, those blocks will be set to air.
 enable_extended_crafting = false

diff --git a/src/main/java/com/nomiceu/nomilabs/LabsValues.java b/src/main/java/com/nomiceu/nomilabs/LabsValues.java
@@ -36,4 +36,5 @@ public class LabsValues {
     public static final String BQU_MODID = "betterquesting";
     public static final String CONTROLLING_MODID = "controlling";
     public static final String DEFAULT_WORLD_GEN_MODID = "defaultworldgenerator-port";
+    public static final String DME_MODID = "deepmoblearning";
 }
diff --git a/src/main/java/com/nomiceu/nomilabs/NomiLabs.java b/src/main/java/com/nomiceu/nomilabs/NomiLabs.java
@@ -23,7 +23,7 @@
              "required-after:jei@[4.15.0,);" + "required-after:theoneprobe;" + "after:advancedrocketry;" +
              "after:libvulpes;" + "after:crafttweaker@[4.1.20,);" + "after:appliedenergistics2;" +
              "after:architecturecraft;" + "after:effortlessbuilding;" + "after:betterquesting;" +
-             "after:defaultworldgenerator-port;")
+             "after:defaultworldgenerator-port;" + "after:deepmoblearning;")
 @SuppressWarnings("unused")
 public class NomiLabs {
 

diff --git a/src/main/java/com/nomiceu/nomilabs/core/LabsLateMixin.java b/src/main/java/com/nomiceu/nomilabs/core/LabsLateMixin.java
@@ -37,7 +37,8 @@ public class LabsLateMixin implements ILateMixinLoader {
             new AbstractMap.SimpleImmutableEntry<>(LabsValues.GROOVY_MODID, true),
             new AbstractMap.SimpleImmutableEntry<>(LabsValues.CONTROLLING_MODID, true),
             new AbstractMap.SimpleImmutableEntry<>(LabsValues.DEFAULT_WORLD_GEN_MODID,
-                    LabsConfig.modIntegration.enableDefaultWorldGenIntegration))
+                    LabsConfig.modIntegration.enableDefaultWorldGenIntegration),
+            new AbstractMap.SimpleImmutableEntry<>(LabsValues.DME_MODID, true))
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
     @Override

diff --git a/src/main/java/com/nomiceu/nomilabs/event/CommonProxy.java b/src/main/java/com/nomiceu/nomilabs/event/CommonProxy.java
@@ -27,7 +27,7 @@
 import com.nomiceu.nomilabs.gregtech.LabsSounds;
 import com.nomiceu.nomilabs.gregtech.block.registry.LabsMetaBlocks;
 import com.nomiceu.nomilabs.gregtech.material.registry.LabsMaterials;
-import com.nomiceu.nomilabs.gregtech.multiblock.registry.LabsMultiblocks;
+import com.nomiceu.nomilabs.gregtech.metatileentity.registry.LabsMetaTileEntities;
 import com.nomiceu.nomilabs.gregtech.prefix.LabsMaterialFlags;
 import com.nomiceu.nomilabs.gregtech.prefix.LabsOrePrefix;
 import com.nomiceu.nomilabs.gregtech.recipe.LabsRecipeMaps;
@@ -75,7 +75,7 @@ public static void preInit() {
         LabsSounds.register();
         LabsRemappers.preInit();
         LabsRecipeMaps.preInit();
-        LabsMultiblocks.preInit();
+        LabsMetaTileEntities.preInit();
 
         if (LabsConfig.modIntegration.enableTOPIntegration && Loader.isModLoaded(LabsValues.TOP_MODID))
             TOPTooltipManager.registerProviders();

diff --git a/...k/MetaTileEntityActualizationChamber.java → ...k/MetaTileEntityActualizationChamber.java b/...k/MetaTileEntityActualizationChamber.java → ...k/MetaTileEntityActualizationChamber.java
@@ -1,4 +1,4 @@
-package com.nomiceu.nomilabs.gregtech.multiblock;
+package com.nomiceu.nomilabs.gregtech.metatileentity.multiblock;
 
 import static com.nomiceu.nomilabs.util.LabsTranslate.translate;
 

diff --git a/...k/MetaTileEntityCreativeTankProvider.java → ...k/MetaTileEntityCreativeTankProvider.java b/...k/MetaTileEntityCreativeTankProvider.java → ...k/MetaTileEntityCreativeTankProvider.java
@@ -1,4 +1,4 @@
-package com.nomiceu.nomilabs.gregtech.multiblock;
+package com.nomiceu.nomilabs.gregtech.metatileentity.multiblock;
 
 import static com.nomiceu.nomilabs.util.LabsTranslate.*;
 

diff --git a/...ltiblock/MetaTileEntityDMESimChamber.java → ...ltiblock/MetaTileEntityDMESimChamber.java b/...ltiblock/MetaTileEntityDMESimChamber.java → ...ltiblock/MetaTileEntityDMESimChamber.java
@@ -1,4 +1,4 @@
-package com.nomiceu.nomilabs.gregtech.multiblock;
+package com.nomiceu.nomilabs.gregtech.metatileentity.multiblock;
 
 import static com.nomiceu.nomilabs.util.LabsTranslate.*;
 
@@ -23,27 +23,29 @@
 import com.nomiceu.nomilabs.gregtech.material.registry.LabsMaterials;
 import com.nomiceu.nomilabs.gregtech.mixinhelper.ConditionalJEIMultiblock;
 import com.nomiceu.nomilabs.gregtech.recipe.LabsRecipeMaps;
+import com.nomiceu.nomilabs.gregtech.recipe.recipelogic.DMERecipeLogic;
 import com.nomiceu.nomilabs.util.LabsModeHelper;
 
 import appeng.core.Api;
+import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController;
 import gregicality.multiblocks.api.render.GCYMTextures;
 import gregicality.multiblocks.common.block.GCYMMetaBlocks;
 import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
-import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
 import gregtech.client.renderer.ICubeRenderer;
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.blocks.MetaBlocks;
 import gregtech.core.sound.GTSoundEvents;
 
-public class MetaTileEntityDMESimChamber extends RecipeMapMultiblockController implements ConditionalJEIMultiblock {
+public class MetaTileEntityDMESimChamber extends GCYMRecipeMapMultiblockController implements ConditionalJEIMultiblock {
 
     public MetaTileEntityDMESimChamber(ResourceLocation metaTileEntityId) {
         super(metaTileEntityId, LabsRecipeMaps.DME_SIM_CHAMBER_RECIPES);
+        this.recipeMapWorkable = new DMERecipeLogic(this);
     }
 
     @Override

diff --git a/...ltiblock/MetaTileEntityGrowthChamber.java → ...ltiblock/MetaTileEntityGrowthChamber.java b/...ltiblock/MetaTileEntityGrowthChamber.java → ...ltiblock/MetaTileEntityGrowthChamber.java
@@ -1,4 +1,4 @@
-package com.nomiceu.nomilabs.gregtech.multiblock;
+package com.nomiceu.nomilabs.gregtech.metatileentity.multiblock;
 
 import static com.nomiceu.nomilabs.util.LabsTranslate.*;
 

diff --git a/...ck/MetaTileEntityMicroverseProjector.java → ...ck/MetaTileEntityMicroverseProjector.java b/...ck/MetaTileEntityMicroverseProjector.java → ...ck/MetaTileEntityMicroverseProjector.java
@@ -1,4 +1,4 @@
-package com.nomiceu.nomilabs.gregtech.multiblock;
+package com.nomiceu.nomilabs.gregtech.metatileentity.multiblock;
 
 import static com.nomiceu.nomilabs.util.LabsTranslate.*;
 
@@ -23,7 +23,7 @@
 import com.nomiceu.nomilabs.LabsValues;
 import com.nomiceu.nomilabs.block.registry.LabsBlocks;
 import com.nomiceu.nomilabs.gregtech.LabsTextures;
-import com.nomiceu.nomilabs.gregtech.multiblock.registry.LabsMultiblocks;
+import com.nomiceu.nomilabs.gregtech.metatileentity.registry.LabsMetaTileEntities;
 import com.nomiceu.nomilabs.gregtech.recipe.LabsRecipeMaps;
 
 import gregtech.api.GTValues;
@@ -133,7 +133,7 @@ public List<MultiblockShapeInfo> getMatchingShapes() {
                     .aisle("FXX", "GDG", "XHX")
                     .aisle("ISO", "XGX", "XXX")
                     .where('X', getCasingStateMain())
-                    .where('S', LabsMultiblocks.MICROVERSE_1, EnumFacing.SOUTH)
+                    .where('S', LabsMetaTileEntities.MICROVERSE_1, EnumFacing.SOUTH)
                     .where('G', getCasingStateGlass())
                     .where('V', getCasingStateGrate())
                     .where('D', getCasingStateDiamond())
@@ -198,7 +198,7 @@ public List<MultiblockShapeInfo> getMatchingShapes() {
                     .aisle("XVXVX", "GDDDG", "GDDDG", "GDDDG", "XVXVX")
                     .aisle("XISOX", "XGGGX", "XGGGX", "XGGGX", "XXXXX")
                     .where('X', getCasingStateMain())
-                    .where('S', LabsMultiblocks.MICROVERSE_2, EnumFacing.SOUTH)
+                    .where('S', LabsMetaTileEntities.MICROVERSE_2, EnumFacing.SOUTH)
                     .where('G', getCasingStateGlass())
                     .where('V', getCasingStateGrate())
                     .where('D', getCasingStateDiamond())
@@ -286,7 +286,7 @@ public List<MultiblockShapeInfo> getMatchingShapes() {
                     .aisle("#########", "#########", "##XISOX##", "##XGGGX##", "##XGGGX##", "##XGGGX##", "##XXXXX##",
                             "#########", "#########")
                     .where('X', getCasingStateMain())
-                    .where('S', LabsMultiblocks.MICROVERSE_3, EnumFacing.SOUTH)
+                    .where('S', LabsMetaTileEntities.MICROVERSE_3, EnumFacing.SOUTH)
                     .where('G', getCasingStateGlass())
                     .where('V', getCasingStateEngine())
                     .where('D', getCasingStateDiamond())

diff --git a/...iblock/MetaTileEntityNaquadahReactor.java → ...iblock/MetaTileEntityNaquadahReactor.java b/...iblock/MetaTileEntityNaquadahReactor.java → ...iblock/MetaTileEntityNaquadahReactor.java
@@ -1,4 +1,4 @@
-package com.nomiceu.nomilabs.gregtech.multiblock;
+package com.nomiceu.nomilabs.gregtech.metatileentity.multiblock;
 
 import static com.nomiceu.nomilabs.util.LabsTranslate.*;
 

diff --git a/...k/MetaTileEntityUniversalCrystalizer.java → ...k/MetaTileEntityUniversalCrystalizer.java b/...k/MetaTileEntityUniversalCrystalizer.java → ...k/MetaTileEntityUniversalCrystalizer.java
@@ -1,4 +1,4 @@
-package com.nomiceu.nomilabs.gregtech.multiblock;
+package com.nomiceu.nomilabs.gregtech.metatileentity.multiblock;
 
 import static com.nomiceu.nomilabs.util.LabsTranslate.translate;
 

diff --git a/.../multiblock/registry/LabsMultiblocks.java → ...entity/registry/LabsMetaTileEntities.java b/.../multiblock/registry/LabsMultiblocks.java → ...entity/registry/LabsMetaTileEntities.java
@@ -1,16 +1,18 @@
-package com.nomiceu.nomilabs.gregtech.multiblock.registry;
+package com.nomiceu.nomilabs.gregtech.metatileentity.registry;
 
+import com.nomiceu.nomilabs.LabsValues;
 import com.nomiceu.nomilabs.config.LabsConfig;
-import com.nomiceu.nomilabs.gregtech.multiblock.*;
+import com.nomiceu.nomilabs.gregtech.metatileentity.multiblock.*;
 import com.nomiceu.nomilabs.util.LabsNames;
 
 import gregtech.common.metatileentities.MetaTileEntities;
+import net.minecraftforge.fml.common.Loader;
 
 /**
- * Multiblocks all start at 31000, as colliding metas with old multiblocks usually causes problems.
+ * Meta Tile Entities all start at 31000, as colliding metas with old Meta Tile Entities usually causes problems.
  */
 @SuppressWarnings("unused")
-public class LabsMultiblocks {
+public class LabsMetaTileEntities {
 
     public static MetaTileEntityGrowthChamber GROWTH_CHAMBER;
     public static MetaTileEntityMicroverseProjector.Microverse1 MICROVERSE_1;
@@ -55,8 +57,9 @@ private static void initOld() {
         UNIVERSAL_CRYSTALIZER = MetaTileEntities.registerMetaTileEntity(32107,
                 new MetaTileEntityUniversalCrystalizer(LabsNames.makeLabsName("universal_crystallizer")));
 
-        DME_SIM_CHAMBER = MetaTileEntities.registerMetaTileEntity(32108,
-                new MetaTileEntityDMESimChamber(LabsNames.makeLabsName("dme_sim_chamber")));
+        if (Loader.isModLoaded(LabsValues.DME_MODID))
+            DME_SIM_CHAMBER = MetaTileEntities.registerMetaTileEntity(32108,
+                    new MetaTileEntityDMESimChamber(LabsNames.makeLabsName("dme_sim_chamber")));
     }
 
     private static void initNew() {

diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/mixinhelper/OutputBranch.java b/src/main/java/com/nomiceu/nomilabs/gregtech/mixinhelper/OutputBranch.java
@@ -6,6 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import gregtech.api.recipes.Recipe;
 import gregtech.api.recipes.map.AbstractMapIngredient;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;