Skip to content

Commit ba65158

Browse files
tier940tier940
authored
Merge pull request #3 from GTModpackTeam/add-pvj
2 parents c253c07 + 3b82618 commit ba65158

15 files changed

Lines changed: 285 additions & 35 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
1+
# v1.0.2
2+
## New Integration
3+
- Project: Vibrant Journeys Integration
4+
5+
* * *
6+
7+
## Fix Integration
8+
- Thaumcraft
9+
10+
# v1.0.1
11+
## New Integration
12+
- Advanced Rocketry
13+
14+
* * *
15+
116
# v1.0.0
217
- Fast version

‎dependencies.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,9 @@ dependencies {
7676
runtimeOnlyNonPublishable rfg.deobf("curse.maven:libvulpes-236541:3801015") // LibVulpes 0.4.2-25
7777
runtimeOnlyNonPublishable rfg.deobf("curse.maven:advanced-rocketry-236542:4671856") // Advanced Rocketry 2.0.0-17
7878
}
79+
80+
// Project: Vibrant Journeys
81+
if (project.debug_all.toBoolean() || project.debug_pvj.toBoolean()) {
82+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:project-vibrant-journeys-300297:2775566") // Project: Vibrant Journeys 1.6.4
83+
}
7984
}

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ debug_forestry = false
2727
debug_binnies = false
2828
debug_gtfo = false
2929
debug_advrocket = false
30+
debug_pvj = false
3031

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public enum Mods {
9292
ProjectRedIllumination(Names.PROJECT_RED_ILLUMINATION),
9393
Railcraft(Names.RAILCRAFT),
9494
RefinedStorage(Names.REFINED_STORAGE),
95+
ProjectVibrantJourneys(Names.PROJECT_VIBRANT_JOURNEYS),
9596
Thaumcraft(Names.THAUMCRAFT),
9697
ThaumicEnergistics(Names.THAUMIC_ENERGISTICS),
9798
TheOneProbe(Names.THE_ONE_PROBE),
@@ -188,6 +189,7 @@ public static class Names {
188189
public static final String PROJECT_RED_ILLUMINATION = "projectred-illumination";
189190
public static final String RAILCRAFT = "railcraft";
190191
public static final String REFINED_STORAGE = "refinedstorage";
192+
public static final String PROJECT_VIBRANT_JOURNEYS = "pvj";
191193
public static final String THAUMCRAFT = "thaumcraft";
192194
public static final String THAUMIC_ENERGISTICS = "haumicenergistics";
193195
public static final String THE_ONE_PROBE = "theoneprobe";

‎src/main/java/gtexpert/gtwp/common/GTWPConfigHolder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class GTWPConfigHolder {
1616
public static class GregtechOverride {
1717

1818
@Config.Comment({ "Making Planks even more difficult.",
19-
"CEu's nerfWoodCrafting to true to reflect.", "Default: false" })
19+
"CEu's hardWoodRecipes & nerfWoodCrafting to true to reflect.", "Default: false" })
2020
public boolean moreNerfPlankCrafting = false;
2121

2222
@Config.Comment({ "Making Sticks even more difficult.",

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ public class AdvancedRocketryWoodRecipe {
1414

1515
private static List<WoodTypeEntry> getDefaultEntries() {
1616
if (DEFAULT_ENTRIES == null) {
17-
final String mcModId = Mods.AdvancedRocketry.name();
17+
final String mcModId = Mods.Names.ADVANCED_ROCKETRY;
1818
return DEFAULT_ENTRIES = Arrays.asList(
1919
new WoodTypeEntry.Builder(mcModId, "alien")
20-
.planks(Mods.AdvancedRocketry.getItem("planks", 1), null)
21-
.log(Mods.AdvancedRocketry.getItem("alienwood", 1))
22-
.registerAllUnificationInfo()
20+
.log(Mods.AdvancedRocketry.getItem("alienwood", 1)).removeCharcoalRecipe()
21+
.planks(Mods.AdvancedRocketry.getItem("planks", 1), "advancedrocketry_alien_plank")
2322
.build());
2423
}
2524
return DEFAULT_ENTRIES;
@@ -29,6 +28,8 @@ public static void init() {
2928
ModHandler.removeRecipeByName(Mods.AdvancedRocketry.getResource("alienwoodplanks"));
3029

3130
for (WoodTypeEntry entry : getDefaultEntries()) {
31+
GTWPWoodRecipeLoader.removePlankRecipe(false, entry, Mods.Names.ADVANCED_ROCKETRY);
32+
3233
GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
3334
GTWPWoodRecipeLoader.addCuttingRecipe(entry);
3435
GTWPWoodRecipeLoader.addSawmillRecipe(entry);

‎src/main/java/gtexpert/gtwp/integration/binnies/extratrees/loaders/recipes/ExtraTreesWoodRecipe.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
public class ExtraTreesWoodRecipe {
1616

17-
private static final String mcModId = Mods.ExtraTrees.name();
17+
private static final String mcModId = Mods.Names.EXTRA_TREES;
1818

1919
private static List<WoodTypeEntry> DEFAULT_ENTRIES;
2020
private static List<WoodTypeEntry> FIREPROOF_ENTRIES;
@@ -50,22 +50,23 @@ private static void initEntries() {
5050
private static WoodTypeEntry getEntryByName(String woodName, int plankId, int logId, int slabId, int plankMeta,
5151
int logMeta, int slabMeta) {
5252
return new WoodTypeEntry.Builder(mcModId, woodName)
53-
.planks(Mods.ExtraTrees.getItem("planks." + plankId, 1, plankMeta), null)
5453
.log(Mods.ExtraTrees.getItem("logs." + logId, 1, logMeta)).removeCharcoalRecipe()
54+
.planks(Mods.ExtraTrees.getItem("planks." + plankId, 1, plankMeta), null)
5555
.door(Mods.ExtraTrees.getItem("doors." + woodName), null)
5656
.slab(Mods.ExtraTrees.getItem("slabs." + slabId, 1, slabMeta), null)
5757
.fence(Mods.ExtraTrees.getItem("fences." + plankId, 1, plankMeta), null)
5858
.fenceGate(Mods.ExtraTrees.getItem("fence.gates." + woodName), null)
5959
.stairs(Mods.ExtraTrees.getItem("stairs." + woodName), null).addStairsRecipe()
60+
.registerAllUnificationInfo()
6061
.build();
6162
}
6263

6364
private static WoodTypeEntry getFireProofEntryByName(String woodName, int plankId, int logId, int slabId,
6465
int plankMeta, int logMeta, int slabMeta) {
6566
return new WoodTypeEntry.Builder(mcModId, woodName)
67+
.log(Mods.ExtraTrees.getItem("logs.fireproof." + logId, 1, logMeta)).removeCharcoalRecipe()
6668
.planks(Mods.ExtraTrees.getItem("planks.fireproof." + plankId, 1, plankMeta),
6769
"fireproof_planks_" + woodName)
68-
.log(Mods.ExtraTrees.getItem("logs.fireproof." + logId, 1, logMeta)).removeCharcoalRecipe()
6970
.slab(Mods.ExtraTrees.getItem("slabs.fireproof." + slabId, 1, slabMeta),
7071
"fireproof_slab_" + woodName)
7172
.fence(Mods.ExtraTrees.getItem("fences.fireproof." + plankId, 1, plankMeta),
@@ -75,6 +76,7 @@ private static WoodTypeEntry getFireProofEntryByName(String woodName, int plankI
7576
.stairs(Mods.ExtraTrees.getItem("stairs.fireproof." + woodName),
7677
"fireproof_stair_" + woodName)
7778
.addStairsRecipe()
79+
.registerAllUnificationInfo()
7880
.build();
7981
}
8082

‎src/main/java/gtexpert/gtwp/integration/forestry/loaders/recipes/ForestryWoodRecipe.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class ForestryWoodRecipe {
2121

22-
private static final String mcModId = Mods.Forestry.name();
22+
private static final String mcModId = Mods.Names.FORESTRY;
2323
private static List<WoodTypeEntry> DEFAULT_ENTRIES;
2424
private static List<WoodTypeEntry> FIREPROOF_ENTRIES;
2525

@@ -63,13 +63,14 @@ private static void initEntries() {
6363
private static WoodTypeEntry getEntry(String woodName, int plankMeta, int logMeta, int slabMeta, int plankId,
6464
int logId, int slabId, String separator) {
6565
return new WoodTypeEntry.Builder(mcModId, woodName)
66-
.planks(Mods.Forestry.getItem("planks." + separator + plankId, 1, plankMeta), null)
6766
.log(Mods.Forestry.getItem("logs." + separator + logId, 1, logMeta)).removeCharcoalRecipe()
67+
.planks(Mods.Forestry.getItem("planks." + separator + plankId, 1, plankMeta), null)
6868
.door(Mods.Forestry.getItem("doors." + separator + woodName), null)
6969
.slab(Mods.Forestry.getItem("slabs." + separator + slabId, 1, slabMeta), null)
7070
.fence(Mods.Forestry.getItem("fences." + separator + plankId, 1, plankMeta), null)
7171
.fenceGate(Mods.Forestry.getItem("fence.gates." + separator + woodName), null)
7272
.stairs(Mods.Forestry.getItem("stairs." + separator + woodName), null).addStairsRecipe()
73+
.registerAllUnificationInfo()
7374
.build();
7475
}
7576

‎src/main/java/gtexpert/gtwp/integration/gtfo/loaders/recipes/GTFOWoodRecipe.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,55 @@ public class GTFOWoodRecipe {
1313

1414
private static List<WoodTypeEntry> getDefaultEntries() {
1515
if (DEFAULT_ENTRIES == null) {
16-
final String mcModId = Mods.GregTechFoodOption.name();
16+
final String mcModId = Mods.Names.GREGTECH_FOOD_OPTION;
1717
return DEFAULT_ENTRIES = Arrays.asList(
1818
new WoodTypeEntry.Builder(mcModId, "banana")
19+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1)).removeCharcoalRecipe()
1920
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1), null)
20-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1))
21-
.registerAllUnificationInfo()
2221
.build(),
2322
new WoodTypeEntry.Builder(mcModId, "orange")
23+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 4)).removeCharcoalRecipe()
2424
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 1), null)
25-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 4))
2625
.build(),
2726
new WoodTypeEntry.Builder(mcModId, "mango")
27+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 8)).removeCharcoalRecipe()
2828
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 2), null)
29-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 8))
3029
.build(),
3130
new WoodTypeEntry.Builder(mcModId, "apricot")
31+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 12)).removeCharcoalRecipe()
3232
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 3), null)
33-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 12))
3433
.build(),
3534
new WoodTypeEntry.Builder(mcModId, "lemon")
35+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1)).removeCharcoalRecipe()
3636
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 4), null)
37-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1))
3837
.build(),
3938
new WoodTypeEntry.Builder(mcModId, "lime")
39+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 4)).removeCharcoalRecipe()
4040
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 5), null)
41-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 4))
4241
.build(),
4342
new WoodTypeEntry.Builder(mcModId, "olive")
43+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 8)).removeCharcoalRecipe()
4444
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 6), null)
45-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 8))
4645
.build(),
4746
new WoodTypeEntry.Builder(mcModId, "rainbowwood")
47+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 12)).removeCharcoalRecipe()
4848
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 7), null)
49-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 12))
5049
.build(),
5150
new WoodTypeEntry.Builder(mcModId, "nutmeg")
51+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_2", 1)).removeCharcoalRecipe()
5252
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 8), null)
53-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_2", 1))
5453
.build(),
5554
new WoodTypeEntry.Builder(mcModId, "coconut")
55+
.log(Mods.GregTechFoodOption.getItem("gtfo_log_2", 1, 4)).removeCharcoalRecipe()
5656
.planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 9), null)
57-
.log(Mods.GregTechFoodOption.getItem("gtfo_log_2", 1, 4))
5857
.build());
5958
}
6059
return DEFAULT_ENTRIES;
6160
}
6261

6362
public static void init() {
6463
for (WoodTypeEntry entry : getDefaultEntries()) {
65-
GTWPWoodRecipeLoader.removePlankRecipe(true, entry, Mods.GregTechFoodOption.name());
64+
GTWPWoodRecipeLoader.removePlankRecipe(true, entry, Mods.Names.GREGTECH_FOOD_OPTION);
6665

6766
GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
6867
GTWPWoodRecipeLoader.addSawmillRecipe(entry);

‎src/main/java/gtexpert/gtwp/integration/pvj/PVJConfigHolder.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package gtexpert.gtwp.integration.pvj;
2+
3+
import net.minecraftforge.common.config.Config;
4+
5+
import gtexpert.gtwp.api.ModValues;
6+
import gtexpert.gtwp.module.Modules;
7+
8+
@Config.LangKey(ModValues.MODID + ".config.integration.pvj")
9+
@Config(modid = ModValues.MODID,
10+
name = ModValues.MODID + "/integration/" + Modules.MODULE_PVJ,
11+
category = "ProjectVibrantJourneys")
12+
public class PVJConfigHolder {}

0 commit comments

Comments
 (0)