diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java index 73d51bcb..6e9407ab 100644 --- a/src/main/java/org/betterx/betterend/BetterEnd.java +++ b/src/main/java/org/betterx/betterend/BetterEnd.java @@ -7,6 +7,7 @@ import org.betterx.betterend.api.BetterEndPlugin; import org.betterx.betterend.commands.CommandRegistry; import org.betterx.betterend.config.Configs; import org.betterx.betterend.effects.EndPotions; +import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.recipe.builders.InfusionRecipe; import org.betterx.betterend.registry.*; import org.betterx.betterend.tab.CreativeTabs; @@ -58,7 +59,7 @@ public class BetterEnd implements ModInitializer { FabricLoader.getInstance() .getEntrypoints("betterend", BetterEndPlugin.class) .forEach(BetterEndPlugin::register); - //Integrations.init(); + Integrations.init(); Configs.saveConfigs(); CreativeTabs.ensureStaticallyLoaded(); diff --git a/src/main/java/org/betterx/betterend/integration/Integrations.java b/src/main/java/org/betterx/betterend/integration/Integrations.java index 8e02353d..26df3723 100644 --- a/src/main/java/org/betterx/betterend/integration/Integrations.java +++ b/src/main/java/org/betterx/betterend/integration/Integrations.java @@ -5,7 +5,6 @@ import org.betterx.bclib.integration.ModIntegration; import org.betterx.bclib.recipes.BCLRecipeBuilder; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.events.PlayerAdvancementsCallback; -import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.betterend.item.GuideBookItem; import org.betterx.betterend.registry.EndItems; @@ -16,7 +15,6 @@ import net.minecraft.world.item.Items; import net.fabricmc.loader.api.FabricLoader; public class Integrations { - public static final ModIntegration BYG = ModIntegrationAPI.register(new BYGIntegration()); public static final ModIntegration NOURISH = ModIntegrationAPI.register(new NourishIntegration()); public static final ModIntegration FLAMBOYANT_REFABRICATED = ModIntegrationAPI.register(new FlamboyantRefabricatedIntegration()); diff --git a/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java b/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java index 859da05b..2c82aaf2 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java +++ b/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java @@ -1,8 +1,8 @@ package org.betterx.betterend.integration.byg; +import org.betterx.bclib.api.v2.ModIntegrationAPI; import org.betterx.bclib.integration.ModIntegration; import org.betterx.betterend.integration.EndBiomeIntegration; -import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.byg.biomes.BYGBiomes; import org.betterx.betterend.integration.byg.features.BYGFeatures; import org.betterx.worlds.together.tag.v3.CommonBlockTags; @@ -11,13 +11,15 @@ import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.world.level.block.Block; public class BYGIntegration extends ModIntegration implements EndBiomeIntegration { + public static final ModIntegration BYG = ModIntegrationAPI.register(new BYGIntegration()); + public BYGIntegration() { super("byg"); } @Override public void init() { - Block block = Integrations.BYG.getBlock("ivis_phylium"); + Block block = BYG.getBlock("ivis_phylium"); if (block != null) { TagManager.BLOCKS.add(block, CommonBlockTags.END_STONES, CommonBlockTags.GEN_END_STONES); } diff --git a/src/main/java/org/betterx/betterend/integration/byg/biomes/BYGBiomes.java b/src/main/java/org/betterx/betterend/integration/byg/biomes/BYGBiomes.java index 8c661bdd..c540228f 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/biomes/BYGBiomes.java +++ b/src/main/java/org/betterx/betterend/integration/byg/biomes/BYGBiomes.java @@ -1,7 +1,7 @@ package org.betterx.betterend.integration.byg.biomes; import org.betterx.betterend.BetterEnd; -import org.betterx.betterend.integration.Integrations; +import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.world.biome.EndBiome; @@ -19,8 +19,8 @@ public class BYGBiomes { } public static void addBiomes() { - EndBiomes.addSubBiomeIntegration(OLD_BULBIS_GARDENS, Integrations.BYG.getID("bulbis_gardens")); - EndBiomes.addSubBiomeIntegration(NIGHTSHADE_REDWOODS, Integrations.BYG.getID("nightshade_forest")); + EndBiomes.addSubBiomeIntegration(OLD_BULBIS_GARDENS, BYGIntegration.BYG.getID("bulbis_gardens")); + EndBiomes.addSubBiomeIntegration(NIGHTSHADE_REDWOODS, BYGIntegration.BYG.getID("nightshade_forest")); //EndBiomes.addSubBiomeIntegration(ETHERIAL_GROVE, Integrations.BYG.getID("ethereal_islands")); } } diff --git a/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java b/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java index 8b225527..d4b1464a 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java +++ b/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java @@ -4,7 +4,7 @@ import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.betterend.integration.Integrations; +import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.betterend.integration.byg.features.BYGFeatures; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.world.biome.EndBiome; @@ -31,7 +31,7 @@ public class NightshadeRedwoods extends EndBiome.Config { @Override protected void addCustomBuildData(BCLBiomeBuilder builder) { - Holder biome = Integrations.BYG.getBiome("nightshade_forest"); + Holder biome = BYGIntegration.BYG.getBiome("nightshade_forest"); BiomeSpecialEffects effects = biome.value().getSpecialEffects(); builder.fogColor(140, 108, 47) @@ -90,7 +90,7 @@ public class NightshadeRedwoods extends EndBiome.Config { return new EndBiome.DefaultSurfaceMaterialProvider() { @Override public BlockState getTopMaterial() { - return Integrations.BYG.getBlock("nightshade_phylium").defaultBlockState(); + return BYGIntegration.BYG.getBlock("nightshade_phylium").defaultBlockState(); } @Override diff --git a/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java b/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java index 585e6940..738153cb 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java +++ b/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java @@ -5,7 +5,7 @@ import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; import org.betterx.bclib.api.v2.levelgen.surface.rules.RoughNoiseCondition; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.betterend.integration.Integrations; +import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.betterend.integration.byg.features.BYGFeatures; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.world.biome.EndBiome; @@ -36,7 +36,7 @@ public class OldBulbisGardens extends EndBiome.Config { @Override protected void addCustomBuildData(BCLBiomeBuilder builder) { - Holder biome = Integrations.BYG.getBiome("bulbis_gardens"); + Holder biome = BYGIntegration.BYG.getBiome("bulbis_gardens"); BiomeSpecialEffects effects = biome.value().getSpecialEffects(); builder.fogColor(215, 132, 207) @@ -119,12 +119,12 @@ public class OldBulbisGardens extends EndBiome.Config { return new EndBiome.DefaultSurfaceMaterialProvider() { @Override public BlockState getTopMaterial() { - return Integrations.BYG.getBlock("ivis_phylium").defaultBlockState(); + return BYGIntegration.BYG.getBlock("ivis_phylium").defaultBlockState(); } @Override public BlockState getAltTopMaterial() { - return Integrations.BYG.getBlock("bulbis_phycelium").defaultBlockState(); + return BYGIntegration.BYG.getBlock("bulbis_phycelium").defaultBlockState(); } @Override diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java b/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java index db99f9da..bd019b9e 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java @@ -3,8 +3,8 @@ package org.betterx.betterend.integration.byg.features; import org.betterx.bclib.api.v3.levelgen.features.BCLFeature; import org.betterx.bclib.api.v3.levelgen.features.BCLFeatureBuilder; import org.betterx.betterend.BetterEnd; -import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.byg.BYGBlocks; +import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.world.features.*; @@ -22,7 +22,7 @@ public class BYGFeatures { public static final BCLFeature IVIS_SPROUT = registerVegetation( "ivis_sprout", EndFeatures.SINGLE_PLANT_FEATURE, - new SinglePlantFeatureConfig(Integrations.BYG.getBlock("ivis_sprout"), 6, 2), + new SinglePlantFeatureConfig(BYGIntegration.BYG.getBlock("ivis_sprout"), 6, 2), 6 ); public static final BCLFeature IVIS_VINE = registerVegetation( diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java b/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java index 524e4d26..8a6cae4e 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java @@ -4,7 +4,7 @@ import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.betterend.integration.Integrations; +import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; @@ -28,8 +28,8 @@ public class BigEtherTreeFeature extends DefaultFeature { final WorldGenLevel world = featureConfig.level(); if (!world.getBlockState(pos.below()).is(CommonBlockTags.END_STONES)) return false; - BlockState log = Integrations.BYG.getDefaultState("ether_log"); - BlockState wood = Integrations.BYG.getDefaultState("ether_wood"); + BlockState log = BYGIntegration.BYG.getDefaultState("ether_log"); + BlockState wood = BYGIntegration.BYG.getDefaultState("ether_wood"); Function splinePlacer = (bpos) -> { return log; }; diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java b/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java index 5b0e8e50..6c1f6fd0 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java @@ -11,7 +11,7 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.betterend.integration.Integrations; +import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; @@ -42,10 +42,10 @@ public class NightshadeRedwoodTreeFeature extends DefaultFeature { final WorldGenLevel world = featureConfig.level(); if (!world.getBlockState(pos.below()).is(CommonBlockTags.END_STONES)) return false; - BlockState log = Integrations.BYG.getDefaultState("nightshade_log"); - BlockState wood = Integrations.BYG.getDefaultState("nightshade_wood"); - BlockState leaves = Integrations.BYG.getDefaultState("nightshade_leaves"); - BlockState leaves_flower = Integrations.BYG.getDefaultState("flowering_nightshade_leaves"); + BlockState log = BYGIntegration.BYG.getDefaultState("nightshade_log"); + BlockState wood = BYGIntegration.BYG.getDefaultState("nightshade_wood"); + BlockState leaves = BYGIntegration.BYG.getDefaultState("nightshade_leaves"); + BlockState leaves_flower = BYGIntegration.BYG.getDefaultState("flowering_nightshade_leaves"); Function splinePlacer = (bpos) -> log; Function replace = (state) -> state.is(CommonBlockTags.END_STONES) || state.getMaterial() diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java b/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java index 936bdc94..448161f7 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java @@ -9,7 +9,7 @@ import org.betterx.bclib.sdf.operator.SDFUnion; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.betterend.integration.Integrations; +import org.betterx.betterend.integration.byg.BYGIntegration; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.worlds.together.tag.v3.CommonBlockTags; @@ -44,12 +44,12 @@ public class OldBulbisTreeFeature extends DefaultFeature { if (!world.getBlockState(pos.below()).is(CommonBlockTags.END_STONES)) return false; if (!world.getBlockState(pos.below(4)).is(CommonBlockTags.GEN_END_STONES)) return false; - BlockState stem = Integrations.BYG.getDefaultState("bulbis_stem"); - BlockState wood = Integrations.BYG.getDefaultState("bulbis_wood"); - BlockState cap = Integrations.BYG.getDefaultState(random.nextBoolean() + BlockState stem = BYGIntegration.BYG.getDefaultState("bulbis_stem"); + BlockState wood = BYGIntegration.BYG.getDefaultState("bulbis_wood"); + BlockState cap = BYGIntegration.BYG.getDefaultState(random.nextBoolean() ? "bulbis_shell" : "purple_bulbis_shell"); - BlockState glow = Integrations.BYG.getDefaultState("purple_shroomlight"); + BlockState glow = BYGIntegration.BYG.getDefaultState("purple_shroomlight"); Function replacement = (state) -> { if (state.equals(stem) || state.equals(wood) || state.is(CommonBlockTags.END_STONES) || state.getMaterial()