diff --git a/.gitignore b/.gitignore index 48c525b1..27a8ae0f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,13 @@ whitelist.json *.iml *.ipr *.iws -src/main/resources/mixins.*.json +src/main/resources/mixins.*([!.]).json *.bat *.DS_Store !gradlew.bat +.factorypath +addon.local.gradle +addon.local.gradle.kts +addon.late.local.gradle +addon.late.local.gradle.kts +layout.json \ No newline at end of file diff --git a/build.gradle b/build.gradle index b74b980f..e59189c8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1696952014 +//version: 1697697256 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -798,7 +798,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} diff --git a/dependencies.gradle b/dependencies.gradle index 421589d4..e8668337 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,4 +8,5 @@ dependencies { compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:api') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') + compileOnly("curse.maven:extrabiomesxl-60041:2273301") } diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index 22dae080..99359fcc 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -12,6 +12,7 @@ public class Mods { public static Mod forestry; public static Mod ic2; public static Mod botania; + public static Mod extraBiomes; private static Item findItem(String modId, String name) { Item stack = GameRegistry.findItem(modId, name); @@ -41,6 +42,7 @@ public class Mods { Mods.forestry = new Mod("Forestry"); Mods.ic2 = new Mod("IC2"); Mods.botania = new Mod("Botania"); + Mods.extraBiomes = new Mod("ExtrabiomesXL"); } public static class Mod { diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index a7aeb8a1..8b751f12 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -8,13 +8,12 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.google.common.base.Optional; - import binnie.core.Mods; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; +import extrabiomes.api.Stuff; public class PlankType { @@ -267,13 +266,10 @@ public class PlankType { @Override public ItemStack getStack() { - try { - Class clss = Class.forName("extrabiomes.api.Stuff"); - Block block = (Block) ((Optional) clss.getField("planks").get(null)).get(); - return new ItemStack(block, 1, ordinal()); - } catch (Exception e) { + if (!Mods.extraBiomes.active()) { return null; } + return Stuff.planks.transform(block -> new ItemStack(block, 1, ordinal())).orNull(); } @Override diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 365d77d4..859c58e7 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -8,6 +8,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import binnie.core.Mods; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; @@ -17,6 +18,8 @@ import binnie.extratrees.block.decor.FenceType; public class WoodManager { + private static List allPlankTypes; + public static IPlankType getPlankType(int index) { IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index); if (wood instanceof IPlankType) { @@ -97,16 +100,18 @@ public class WoodManager { } public static List getAllPlankTypes() { + if (allPlankTypes != null) { + return allPlankTypes; + } + List list = new ArrayList<>(); Collections.addAll(list, PlankType.ExtraTreePlanks.values()); Collections.addAll(list, PlankType.ForestryPlanks.values()); - for (IPlankType type : PlankType.ExtraBiomesPlank.values()) { - if (type.getStack() != null) { - list.add(type); - } + if (Mods.extraBiomes.active()) { + Collections.addAll(list, PlankType.ExtraBiomesPlank.values()); } - Collections.addAll(list, PlankType.VanillaPlanks.values()); + allPlankTypes = list; return list; }