Merge pull request #14 from GTModpackTeam/add-integrations

Author: tier940

.github/workflows/publish.yml

@@ -103,6 +103,9 @@ jobs:
             biomes-o-plenty(recommended)
             ice-and-fire-dragons(recommended)
             wizardry-mod(recommended)
+            traverse-reforged(recommended)
+            nether-update-backport(recommended)
+            the-twilight-forest(recommended)
           files: |
             build/libs/!(*-@(dev|sources|javadoc)).jar
             build/libs/*-@(sources).jar

CHANGELOG.md

@@ -1,6 +1,10 @@
-# v1.1.1
+# v1.2.0
 ## New Integration
 - Ice and Fire: Dragons
+- Wizardry
+- Traverse Reforged
+- Nether Update Backport
+- The Twilight Forest
 
 * * *
 

dependencies.gradle

@@ -132,4 +132,19 @@ dependencies {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:shadowfacts-forgelin-248453:2785465") // Forgelin 1.8.4
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:wizardry-mod-278155:5160012") // Wizardry 0.11.3
     }
+
+    // Debug Traverse Reforged
+    if (project.debug_all.toBoolean() || project.debug_traverse.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:traverse-reforged-267769:2613657") // Traverse Reforged 1.6.0
+    }
+
+    // Debug Nether Update Backport
+    if (project.debug_all.toBoolean() || project.debug_nub.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:nether-update-backport-384529:3140835") // Nether Update Backport 1.0.1
+    }
+
+    // Debug The Twilight Forest
+    if (project.debug_all.toBoolean() || project.debug_twilight.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:the-twilight-forest-227639:3051450") // The Twilight Forest 3.11.1021
+    }
 }

gradle.properties

@@ -37,6 +37,9 @@ debug_mworld = false
 debug_roots = false
 debug_bop = false
 debug_wizardry = false
+debug_traverse = false
+debug_nub = false
+debug_twilight = 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

@@ -40,7 +40,8 @@
              "after:" + Mods.Names.RANDOM_THINGS + ";" + "after:" + Mods.Names.RUSTIC + ";" +
              "after:" + Mods.Names.MYSTICAL_WORLD + ";" + "after:" + Mods.Names.ROOTS + ";" +
              "after:" + Mods.Names.BIOMES_O_PLENTY + ";" + "after:" + Mods.Names.ICE_AND_FIRE + ";" +
-             "after:" + Mods.Names.WIZARDRY + ";")
+             "after:" + Mods.Names.WIZARDRY + ";" + "after:" + Mods.Names.TRAVERES + ";" +
+             "after:" + Mods.Names.TWILIGHT_FOREST)
 @Mod.EventBusSubscriber(modid = ModValues.MODID)
 public class GTWPMod {
 

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

@@ -92,6 +92,7 @@ public enum Mods {
     Nothirium(Names.NOTHIRIUM),
     NuclearCraft(Names.NUCLEAR_CRAFT, versionExcludes("2o")),
     NuclearCraftOverhauled(Names.NUCLEAR_CRAFT, versionContains("2o")),
+    NetherUpdateBackport(Names.NETHER_UPDATE_BACKPORT),
     OpenComputers(Names.OPEN_COMPUTERS),
     ProjectRedCore(Names.PROJECT_RED_CORE),
     ProjectRedIllumination(Names.PROJECT_RED_ILLUMINATION),
@@ -103,6 +104,8 @@ public enum Mods {
     ProjectVibrantJourneys(Names.PROJECT_VIBRANT_JOURNEYS),
     Rustic(Names.RUSTIC),
     Thaumcraft(Names.THAUMCRAFT),
+    Traverse(Names.TRAVERES),
+    TwilightForest(Names.TWILIGHT_FOREST),
     ThaumicEnergistics(Names.THAUMIC_ENERGISTICS),
     Wizardry(Names.WIZARDRY),
     TheOneProbe(Names.THE_ONE_PROBE),
@@ -199,6 +202,7 @@ public static class Names {
         public static final String NEEVES_AE2 = "nae2";
         public static final String NOTHIRIUM = "nothirium";
         public static final String NUCLEAR_CRAFT = "nuclearcraft";
+        public static final String NETHER_UPDATE_BACKPORT = "netherbackport";
         public static final String OPEN_COMPUTERS = "opencomputers";
         public static final String PROJECT_RED_CORE = "projred-core";
         public static final String PROJECT_RED_ILLUMINATION = "projectred-illumination";
@@ -210,6 +214,8 @@ public static class Names {
         public static final String PROJECT_VIBRANT_JOURNEYS = "pvj";
         public static final String RUSTIC = "rustic";
         public static final String THAUMCRAFT = "thaumcraft";
+        public static final String TRAVERES = "traverse";
+        public static final String TWILIGHT_FOREST = "twilightforest";
         public static final String THAUMIC_ENERGISTICS = "haumicenergistics";
         public static final String WIZARDRY = "wizardry";
         public static final String THE_ONE_PROBE = "theoneprobe";

src/main/java/com/github/gtexpert/gtwp/integration/nub/NUBConfigHolder.java

@@ -0,0 +1,12 @@
+package com.github.gtexpert.gtwp.integration.nub;
+
+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.nub")
+@Config(modid = ModValues.MODID,
+        name = ModValues.MODID + "/integration/" + Modules.MODULE_NUB,
+        category = "NetherUpdateBackport")
+public class NUBConfigHolder {}

src/main/java/com/github/gtexpert/gtwp/integration/nub/NUBModule.java

@@ -0,0 +1,25 @@
+package com.github.gtexpert.gtwp.integration.nub;
+
+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.nub.recipes.NUBWoodRecipe;
+import com.github.gtexpert.gtwp.module.Modules;
+
+@TModule(
+         moduleID = Modules.MODULE_NUB,
+         containerID = ModValues.MODID,
+         modDependencies = Mods.Names.NETHER_UPDATE_BACKPORT,
+         name = "GTWoodProcessing Nether Update Backport Integration",
+         description = "Nether Update Backport Integration Module")
+public class NUBModule extends GTWPIntegrationSubmodule {
+
+    @Override
+    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+        NUBWoodRecipe.init();
+    }
+}

src/main/java/com/github/gtexpert/gtwp/integration/nub/recipes/NUBWoodRecipe.java

@@ -0,0 +1,40 @@
+package com.github.gtexpert.gtwp.integration.nub.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 NUBWoodRecipe {
+
+    private static List<WoodTypeEntry> DEFAULT_ENTRIES;
+
+    private static List<WoodTypeEntry> getDefaultEntries() {
+        if (DEFAULT_ENTRIES == null) {
+            final String mcModId = Mods.Names.NETHER_UPDATE_BACKPORT;
+            return DEFAULT_ENTRIES = Arrays.asList(
+                    new WoodTypeEntry.Builder(mcModId, "crimson")
+                            .log(Mods.NetherUpdateBackport.getItem("crimsonstem", 1)).removeCharcoalRecipe()
+                            .planks(Mods.NetherUpdateBackport.getItem("crimsonplanks", 1), "crimsonplanksrecipe")
+                            .build(),
+                    new WoodTypeEntry.Builder(mcModId, "warped")
+                            .log(Mods.NetherUpdateBackport.getItem("warpedstem", 1)).removeCharcoalRecipe()
+                            .planks(Mods.NetherUpdateBackport.getItem("warpedplanks", 1), "warpedplanksrecipe")
+                            .build());
+        }
+        return DEFAULT_ENTRIES;
+    }
+
+    public static void init() {
+        for (WoodTypeEntry entry : getDefaultEntries()) {
+            GTWPWoodRecipeLoader.removePlankRecipe(false, entry);
+
+            GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
+            GTWPWoodRecipeLoader.addCuttingRecipe(entry);
+            GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+        }
+    }
+}

src/main/java/com/github/gtexpert/gtwp/integration/traverse/TraverseConfigHolder.java

@@ -0,0 +1,12 @@
+package com.github.gtexpert.gtwp.integration.traverse;
+
+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.traverse")
+@Config(modid = ModValues.MODID,
+        name = ModValues.MODID + "/integration/" + Modules.MODULE_TRAVERES,
+        category = "Traverse")
+public class TraverseConfigHolder {}