From c37557bb9ef6a94930dd6a36ccf25aaf9cd77b3f Mon Sep 17 00:00:00 2001 From: metafive <40429600+m3t4f1v3@users.noreply.github.com> Date: Thu, 12 Mar 2026 17:19:40 +1100 Subject: [PATCH] fix for new ru --- build.gradle | 2 +- .../java/dtteam/dtru/init/DTRUPlusRegistries.java | 12 ++++++------ src/main/java/dtteam/dtru/init/DTRURegistries.java | 10 +++++----- src/main/java/dtteam/dtru/tree/EucalyptusFamily.java | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 9761e24..d2341a7 100644 --- a/build.gradle +++ b/build.gradle @@ -113,7 +113,7 @@ dependencies { implementation "com.dtteam.dynamictreesplus:DynamicTreesPlus:$dynamic_trees_plus_version" // implementation "curse.maven:dynamictrees-252818:7206627" // implementation "curse.maven:dynamictreesplus-478155:7205442" - implementation "curse.maven:regions-unexplored-659110:6273893" + implementation "curse.maven:regions-unexplored-659110:7737325" implementation "curse.maven:terrablender-neoforge-940057:6054947" implementation "curse.maven:jade-324717:6853386" diff --git a/src/main/java/dtteam/dtru/init/DTRUPlusRegistries.java b/src/main/java/dtteam/dtru/init/DTRUPlusRegistries.java index 9c17675..20b95bc 100644 --- a/src/main/java/dtteam/dtru/init/DTRUPlusRegistries.java +++ b/src/main/java/dtteam/dtru/init/DTRUPlusRegistries.java @@ -24,7 +24,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.data.event.GatherDataEvent; -import net.regions_unexplored.block.RuBlocks; +import net.regions_unexplored.registry.RUBlocks; public class DTRUPlusRegistries { @@ -54,11 +54,11 @@ public static void registerSpeciesTypes(final TypeRegistryEvent event) } public static void setup(){ - setupBioshroomConnectable(RuBlocks.BLUE_BIOSHROOM_BLOCK.get()); - setupBioshroomConnectable(RuBlocks.GLOWING_BLUE_BIOSHROOM_BLOCK.get()); - setupBioshroomConnectable(RuBlocks.GLOWING_GREEN_BIOSHROOM_BLOCK.get()); - setupBioshroomConnectable(RuBlocks.GLOWING_PINK_BIOSHROOM_BLOCK.get()); - setupBioshroomConnectable(RuBlocks.GLOWING_YELLOW_BIOSHROOM_BLOCK.get()); + setupBioshroomConnectable(RUBlocks.BLUE_BIOSHROOM_BLOCK.get()); + setupBioshroomConnectable(RUBlocks.GLOWING_BLUE_BIOSHROOM_BLOCK.get()); + setupBioshroomConnectable(RUBlocks.GLOWING_GREEN_BIOSHROOM_BLOCK.get()); + setupBioshroomConnectable(RUBlocks.GLOWING_PINK_BIOSHROOM_BLOCK.get()); + setupBioshroomConnectable(RUBlocks.GLOWING_YELLOW_BIOSHROOM_BLOCK.get()); BranchConnectables.makeBlockConnectable(Blocks.SHROOMLIGHT, (state, level, pos, side) -> { if (side.getAxis() == Direction.Axis.Y) return 0; diff --git a/src/main/java/dtteam/dtru/init/DTRURegistries.java b/src/main/java/dtteam/dtru/init/DTRURegistries.java index 0bcf7bf..a907730 100644 --- a/src/main/java/dtteam/dtru/init/DTRURegistries.java +++ b/src/main/java/dtteam/dtru/init/DTRURegistries.java @@ -29,12 +29,12 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; -import net.regions_unexplored.world.features.treedecorators.BlackwoodBioshroom; import net.regions_unexplored.world.level.feature.configuration.GiantBioshroomConfiguration; -import net.regions_unexplored.world.level.feature.configuration.RuTreeConfiguration; +import net.regions_unexplored.world.level.feature.configuration.RUTreeConfiguration; import net.regions_unexplored.world.level.feature.tree.*; import net.regions_unexplored.world.level.feature.tree.nether.BrimWillowFeature; import net.regions_unexplored.world.level.feature.tree.nether.TallBrimWillowFeature; +import net.regions_unexplored.worldgen.treedecorator.BlackwoodBioshroomDecorator; @EventBusSubscriber(modid = DynamicTreesRU.MOD_ID) public class DTRURegistries { @@ -93,7 +93,7 @@ public static void registerFamilyTypes(final TypeRegistryEvent event) { event.registerType(DynamicTreesRU.location("brimwood"), BrimwoodFamily.TYPE); } - public static final FeatureCanceller RU_TREE_CANCELLER = new TreeFeatureCanceller<>(DynamicTreesRU.location("tree"), RuTreeConfiguration.class); + public static final FeatureCanceller RU_TREE_CANCELLER = new TreeFeatureCanceller<>(DynamicTreesRU.location("tree"), RUTreeConfiguration.class); public static final FeatureCanceller RU_TREE2_CANCELLER = new TreeFeatureCanceller<>(DynamicTreesRU.location("tree_2"), NoneFeatureConfiguration.class){ @Override public boolean shouldCancel(ConfiguredFeature configuredFeature, BiomePropertySelectors.NormalFeatureCancellation featureCancellations) { @@ -118,14 +118,14 @@ public boolean shouldCancel(ConfiguredFeature configuredFeature, BiomeProp }; public static final FeatureCanceller TREE_NO_SHROOMS_CANCELLER = new TreeFeatureCanceller<>(DynamicTreesRU.location("tree_no_shrooms"), NoneFeatureConfiguration.class){ private boolean isConfigClass (FeatureConfiguration config){ - return config instanceof TreeConfiguration || config instanceof RuTreeConfiguration; + return config instanceof TreeConfiguration || config instanceof RUTreeConfiguration; } @Override public boolean shouldCancel(ConfiguredFeature configuredFeature, BiomePropertySelectors.NormalFeatureCancellation featureCancellations) { final FeatureConfiguration featureConfig = configuredFeature.config(); if (isConfigClass(featureConfig)) { - if (featureConfig instanceof TreeConfiguration treeConfiguration && !treeConfiguration.decorators.isEmpty() && treeConfiguration.decorators.getFirst() instanceof BlackwoodBioshroom){ + if (featureConfig instanceof TreeConfiguration treeConfiguration && !treeConfiguration.decorators.isEmpty() && treeConfiguration.decorators.getFirst() instanceof BlackwoodBioshroomDecorator){ return false; } String nameSpace = ""; diff --git a/src/main/java/dtteam/dtru/tree/EucalyptusFamily.java b/src/main/java/dtteam/dtru/tree/EucalyptusFamily.java index dc3a726..43c7a2b 100644 --- a/src/main/java/dtteam/dtru/tree/EucalyptusFamily.java +++ b/src/main/java/dtteam/dtru/tree/EucalyptusFamily.java @@ -8,7 +8,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import net.regions_unexplored.config.RuCommonConfig; +import net.regions_unexplored.config.RuClientConfig; import java.awt.*; @@ -22,9 +22,9 @@ public EucalyptusFamily(ResourceLocation name) { @OnlyIn(Dist.CLIENT) public int branchColorMultiplier(BlockState state, BlockAndTintGetter level, BlockPos pos) { Color rainbow = Color.getHSBColor( - ((float)pos.getX() + (float)pos.getY() + (float)pos.getZ()) / RuCommonConfig.EUCALYPTUS_TRANSITION_SIZE.get().floatValue(), - RuCommonConfig.EUCALYPTUS_SATURATION.get().floatValue(), - RuCommonConfig.EUCALYPTUS_BRIGHTNESS.get().floatValue()); + ((float)pos.getX() + (float)pos.getY() + (float)pos.getZ()) / RuClientConfig.EUCALYPTUS_TRANSITION_SIZE.get().floatValue(), + RuClientConfig.EUCALYPTUS_SATURATION.get().floatValue(), + RuClientConfig.EUCALYPTUS_BRIGHTNESS.get().floatValue()); return rainbow.getRGB(); } }