Skip to content

Commit dbd80b1

Browse files
committed
Add Mystical World Integration
1 parent 9227149 commit dbd80b1

10 files changed

Lines changed: 100 additions & 1 deletion

File tree

.github/workflows/publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ jobs:
9898
integrated-dynamics(recommended)
9999
random-things(recommended)
100100
rustic(recommended)
101+
mystical-world(recommended)
102+
roots(recommended)
101103
files: |
102104
build/libs/!(*-@(dev|sources|javadoc)).jar
103105
build/libs/*-@(sources).jar

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
- Extra Utilities 2
44
- Integrated Dynamics
55
- Random Things
6+
- Rustic
7+
- Mystical World
8+
- Roots
69

710
* * *
811

dependencies.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,15 @@ dependencies {
109109
if (project.debug_all.toBoolean() || project.debug_rustic.toBoolean()) {
110110
runtimeOnlyNonPublishable rfg.deobf("curse.maven:rustic-256141:3107974") // Rustic 1.1.7
111111
}
112+
113+
// Debug Mystical World
114+
if (project.debug_all.toBoolean() || project.debug_mworld.toBoolean()) {
115+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:patchouli-306770:3162874") // Patchouli 1.0-23.6
116+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:mysticallib-277064:3483816") // MysticalLib 1.13.0
117+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:mystical-world-282940:3460961") // Mystical World 1.11.0
118+
119+
if (project.debug_all.toBoolean() || project.debug_roots.toBoolean()) {
120+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:roots-246183:5193525") // Roots 3.1.9.2
121+
}
122+
}
112123
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ debug_exu = false
3333
debug_ids = false
3434
debug_rthings = false
3535
debug_rustic = false
36+
debug_mworld = false
37+
debug_roots = false
3638

3739
# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
3840
# restart Minecraft in development. Choose this dependent on your mod:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"after:" + Mods.Names.EXTRA_TREES + ";" + "after:" + Mods.Names.ADVANCED_ROCKETRY + ";" +
3838
"after:" + Mods.Names.PROJECT_VIBRANT_JOURNEYS + ";" + "after:" + Mods.Names.PLANTS + ";" +
3939
"after:" + Mods.Names.EXTRA_UTILITIES + ";" + "after:" + Mods.Names.INTERGRATED_DYNAMICS + ";" +
40-
"after:" + Mods.Names.RANDOM_THINGS + ";" + "after:" + Mods.Names.RUSTIC + ";")
40+
"after:" + Mods.Names.RANDOM_THINGS + ";" + "after:" + Mods.Names.RUSTIC + ";" +
41+
"after:" + Mods.Names.MYSTICAL_WORLD + ";")
4142
@Mod.EventBusSubscriber(modid = ModValues.MODID)
4243
public class GTWPMod {
4344

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public enum Mods {
8585
MagicBees(Names.MAGIC_BEES),
8686
ModularUI(Names.MODULRAUI),
8787
MixinBooter(Names.MIXINBOOTER),
88+
MysticalWorld(Names.MYSTICAL_WORLD),
8889
NeevesAE2(Names.NEEVES_AE2),
8990
Nothirium(Names.NOTHIRIUM),
9091
NuclearCraft(Names.NUCLEAR_CRAFT, versionExcludes("2o")),
@@ -188,6 +189,7 @@ public static class Names {
188189
public static final String MAGIC_BEES = "magicbees";
189190
public static final String MODULRAUI = "modularui";
190191
public static final String MIXINBOOTER = "mixinbooter";
192+
public static final String MYSTICAL_WORLD = "mysticalworld";
191193
public static final String NEEVES_AE2 = "nae2";
192194
public static final String NOTHIRIUM = "nothirium";
193195
public static final String NUCLEAR_CRAFT = "nuclearcraft";
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.github.gtexpert.gtwp.integration.mworld;
2+
3+
import net.minecraftforge.common.config.Config;
4+
5+
import com.github.gtexpert.gtwp.api.ModValues;
6+
import com.github.gtexpert.gtwp.module.Modules;
7+
8+
@Config.LangKey(ModValues.MODID + ".config.integration.mworld")
9+
@Config(modid = ModValues.MODID,
10+
name = ModValues.MODID + "/integration/" + Modules.MODULE_MWORLD,
11+
category = "MysticalWorld")
12+
public class MWorldConfigHolder {}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.github.gtexpert.gtwp.integration.mworld;
2+
3+
import net.minecraft.item.crafting.IRecipe;
4+
import net.minecraftforge.event.RegistryEvent;
5+
6+
import com.github.gtexpert.gtwp.api.ModValues;
7+
import com.github.gtexpert.gtwp.api.modules.TModule;
8+
import com.github.gtexpert.gtwp.api.util.Mods;
9+
import com.github.gtexpert.gtwp.integration.GTWPIntegrationSubmodule;
10+
import com.github.gtexpert.gtwp.integration.mworld.recipes.MWorldWoodRecipe;
11+
import com.github.gtexpert.gtwp.module.Modules;
12+
13+
@TModule(
14+
moduleID = Modules.MODULE_MWORLD,
15+
containerID = ModValues.MODID,
16+
modDependencies = Mods.Names.MYSTICAL_WORLD,
17+
name = "GTWoodProcessing Mystical World Integration",
18+
description = "Mystical World Integration Module")
19+
public class MWorldModule extends GTWPIntegrationSubmodule {
20+
21+
@Override
22+
public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
23+
MWorldWoodRecipe.init();
24+
}
25+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.github.gtexpert.gtwp.integration.mworld.recipes;
2+
3+
import java.util.Arrays;
4+
import java.util.List;
5+
6+
import gregtech.loaders.WoodTypeEntry;
7+
8+
import com.github.gtexpert.gtwp.api.util.Mods;
9+
import com.github.gtexpert.gtwp.loaders.GTWPWoodRecipeLoader;
10+
11+
public class MWorldWoodRecipe {
12+
13+
private static List<WoodTypeEntry> DEFAULT_ENTRIES;
14+
15+
private static List<WoodTypeEntry> getDefaultEntries() {
16+
if (DEFAULT_ENTRIES == null) {
17+
final String mcModId = Mods.Names.MYSTICAL_WORLD;
18+
return DEFAULT_ENTRIES = Arrays.asList(
19+
new WoodTypeEntry.Builder(mcModId, "charred")
20+
.log(Mods.MysticalWorld.getItem("charred_log", 1)).removeCharcoalRecipe()
21+
.planks(Mods.MysticalWorld.getItem("charred_planks", 1), null)
22+
.slab(Mods.MysticalWorld.getItem("charred_slab", 1), "charred_slab")
23+
.fence(Mods.MysticalWorld.getItem("charred_fence", 1), "charred_fence")
24+
.fenceGate(Mods.MysticalWorld.getItem("charred_fence_gate", 1), "charred_fence_gate")
25+
.stairs(Mods.MysticalWorld.getItem("charred_stairs", 1), "charred_stairs")
26+
.build());
27+
}
28+
return DEFAULT_ENTRIES;
29+
}
30+
31+
public static void init() {
32+
for (WoodTypeEntry entry : getDefaultEntries()) {
33+
GTWPWoodRecipeLoader.removePlankRecipe(false, entry, Mods.Names.MYSTICAL_WORLD);
34+
35+
GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
36+
GTWPWoodRecipeLoader.addCuttingRecipe(entry);
37+
GTWPWoodRecipeLoader.addSawmillRecipe(entry);
38+
}
39+
}
40+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class Modules implements IModuleContainer {
3838
public static final String MODULE_RTHINGS = "rthings_integration";
3939
public static final String MODULE_RUSTIC = "rustic_integration";
4040
public static final String MODULE_IDS = "ids_integration";
41+
public static final String MODULE_MWORLD = "mworld_integration";
4142

4243
@Override
4344
public String getID() {

0 commit comments

Comments
 (0)