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

Continue migration

Browse source
This commit is contained in:
Aleksey 2021-04-12 16:34:13 +03:00
parent 47ed597358
commit 33dbfbe633
263 changed files with 1450 additions and 1486 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java
View file

@ -14,14 +14,14 @@ import net.minecraft.client.render.Camera;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.effect.StatusEffectInstance;
import net.minecraft.world.entity.effect.StatusEffects;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.fluid.FluidState;
import net.minecraft.util.Util;
import net.minecraft.util.Mth;
import net.minecraft.world.level.Level;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.Biome.Category;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.Biome.Category;
import ru.betterend.client.ClientOptions;
import ru.betterend.registry.EndBiomes;
import ru.betterend.util.BackgroundInfo;
@ -55,7 +55,7 @@ public class BackgroundRendererMixin {
Entity entity = camera.getFocusedEntity();
boolean skip = false;
if (entity instanceof LivingEntity) {
StatusEffectInstance effect = ((LivingEntity) entity).getStatusEffect(StatusEffects.NIGHT_VISION);
MobEffectInstance effect = ((LivingEntity) entity).getMobEffect(MobEffects.NIGHT_VISION);
skip = effect != null && effect.getDuration() > 0;
}
if (!skip) {
@ -96,7 +96,7 @@ public class BackgroundRendererMixin {
if (entity instanceof LivingEntity) {
LivingEntity le = (LivingEntity) entity;
StatusEffectInstance effect = le.getStatusEffect(StatusEffects.BLINDNESS);
MobEffectInstance effect = le.getMobEffect(MobEffects.BLINDNESS);
if (effect != null) {
int duration = effect.getDuration();
if (duration > 20) {

4
src/main/java/ru/betterend/mixin/client/BiomeColorsMixin.java
View file

@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.Minecraft;
import net.minecraft.client.color.world.BiomeColors;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
@ -29,7 +29,7 @@ public class BiomeColorsMixin {
@Inject(method = "getWaterColor", at = @At("RETURN"), cancellable = true)
private static void be_getWaterColor(BlockRenderView world, BlockPos pos, CallbackInfoReturnable<Integer> info) {
if (ClientOptions.useSulfurWaterColor()) {
BlockRenderView view = HAS_SODIUM ? MinecraftClient.getInstance().world : world;
BlockRenderView view = HAS_SODIUM ? Minecraft.getInstance().world : world;
MutableBlockPos mut = new MutableBlockPos();
mut.setY(pos.getY());
for (int i = 0; i < OFFSETS.length; i++) {

4
src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java
View file

@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.Minecraft;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.network.NetworkThreadUtils;
@ -18,7 +18,7 @@ import ru.betterend.client.gui.BlockSignEditScreen;
@Mixin(ClientPlayNetworkHandler.class)
public class ClientPlayNetworkHandlerMixin {
@Shadow
private MinecraftClient client;
private Minecraft client;
@Shadow
private ClientLevel world;

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

@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.Minecraft;
import net.minecraft.client.RunArgs;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.color.item.ItemColors;
@ -24,7 +24,7 @@ import net.minecraft.world.level.Level;
import ru.betterend.interfaces.IColorProvider;
import ru.betterend.util.MHelper;
@Mixin(MinecraftClient.class)
@Mixin(Minecraft.class)
public class MinecraftClientMixin {
@Shadow
public ClientPlayerEntity player;

4
src/main/java/ru/betterend/mixin/client/MusicTrackerMixin.java
View file

@ -9,7 +9,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.client.MinecraftClient;
import net.minecraft.client.Minecraft;
import net.minecraft.client.sound.AbstractSoundInstance;
import net.minecraft.client.sound.MusicTracker;
import net.minecraft.client.sound.SoundInstance;
@ -22,7 +22,7 @@ import ru.betterend.client.ClientOptions;
public class MusicTrackerMixin {
@Shadow
@Final
private MinecraftClient client;
private Minecraft client;
@Shadow
@Final

8
src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java
View file

@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.mojang.blaze3d.systems.RenderSystem;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BackgroundRenderer;
import net.minecraft.client.render.BufferBuilder;
@ -25,7 +25,7 @@ import net.minecraft.client.render.VertexFormats;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.texture.TextureManager;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f;
import com.mojang.math.Vector3f;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.math.Quaternion;
@ -63,7 +63,7 @@ public class WorldRendererMixin {
@Shadow
@Final
private MinecraftClient client;
private Minecraft client;
@Shadow
@Final
@ -76,7 +76,7 @@ public class WorldRendererMixin {
private int ticks;
@Inject(method = "<init>*", at = @At("TAIL"))
private void be_onInit(MinecraftClient client, BufferBuilderStorage bufferBuilders, CallbackInfo info) {
private void be_onInit(Minecraft client, BufferBuilderStorage bufferBuilders, CallbackInfo info) {
be_initStars();
Random random = new Random(131);
axis1 = new Vector3f(random.nextFloat(), random.nextFloat(), random.nextFloat());