From ab295e9bc0e07789c9d078a7623f6d774d3bf509 Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 2 Dec 2019 23:28:50 +0200 Subject: [PATCH] CHOOOOO CHOOOOO!! --- gradle.properties | 14 +++++++------- ...nClass_4730.java => MixinSpriteIdentifier.java} | 12 ++++++------ ...ss_4722.java => MixinTexturedRenderLayers.java} | 10 +++++----- .../minelittlepony/client/render/MagicGlow.java | 4 ++-- src/main/resources/minelp.mixin.json | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) rename src/main/java/com/minelittlepony/client/mixin/{MixinClass_4730.java => MixinSpriteIdentifier.java} (73%) rename src/main/java/com/minelittlepony/client/mixin/{MixinClass_4722.java => MixinTexturedRenderLayers.java} (68%) diff --git a/gradle.properties b/gradle.properties index 502fb1da..5c3a417c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Fabric Properties - # check these on https://fabricmc.net/use - minecraft_version=1.15-pre1 - yarn_mappings=1.15-pre1+build.7:v2 - loader_version=0.7.1+build.173 + # check these on https://fabricmc.net/use + minecraft_version=1.15-pre3 + yarn_mappings=1.15-pre3+build.2:v2 + loader_version=0.7.2+build.174 # Mod Properties group=com.minelittlepony @@ -17,6 +17,6 @@ org.gradle.daemon=false # Dependencies fabric_version=0.3.0+ - kirin_version=1.15-pre1-1.5-1.15-pre1-SNAPSHOT - hd_skins_version=1.15-pre1-6-1.15-pre1-SNAPSHOT - mson_version=1.15-pre1-1.1.1-1.15-pre1-SNAPSHOT + kirin_version=1.15-pre3-1.5-1.15-pre3-SNAPSHOT + hd_skins_version=1.15-pre3-6-1.15-pre3-SNAPSHOT + mson_version=1.15-pre3-1.1.1-1.15-pre3-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinClass_4730.java b/src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java similarity index 73% rename from src/main/java/com/minelittlepony/client/mixin/MixinClass_4730.java rename to src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java index 1a76a535..9b2f6fec 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinClass_4730.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.mixin; -import net.minecraft.class_4730; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; @@ -15,10 +15,10 @@ import com.minelittlepony.client.render.LevitatingItemRenderer; import java.util.function.Function; -@Mixin(class_4730.class) -abstract class MixinClass_4730 { +@Mixin(SpriteIdentifier.class) +abstract class MixinSpriteIdentifier { - @Inject(method = "method_24145(" + @Inject(method = "getVertexConsumer(" + "Lnet/minecraft/client/render/VertexConsumerProvider;" + "Ljava/util/function/Function;" + ")" @@ -28,9 +28,9 @@ abstract class MixinClass_4730 { ) public void onGetBuffer(VertexConsumerProvider provider, Function layerFunction, CallbackInfoReturnable info) { if (LevitatingItemRenderer.usesTransparency()) { - class_4730 self = (class_4730)(Object)this; + SpriteIdentifier self = (SpriteIdentifier)(Object)this; - info.setReturnValue(self.method_24148().method_24108(provider.getBuffer(LevitatingItemRenderer.getRenderLayer(self.method_24144())))); + info.setReturnValue(self.getSprite().getTextureSpecificVertexConsumer(provider.getBuffer(LevitatingItemRenderer.getRenderLayer(self.getAtlasId())))); } } } diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinClass_4722.java b/src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java similarity index 68% rename from src/main/java/com/minelittlepony/client/mixin/MixinClass_4722.java rename to src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java index b0d2b18d..fd3478b0 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinClass_4722.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.mixin; -import net.minecraft.class_4722; import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.TexturedRenderLayers; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -10,17 +10,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.minelittlepony.client.render.LevitatingItemRenderer; -@Mixin(class_4722.class) -abstract class MixinClass_4722 { +@Mixin(TexturedRenderLayers.class) +abstract class MixinTexturedRenderLayers { - @Inject(method = "method_24074()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) + @Inject(method = "getEntityCutout()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) private static void onGetItemOpaque(CallbackInfoReturnable info) { if (LevitatingItemRenderer.usesTransparency()) { info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); } } - @Inject(method = "method_24075()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) + @Inject(method = "getEntityTranslucent()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) private static void onGetItemTranslucent(CallbackInfoReturnable info) { if (LevitatingItemRenderer.usesTransparency()) { info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); diff --git a/src/main/java/com/minelittlepony/client/render/MagicGlow.java b/src/main/java/com/minelittlepony/client/render/MagicGlow.java index b954e736..e4db83e9 100644 --- a/src/main/java/com/minelittlepony/client/render/MagicGlow.java +++ b/src/main/java/com/minelittlepony/client/render/MagicGlow.java @@ -24,7 +24,7 @@ public class MagicGlow extends RenderPhase { RenderSystem.defaultBlendFunc(); }); - private static final RenderLayer MAGIC = RenderLayer.method_24048("mlp_magic_glow", VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, 7, 256, RenderLayer.MultiPhaseData.builder() + private static final RenderLayer MAGIC = RenderLayer.of("mlp_magic_glow", VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, 7, 256, RenderLayer.PhaseData.builder() .texture(NO_TEXTURE) .writeMaskState(COLOR_MASK) .transparency(LIGHTNING_TRANSPARENCY) @@ -37,7 +37,7 @@ public class MagicGlow extends RenderPhase { } public static RenderLayer getTintedTexturedLayer(Identifier texture, float red, float green, float blue, float alpha) { - return RenderLayer.method_24049("mlp_tint_layer", VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, 7, 256, true, true, RenderLayer.MultiPhaseData.builder() + return RenderLayer.of("mlp_tint_layer", VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, 7, 256, true, true, RenderLayer.PhaseData.builder() .texture(new Color(texture, red, green, blue, alpha)) .writeMaskState(COLOR_MASK) .alpha(ONE_TENTH_ALPHA) diff --git a/src/main/resources/minelp.mixin.json b/src/main/resources/minelp.mixin.json index 007933be..6758df37 100644 --- a/src/main/resources/minelp.mixin.json +++ b/src/main/resources/minelp.mixin.json @@ -11,8 +11,8 @@ "MixinEntityRenderDispatcher", "MixinSkullBlockEntityRenderer", "MixinFirstPersonRenderer", - "MixinClass_4722", - "MixinClass_4730", + "MixinTexturedRenderLayers", + "MixinSpriteIdentifier", "MixinClientPlayerEntity", "MixinPlayerMoveC2SPacket_Both", "MixinPlayerMoveC2SPacket_LookOnly"