Merge pull request #9 from GTModpackTeam/add-mworld

Author: tier940

.github/workflows/publish.yml

@@ -98,6 +98,8 @@ jobs:
             integrated-dynamics(recommended)
             random-things(recommended)
             rustic(recommended)
+            mystical-world(recommended)
+            roots(recommended)
           files: |
             build/libs/!(*-@(dev|sources|javadoc)).jar
             build/libs/*-@(sources).jar

CHANGELOG.md

@@ -3,6 +3,9 @@
 - Extra Utilities 2
 - Integrated Dynamics
 - Random Things
+- Rustic
+- Mystical World
+- Roots
 
 * * *
 

dependencies.gradle

@@ -109,4 +109,15 @@ dependencies {
     if (project.debug_all.toBoolean() || project.debug_rustic.toBoolean()) {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:rustic-256141:3107974") // Rustic 1.1.7
     }
+
+    // Debug Mystical World
+    if (project.debug_all.toBoolean() || project.debug_mworld.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:patchouli-306770:3162874") // Patchouli 1.0-23.6
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:mysticallib-277064:3483816") // MysticalLib 1.13.0
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:mystical-world-282940:3460961") // Mystical World 1.11.0
+
+        if (project.debug_all.toBoolean() || project.debug_roots.toBoolean()) {
+            runtimeOnlyNonPublishable rfg.deobf("curse.maven:roots-246183:5193525") // Roots 3.1.9.2
+        }
+    }
 }

gradle.properties

@@ -33,6 +33,8 @@ debug_exu = false
 debug_ids = false
 debug_rthings = false
 debug_rustic = false
+debug_mworld = false
+debug_roots = false
 
 # Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
 # restart Minecraft in development. Choose this dependent on your mod:

src/main/java/com/github/gtexpert/gtwp/GTWPMod.java

@@ -37,7 +37,8 @@
              "after:" + Mods.Names.EXTRA_TREES + ";" + "after:" + Mods.Names.ADVANCED_ROCKETRY + ";" +
              "after:" + Mods.Names.PROJECT_VIBRANT_JOURNEYS + ";" + "after:" + Mods.Names.PLANTS + ";" +
              "after:" + Mods.Names.EXTRA_UTILITIES + ";" + "after:" + Mods.Names.INTERGRATED_DYNAMICS + ";" +
-             "after:" + Mods.Names.RANDOM_THINGS + ";" + "after:" + Mods.Names.RUSTIC + ";")
+             "after:" + Mods.Names.RANDOM_THINGS + ";" + "after:" + Mods.Names.RUSTIC + ";" +
+             "after:" + Mods.Names.MYSTICAL_WORLD + ";")
 @Mod.EventBusSubscriber(modid = ModValues.MODID)
 public class GTWPMod {
 

src/main/java/com/github/gtexpert/gtwp/api/util/Mods.java

@@ -85,6 +85,7 @@ public enum Mods {
     MagicBees(Names.MAGIC_BEES),
     ModularUI(Names.MODULRAUI),
     MixinBooter(Names.MIXINBOOTER),
+    MysticalWorld(Names.MYSTICAL_WORLD),
     NeevesAE2(Names.NEEVES_AE2),
     Nothirium(Names.NOTHIRIUM),
     NuclearCraft(Names.NUCLEAR_CRAFT, versionExcludes("2o")),
@@ -188,6 +189,7 @@ public static class Names {
         public static final String MAGIC_BEES = "magicbees";
         public static final String MODULRAUI = "modularui";
         public static final String MIXINBOOTER = "mixinbooter";
+        public static final String MYSTICAL_WORLD = "mysticalworld";
         public static final String NEEVES_AE2 = "nae2";
         public static final String NOTHIRIUM = "nothirium";
         public static final String NUCLEAR_CRAFT = "nuclearcraft";

src/main/java/com/github/gtexpert/gtwp/integration/mworld/MWorldConfigHolder.java

@@ -0,0 +1,12 @@
+package com.github.gtexpert.gtwp.integration.mworld;
+
+import net.minecraftforge.common.config.Config;
+
+import com.github.gtexpert.gtwp.api.ModValues;
+import com.github.gtexpert.gtwp.module.Modules;
+
+@Config.LangKey(ModValues.MODID + ".config.integration.mworld")
+@Config(modid = ModValues.MODID,
+        name = ModValues.MODID + "/integration/" + Modules.MODULE_MWORLD,
+        category = "MysticalWorld")
+public class MWorldConfigHolder {}

src/main/java/com/github/gtexpert/gtwp/integration/mworld/MWorldModule.java

@@ -0,0 +1,25 @@
+package com.github.gtexpert.gtwp.integration.mworld;
+
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.event.RegistryEvent;
+
+import com.github.gtexpert.gtwp.api.ModValues;
+import com.github.gtexpert.gtwp.api.modules.TModule;
+import com.github.gtexpert.gtwp.api.util.Mods;
+import com.github.gtexpert.gtwp.integration.GTWPIntegrationSubmodule;
+import com.github.gtexpert.gtwp.integration.mworld.recipes.MWorldWoodRecipe;
+import com.github.gtexpert.gtwp.module.Modules;
+
+@TModule(
+         moduleID = Modules.MODULE_MWORLD,
+         containerID = ModValues.MODID,
+         modDependencies = Mods.Names.MYSTICAL_WORLD,
+         name = "GTWoodProcessing Mystical World Integration",
+         description = "Mystical World Integration Module")
+public class MWorldModule extends GTWPIntegrationSubmodule {
+
+    @Override
+    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+        MWorldWoodRecipe.init();
+    }
+}

src/main/java/com/github/gtexpert/gtwp/integration/mworld/recipes/MWorldWoodRecipe.java

@@ -0,0 +1,40 @@
+package com.github.gtexpert.gtwp.integration.mworld.recipes;
+
+import java.util.Arrays;
+import java.util.List;
+
+import gregtech.loaders.WoodTypeEntry;
+
+import com.github.gtexpert.gtwp.api.util.Mods;
+import com.github.gtexpert.gtwp.loaders.GTWPWoodRecipeLoader;
+
+public class MWorldWoodRecipe {
+
+    private static List<WoodTypeEntry> DEFAULT_ENTRIES;
+
+    private static List<WoodTypeEntry> getDefaultEntries() {
+        if (DEFAULT_ENTRIES == null) {
+            final String mcModId = Mods.Names.MYSTICAL_WORLD;
+            return DEFAULT_ENTRIES = Arrays.asList(
+                    new WoodTypeEntry.Builder(mcModId, "charred")
+                            .log(Mods.MysticalWorld.getItem("charred_log", 1)).removeCharcoalRecipe()
+                            .planks(Mods.MysticalWorld.getItem("charred_planks", 1), null)
+                            .slab(Mods.MysticalWorld.getItem("charred_slab", 1), "charred_slab")
+                            .fence(Mods.MysticalWorld.getItem("charred_fence", 1), "charred_fence")
+                            .fenceGate(Mods.MysticalWorld.getItem("charred_fence_gate", 1), "charred_fence_gate")
+                            .stairs(Mods.MysticalWorld.getItem("charred_stairs", 1), "charred_stairs")
+                            .build());
+        }
+        return DEFAULT_ENTRIES;
+    }
+
+    public static void init() {
+        for (WoodTypeEntry entry : getDefaultEntries()) {
+            GTWPWoodRecipeLoader.removePlankRecipe(false, entry, Mods.Names.MYSTICAL_WORLD);
+
+            GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
+            GTWPWoodRecipeLoader.addCuttingRecipe(entry);
+            GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+        }
+    }
+}

src/main/java/com/github/gtexpert/gtwp/module/Modules.java

@@ -38,6 +38,7 @@ public class Modules implements IModuleContainer {
     public static final String MODULE_RTHINGS = "rthings_integration";
     public static final String MODULE_RUSTIC = "rustic_integration";
     public static final String MODULE_IDS = "ids_integration";
+    public static final String MODULE_MWORLD = "mworld_integration";
 
     @Override
     public String getID() {