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

Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd.git

Browse source
This commit is contained in:
paulevsGitch 2020-10-16 23:30:26 +03:00
commit 9e789c9fc3
11 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java
View file

@ -21,7 +21,7 @@ import net.minecraft.client.world.ClientWorld;
import net.minecraft.sound.MusicSound;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.World;
import ru.betterend.util.IColorProvider;
import ru.betterend.interfaces.IColorProvider;
import ru.betterend.util.MHelper;
@Mixin(MinecraftClient.class)

8
src/main/java/ru/betterend/mixin/common/BiomeMixin.java
View file

@ -6,9 +6,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.GenerationSettings;
@ -16,7 +14,6 @@ import net.minecraft.world.gen.ChunkRandom;
import net.minecraft.world.gen.StructureAccessor;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import ru.betterend.BetterEnd;
import ru.betterend.registry.FeatureRegistry;
@Mixin(Biome.class)
@ -31,9 +28,8 @@ public abstract class BiomeMixin {
@Inject(method = "generateFeatureStep", at = @At("HEAD"))
public void generateFeatureStep(StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, ChunkRegion region, long populationSeed, ChunkRandom random, BlockPos pos, CallbackInfo cinfo) {
if (!injected) {
Identifier biomeId = region.toServerWorld().getRegistryManager().get(Registry.BIOME_KEY).getId(Biome.class.cast(this));
if (biomeId != null && !biomeId.getNamespace().equals(BetterEnd.MOD_ID) && category.equals(Biome.Category.THEEND)) {
FeatureRegistry.registerGlobals(this.generationSettings.getFeatures());
if (category.equals(Biome.Category.THEEND)) {
FeatureRegistry.registerGlobals(generationSettings.getFeatures());
}
this.injected = true;
}

2
src/main/java/ru/betterend/mixin/common/SlimeEntityMixin.java
View file

@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.entity.mob.SlimeEntity;
import ru.betterend.util.ISlime;
import ru.betterend.interfaces.ISlime;
@Mixin(SlimeEntity.class)
public class SlimeEntityMixin implements ISlime {