MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure Mixins have unique prefix

Browse source
This commit is contained in:
Frank 2022-03-03 13:11:13 +01:00
parent 74a156389e
commit 31ea19552d
7 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/bclib/api/biomes/BiomeAPI.java
View file

@ -823,7 +823,7 @@ public class BiomeAPI {
ChunkGenerator generator = level.getChunkSource().getGenerator(); ChunkGenerator generator = level.getChunkSource().getGenerator();
if (generator instanceof NoiseBasedChunkGenerator) { if (generator instanceof NoiseBasedChunkGenerator) {
SurfaceProvider provider = SurfaceProvider.class.cast(generator); SurfaceProvider provider = SurfaceProvider.class.cast(generator);
return provider.getSurface(pos, biome, level); return provider.bclib_getSurface(pos, biome, level);
} }
return Blocks.AIR.defaultBlockState(); return Blocks.AIR.defaultBlockState();
} }

2
src/main/java/ru/bclib/interfaces/SurfaceProvider.java
View file

@ -6,5 +6,5 @@ import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
public interface SurfaceProvider { public interface SurfaceProvider {
public BlockState getSurface(BlockPos pos, Biome biome, ServerLevel level); public BlockState bclib_getSurface(BlockPos pos, Biome biome, ServerLevel level);
} }

2
src/main/java/ru/bclib/mixin/client/GameMixin.java
View file

@ -11,7 +11,7 @@ import ru.bclib.api.dataexchange.DataExchangeAPI;
public class GameMixin { public class GameMixin {
@Inject(method="onStartGameSession", at=@At("TAIL")) @Inject(method="onStartGameSession", at=@At("TAIL"))
public void bcliv_onStart(CallbackInfo ci){ public void bclib_onStart(CallbackInfo ci){
DataExchangeAPI.sendOnEnter(); DataExchangeAPI.sendOnEnter();
} }
} }

2
src/main/java/ru/bclib/mixin/client/WorldPresetMixin.java
View file

@ -13,7 +13,7 @@ import ru.bclib.api.biomes.BiomeAPI;
@Mixin(WorldPreset.class) @Mixin(WorldPreset.class)
public class WorldPresetMixin { public class WorldPresetMixin {
@Inject(method = "create", at = @At("HEAD")) @Inject(method = "create", at = @At("HEAD"))
private void create(RegistryAccess.RegistryHolder registryHolder, long l, boolean bl, boolean bl2, CallbackInfoReturnable<WorldGenSettings> info) { private void bclib_create(RegistryAccess.RegistryHolder registryHolder, long l, boolean bl, boolean bl2, CallbackInfoReturnable<WorldGenSettings> info) {
BiomeAPI.initRegistry(registryHolder.registryOrThrow(Registry.BIOME_REGISTRY)); BiomeAPI.initRegistry(registryHolder.registryOrThrow(Registry.BIOME_REGISTRY));
} }
} }

4
src/main/java/ru/bclib/mixin/common/BoneMealItemMixin.java
View file

@ -135,7 +135,7 @@ public class BoneMealItemMixin {
BlockState state = world.getBlockState(p); BlockState state = world.getBlockState(p);
Block terrain = BonemealAPI.getSpreadable(state.getBlock()); Block terrain = BonemealAPI.getSpreadable(state.getBlock());
if (center.is(terrain)) { if (center.is(terrain)) {
if (haveSameProperties(state, center)) { if (bclib_haveSameProperties(state, center)) {
for (Property property : center.getProperties()) { for (Property property : center.getProperties()) {
state = state.setValue(property, center.getValue(property)); state = state.setValue(property, center.getValue(property));
} }
@ -146,7 +146,7 @@ public class BoneMealItemMixin {
return null; 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<?>[] properties1 = state1.getProperties().toArray(new Property[0]);
Property<?>[] properties2 = state2.getProperties().toArray(new Property[0]); Property<?>[] properties2 = state2.getProperties().toArray(new Property[0]);
if (properties1.length != properties2.length) { if (properties1.length != properties2.length) {

2
src/main/java/ru/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java
View file

@ -50,7 +50,7 @@ public abstract class NoiseBasedChunkGeneratorMixin implements SurfaceProvider,
@Override @Override
@SuppressWarnings("deprecation") @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); ChunkAccess chunkAccess = level.getChunk(pos.getX() >> 4, pos.getZ() >> 4);
StructureFeatureManager structureFeatureManager = level.structureFeatureManager(); StructureFeatureManager structureFeatureManager = level.structureFeatureManager();
NoiseBasedChunkGenerator generator = NoiseBasedChunkGenerator.class.cast(this); NoiseBasedChunkGenerator generator = NoiseBasedChunkGenerator.class.cast(this);

8
src/main/java/ru/bclib/mixin/common/NoiseGeneratorSettingsMixin.java
View file

@ -55,7 +55,7 @@ public class NoiseGeneratorSettingsMixin implements SurfaceRuleProvider {
return; return;
} }
RuleSource org = getOriginalSurfaceRule(); RuleSource org = bclib_getOriginalSurfaceRule();
if (org instanceof SurfaceRules.SequenceRuleSource sequenceRule){ if (org instanceof SurfaceRules.SequenceRuleSource sequenceRule){
List<RuleSource> currentSequence = sequenceRule.sequence(); List<RuleSource> currentSequence = sequenceRule.sequence();
rules = rules.stream().filter(r -> currentSequence.indexOf(r)<0).collect(Collectors.toList()); rules = rules.stream().filter(r -> currentSequence.indexOf(r)<0).collect(Collectors.toList());
@ -64,17 +64,17 @@ public class NoiseGeneratorSettingsMixin implements SurfaceRuleProvider {
rules.add(org); 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){ if (bclib_originalSurfaceRule == null){
bclib_originalSurfaceRule = this.surfaceRule; bclib_originalSurfaceRule = this.surfaceRule;
} }
this.surfaceRule = surfaceRule; this.surfaceRule = surfaceRule;
} }
RuleSource getOriginalSurfaceRule() { RuleSource bclib_getOriginalSurfaceRule() {
if (bclib_originalSurfaceRule ==null) { if (bclib_originalSurfaceRule ==null) {
return surfaceRule; return surfaceRule;
} }