PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 11:36:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed batponies' vision giving strange results on higher brightness settings

Browse source
This commit is contained in:
Sollace 2022-03-27 00:36:47 +02:00
parent abe8142482
commit 26b0f3567e
5 changed files with 45 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/com/minelittlepony/unicopia/client/BatEyesApplicator.java Normal file
View file

@ -0,0 +1,35 @@
package com.minelittlepony.unicopia.client;
import com.minelittlepony.unicopia.EquinePredicates;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.entity.player.PlayerEntity;
public class BatEyesApplicator {
public static final BatEyesApplicator INSTANCE = new BatEyesApplicator();
private boolean batEyesApplied;
private final MinecraftClient client = MinecraftClient.getInstance();
public void enable() {
if (client.world != null) {
PlayerEntity player = client.player;
if (!player.hasStatusEffect(StatusEffects.NIGHT_VISION) && EquinePredicates.PLAYER_BAT.test(player)) {
player.addStatusEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 1, 1, false, false));
batEyesApplied = true;
}
}
}
public void disable() {
if (batEyesApplied) {
client.player.removeStatusEffect(StatusEffects.NIGHT_VISION);
batEyesApplied = false;
}
}
}

2
src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java
View file

@ -52,7 +52,7 @@ public class UnicopiaClient implements ClientModInitializer {
}
public static float getWorldBrightness(float initial) {
return initial > 0 ? 3 : 2;
return 0.6F;
}
@Override

10
src/main/java/com/minelittlepony/unicopia/mixin/client/MixinGameRenderer.java
View file

@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.minelittlepony.unicopia.EquinePredicates;
import com.minelittlepony.unicopia.client.BatEyesApplicator;
import com.minelittlepony.unicopia.client.UnicopiaClient;
import net.minecraft.client.render.Camera;
import net.minecraft.client.render.GameRenderer;
@ -27,8 +28,15 @@ abstract class MixinGameRenderer implements AutoCloseable, SynchronousResourceRe
@Inject(method = "renderWorld(FJLnet/minecraft/client/util/math/MatrixStack;)V",
at = @At("HEAD"))
private void onRenderWorld(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo info) {
private void beforeRenderWorld(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo info) {
UnicopiaClient.getCamera().ifPresent(c -> matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(c.calculateRoll())));
BatEyesApplicator.INSTANCE.enable();
}
@Inject(method = "renderWorld(FJLnet/minecraft/client/util/math/MatrixStack;)V",
at = @At("RETURN"))
private void afterRenderWorld(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo info) {
BatEyesApplicator.INSTANCE.disable();
}
@Inject(method = "getNightVisionStrength(Lnet/minecraft/entity/LivingEntity;F)F",

46
src/main/java/com/minelittlepony/unicopia/mixin/client/MixinLightmapTextureManager.java
View file

@ -1,46 +0,0 @@
package com.minelittlepony.unicopia.mixin.client;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import com.minelittlepony.unicopia.EquinePredicates;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.LightmapTextureManager;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.entity.player.PlayerEntity;
@Mixin(value = LightmapTextureManager.class, priority = 999)
abstract class MixinLightmapTextureManager implements AutoCloseable {
private @Shadow boolean dirty;
private @Shadow @Final MinecraftClient client;
private boolean batEyesApplied;
@ModifyVariable(method = "update(F)V", at = @At(value = "HEAD"), argsOnly = true)
private float beforeUpdate(float delta) {
if (dirty && client.world != null) {
PlayerEntity player = client.player;
if (!player.hasStatusEffect(StatusEffects.NIGHT_VISION) && EquinePredicates.PLAYER_BAT.test(player)) {
player.addStatusEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 1, 1, false, false));
batEyesApplied = true;
}
}
return delta;
}
@ModifyVariable(method = "update(F)V", at = @At(value = "RETURN"), argsOnly = true)
private float afterUpdate(float delta) {
if (batEyesApplied) {
client.player.removeStatusEffect(StatusEffects.NIGHT_VISION);
batEyesApplied = false;
}
return delta;
}
}

1
src/main/resources/unicopia.mixin.json
View file

@ -41,7 +41,6 @@
"client.MixinItem",
"client.MixinItemModels",
"client.MixinKeyboardInput",
"client.MixinLightmapTextureManager",
"client.MixinLivingEntityRenderer",
"client.MixinMouse",
"client.MixinPlayerEntityRenderer",