diff --git a/src/main/java/ru/bclib/api/biomes/BiomeAPI.java b/src/main/java/ru/bclib/api/biomes/BiomeAPI.java index 6529f8e6..686cf96c 100644 --- a/src/main/java/ru/bclib/api/biomes/BiomeAPI.java +++ b/src/main/java/ru/bclib/api/biomes/BiomeAPI.java @@ -823,7 +823,7 @@ public class BiomeAPI { ChunkGenerator generator = level.getChunkSource().getGenerator(); if (generator instanceof NoiseBasedChunkGenerator) { SurfaceProvider provider = SurfaceProvider.class.cast(generator); - return provider.getSurface(pos, biome, level); + return provider.bclib_getSurface(pos, biome, level); } return Blocks.AIR.defaultBlockState(); } diff --git a/src/main/java/ru/bclib/interfaces/SurfaceProvider.java b/src/main/java/ru/bclib/interfaces/SurfaceProvider.java index 23dbc3cd..143e6499 100644 --- a/src/main/java/ru/bclib/interfaces/SurfaceProvider.java +++ b/src/main/java/ru/bclib/interfaces/SurfaceProvider.java @@ -6,5 +6,5 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.state.BlockState; public interface SurfaceProvider { - public BlockState getSurface(BlockPos pos, Biome biome, ServerLevel level); + public BlockState bclib_getSurface(BlockPos pos, Biome biome, ServerLevel level); } diff --git a/src/main/java/ru/bclib/mixin/client/GameMixin.java b/src/main/java/ru/bclib/mixin/client/GameMixin.java index 941557c1..73c16bf0 100644 --- a/src/main/java/ru/bclib/mixin/client/GameMixin.java +++ b/src/main/java/ru/bclib/mixin/client/GameMixin.java @@ -11,7 +11,7 @@ import ru.bclib.api.dataexchange.DataExchangeAPI; public class GameMixin { @Inject(method="onStartGameSession", at=@At("TAIL")) - public void bcliv_onStart(CallbackInfo ci){ + public void bclib_onStart(CallbackInfo ci){ DataExchangeAPI.sendOnEnter(); } } diff --git a/src/main/java/ru/bclib/mixin/client/WorldPresetMixin.java b/src/main/java/ru/bclib/mixin/client/WorldPresetMixin.java index ada303f0..b634e8ad 100644 --- a/src/main/java/ru/bclib/mixin/client/WorldPresetMixin.java +++ b/src/main/java/ru/bclib/mixin/client/WorldPresetMixin.java @@ -13,7 +13,7 @@ import ru.bclib.api.biomes.BiomeAPI; @Mixin(WorldPreset.class) public class WorldPresetMixin { @Inject(method = "create", at = @At("HEAD")) - private void create(RegistryAccess.RegistryHolder registryHolder, long l, boolean bl, boolean bl2, CallbackInfoReturnable info) { + private void bclib_create(RegistryAccess.RegistryHolder registryHolder, long l, boolean bl, boolean bl2, CallbackInfoReturnable info) { BiomeAPI.initRegistry(registryHolder.registryOrThrow(Registry.BIOME_REGISTRY)); } } diff --git a/src/main/java/ru/bclib/mixin/common/BoneMealItemMixin.java b/src/main/java/ru/bclib/mixin/common/BoneMealItemMixin.java index 1ad99193..f3f51ad5 100644 --- a/src/main/java/ru/bclib/mixin/common/BoneMealItemMixin.java +++ b/src/main/java/ru/bclib/mixin/common/BoneMealItemMixin.java @@ -135,7 +135,7 @@ public class BoneMealItemMixin { BlockState state = world.getBlockState(p); Block terrain = BonemealAPI.getSpreadable(state.getBlock()); if (center.is(terrain)) { - if (haveSameProperties(state, center)) { + if (bclib_haveSameProperties(state, center)) { for (Property property : center.getProperties()) { state = state.setValue(property, center.getValue(property)); } @@ -146,7 +146,7 @@ public class BoneMealItemMixin { return null; } - private boolean haveSameProperties(BlockState state1, BlockState state2) { + private boolean bclib_haveSameProperties(BlockState state1, BlockState state2) { Property[] properties1 = state1.getProperties().toArray(new Property[0]); Property[] properties2 = state2.getProperties().toArray(new Property[0]); if (properties1.length != properties2.length) { diff --git a/src/main/java/ru/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java b/src/main/java/ru/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java index 96e4fc4c..04a78e74 100644 --- a/src/main/java/ru/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java +++ b/src/main/java/ru/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java @@ -50,7 +50,7 @@ public abstract class NoiseBasedChunkGeneratorMixin implements SurfaceProvider, @Override @SuppressWarnings("deprecation") - public BlockState getSurface(BlockPos pos, Biome biome, ServerLevel level) { + public BlockState bclib_getSurface(BlockPos pos, Biome biome, ServerLevel level) { ChunkAccess chunkAccess = level.getChunk(pos.getX() >> 4, pos.getZ() >> 4); StructureFeatureManager structureFeatureManager = level.structureFeatureManager(); NoiseBasedChunkGenerator generator = NoiseBasedChunkGenerator.class.cast(this); diff --git a/src/main/java/ru/bclib/mixin/common/NoiseGeneratorSettingsMixin.java b/src/main/java/ru/bclib/mixin/common/NoiseGeneratorSettingsMixin.java index d5f6deba..da9a6a4a 100644 --- a/src/main/java/ru/bclib/mixin/common/NoiseGeneratorSettingsMixin.java +++ b/src/main/java/ru/bclib/mixin/common/NoiseGeneratorSettingsMixin.java @@ -55,7 +55,7 @@ public class NoiseGeneratorSettingsMixin implements SurfaceRuleProvider { return; } - RuleSource org = getOriginalSurfaceRule(); + RuleSource org = bclib_getOriginalSurfaceRule(); if (org instanceof SurfaceRules.SequenceRuleSource sequenceRule){ List currentSequence = sequenceRule.sequence(); rules = rules.stream().filter(r -> currentSequence.indexOf(r)<0).collect(Collectors.toList()); @@ -64,17 +64,17 @@ public class NoiseGeneratorSettingsMixin implements SurfaceRuleProvider { rules.add(org); } - setSurfaceRule(SurfaceRules.sequence(rules.toArray(new RuleSource[rules.size()]))); + bclib_setSurfaceRule(SurfaceRules.sequence(rules.toArray(new RuleSource[rules.size()]))); } - void setSurfaceRule(SurfaceRules.RuleSource surfaceRule) { + void bclib_setSurfaceRule(SurfaceRules.RuleSource surfaceRule) { if (bclib_originalSurfaceRule == null){ bclib_originalSurfaceRule = this.surfaceRule; } this.surfaceRule = surfaceRule; } - RuleSource getOriginalSurfaceRule() { + RuleSource bclib_getOriginalSurfaceRule() { if (bclib_originalSurfaceRule ==null) { return surfaceRule; }