Merge pull request #2 from GTModpackTeam/add-advrocketry

Author: tier940

dependencies.gradle

@@ -57,7 +57,7 @@ dependencies {
     // Debug Forestry
     compileOnly rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
     compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
-    if (project.debug_all.toBoolean() || project.debug_ffm.toBoolean()) {
+    if (project.debug_all.toBoolean() || project.debug_forestry.toBoolean()) {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
 
         // Debug Binnies
@@ -70,4 +70,10 @@ dependencies {
     if (project.debug_all.toBoolean() || project.debug_gtfo.toBoolean()) {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:gregtech-food-option-477021:5487400") // GTFO 1.11.2.1
     }
+
+    // Advanced Rocketry
+    if (project.debug_all.toBoolean() || project.debug_advrocket.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:libvulpes-236541:3801015") // LibVulpes 0.4.2-25
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:advanced-rocketry-236542:4671856") // Advanced Rocketry 2.0.0-17
+    }
 }

gradle.properties

@@ -23,9 +23,10 @@ minecraftVersion = 1.12.2
 # Debug mod compatibility
 debug_all = false
 debug_thaumcraft = false
-debug_ffm = false
+debug_forestry = false
 debug_binnies = false
 debug_gtfo = false
+debug_advrocket = 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/gtexpert/gtwp/GTWPMod.java

@@ -18,16 +18,23 @@
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+import gregtech.GTInternalTags;
 import gtexpert.gtwp.api.ModValues;
 import gtexpert.gtwp.api.util.ModLog;
+import gtexpert.gtwp.api.util.Mods;
 import gtexpert.gtwp.module.ModuleManager;
 import gtexpert.gtwp.module.Modules;
 
 @Mod(
      modid = Tags.MODID,
      name = Tags.MODNAME,
      version = Tags.VERSION,
-     dependencies = "")
+     updateJSON = "https://forge.curseupdate.com/1093753/gtwoodprocessing",
+     acceptedMinecraftVersions = "[1.12.2,1.13)",
+     dependencies = GTInternalTags.DEP_VERSION_STRING + "after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" +
+             "after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.FORESTRY + ";" +
+             "after:" + Mods.Names.EXTRA_TREES + ";" + "after:" + Mods.Names.ADVANCED_ROCKETRY + ";")
+@Mod.EventBusSubscriber(modid = ModValues.MODID)
 public class GTWPMod {
 
     private ModuleManager moduleManager;

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

@@ -26,6 +26,7 @@ public enum Mods {
     AEAdditions(Names.AE_ADDITIONS),
     AE2FluidCrafting(Names.AE2_FLUID_CRAFTING),
     AppliedEnergistics2(Names.APPLIED_ENERGISTICS2),
+    AdvancedRocketry(Names.ADVANCED_ROCKETRY),
     Avaritia(Names.AVARITIA),
     Avaritiaaddons(Names.AVARITIAADDONS),
     Baubles(Names.BAUBLES),
@@ -122,6 +123,7 @@ public static class Names {
         public static final String AE_ADDITIONS = "aeadditions";
         public static final String AE2_FLUID_CRAFTING = "ae2fc";
         public static final String APPLIED_ENERGISTICS2 = "appliedenergistics2";
+        public static final String ADVANCED_ROCKETRY = "advancedrocketry";
         public static final String AVARITIA = "avaritia";
         public static final String AVARITIAADDONS = "avaritiaddons";
         public static final String BAUBLES = "baubles";

src/main/java/gtexpert/gtwp/integration/GTWPIntegrationModule.java

@@ -9,8 +9,16 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
+import gtexpert.gtwp.api.ModValues;
+import gtexpert.gtwp.api.modules.TModule;
 import gtexpert.gtwp.module.BaseModule;
+import gtexpert.gtwp.module.Modules;
 
+@TModule(
+         moduleID = Modules.MODULE_INTEGRATION,
+         containerID = ModValues.MODID,
+         name = "GTWoodProcessing Integration",
+         description = "General GTWoodProcessing Integration Module. Disabling this disables all integration modules.")
 public class GTWPIntegrationModule extends BaseModule {
 
     public static final Logger logger = LogManager.getLogger("GTWoodProcessing Mod Integration");

src/main/java/gtexpert/gtwp/integration/advrocketry/AdvancedRocketryConfigHolder.java

@@ -0,0 +1,12 @@
+package gtexpert.gtwp.integration.advrocketry;
+
+import net.minecraftforge.common.config.Config;
+
+import gtexpert.gtwp.api.ModValues;
+import gtexpert.gtwp.module.Modules;
+
+@Config.LangKey(ModValues.MODID + ".config.integration.advrocketry")
+@Config(modid = ModValues.MODID,
+        name = ModValues.MODID + "/integration/" + Modules.MODULE_ADVROCKETRY,
+        category = "AdvancedRocketry")
+public class AdvancedRocketryConfigHolder {}

src/main/java/gtexpert/gtwp/integration/advrocketry/AdvancedRocketryModule.java

@@ -0,0 +1,25 @@
+package gtexpert.gtwp.integration.advrocketry;
+
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.event.RegistryEvent;
+
+import gtexpert.gtwp.api.ModValues;
+import gtexpert.gtwp.api.modules.TModule;
+import gtexpert.gtwp.api.util.Mods;
+import gtexpert.gtwp.integration.GTWPIntegrationSubmodule;
+import gtexpert.gtwp.integration.advrocketry.recipes.AdvancedRocketryWoodRecipe;
+import gtexpert.gtwp.module.Modules;
+
+@TModule(
+         moduleID = Modules.MODULE_ADVROCKETRY,
+         containerID = ModValues.MODID,
+         modDependencies = Mods.Names.ADVANCED_ROCKETRY,
+         name = "GTWoodProcessing Advanced Rocketry Integration",
+         description = "Advanced Rocketry Integration Module")
+public class AdvancedRocketryModule extends GTWPIntegrationSubmodule {
+
+    @Override
+    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+        AdvancedRocketryWoodRecipe.init();
+    }
+}

src/main/java/gtexpert/gtwp/integration/advrocketry/recipes/AdvancedRocketryWoodRecipe.java

@@ -0,0 +1,37 @@
+package gtexpert.gtwp.integration.advrocketry.recipes;
+
+import java.util.Arrays;
+import java.util.List;
+
+import gregtech.api.recipes.ModHandler;
+import gregtech.loaders.WoodTypeEntry;
+import gtexpert.gtwp.api.util.Mods;
+import gtexpert.gtwp.loaders.GTWPWoodRecipeLoader;
+
+public class AdvancedRocketryWoodRecipe {
+
+    private static List<WoodTypeEntry> DEFAULT_ENTRIES;
+
+    private static List<WoodTypeEntry> getDefaultEntries() {
+        if (DEFAULT_ENTRIES == null) {
+            final String mcModId = Mods.AdvancedRocketry.name();
+            return DEFAULT_ENTRIES = Arrays.asList(
+                    new WoodTypeEntry.Builder(mcModId, "alien")
+                            .planks(Mods.AdvancedRocketry.getItem("planks", 1), null)
+                            .log(Mods.AdvancedRocketry.getItem("alienwood", 1))
+                            .registerAllUnificationInfo()
+                            .build());
+        }
+        return DEFAULT_ENTRIES;
+    }
+
+    public static void init() {
+        ModHandler.removeRecipeByName(Mods.AdvancedRocketry.getResource("alienwoodplanks"));
+
+        for (WoodTypeEntry entry : getDefaultEntries()) {
+            GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
+            GTWPWoodRecipeLoader.addCuttingRecipe(entry);
+            GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+        }
+    }
+}

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

@@ -18,6 +18,7 @@ public class Modules implements IModuleContainer {
     public static final String MODULE_CHISEL = "chisel_integration";
     public static final String MODULE_AE = "ae_integration";
     public static final String MODULE_AEA = "aeadditions_integration";
+    public static final String MODULE_ADVROCKETRY = "advrocketry_integration";
     public static final String MODULE_NAE2 = "nae2_integration";
     public static final String MODULE_BINNIES = "binnies_integration";
     public static final String MODULE_BOTANY = "botany_integration";