PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 08:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

CHOOOOO CHOOOOO!!

Browse source
This commit is contained in:
Sollace 2019-12-02 23:28:50 +02:00
parent b109b251aa
commit ab295e9bc0
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gradle.properties
View file

@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.15-pre1 minecraft_version=1.15-pre3
yarn_mappings=1.15-pre1+build.7:v2 yarn_mappings=1.15-pre3+build.2:v2
loader_version=0.7.1+build.173 loader_version=0.7.2+build.174
# Mod Properties # Mod Properties
group=com.minelittlepony group=com.minelittlepony
@ -17,6 +17,6 @@ org.gradle.daemon=false
# Dependencies # Dependencies
fabric_version=0.3.0+ fabric_version=0.3.0+
kirin_version=1.15-pre1-1.5-1.15-pre1-SNAPSHOT kirin_version=1.15-pre3-1.5-1.15-pre3-SNAPSHOT
hd_skins_version=1.15-pre1-6-1.15-pre1-SNAPSHOT hd_skins_version=1.15-pre3-6-1.15-pre3-SNAPSHOT
mson_version=1.15-pre1-1.1.1-1.15-pre1-SNAPSHOT mson_version=1.15-pre3-1.1.1-1.15-pre3-SNAPSHOT

12
src/main/java/com/minelittlepony/client/mixin/MixinClass_4730.java → src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java
View file

@ -1,9 +1,9 @@
package com.minelittlepony.client.mixin; package com.minelittlepony.client.mixin;
import net.minecraft.class_4730;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.util.SpriteIdentifier;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -15,10 +15,10 @@ import com.minelittlepony.client.render.LevitatingItemRenderer;
import java.util.function.Function; import java.util.function.Function;
@Mixin(class_4730.class) @Mixin(SpriteIdentifier.class)
abstract class MixinClass_4730 { abstract class MixinSpriteIdentifier {
@Inject(method = "method_24145(" @Inject(method = "getVertexConsumer("
+ "Lnet/minecraft/client/render/VertexConsumerProvider;" + "Lnet/minecraft/client/render/VertexConsumerProvider;"
+ "Ljava/util/function/Function;" + "Ljava/util/function/Function;"
+ ")" + ")"
@ -28,9 +28,9 @@ abstract class MixinClass_4730 {
) )
public void onGetBuffer(VertexConsumerProvider provider, Function<Identifier, RenderLayer> layerFunction, CallbackInfoReturnable<VertexConsumer> info) { public void onGetBuffer(VertexConsumerProvider provider, Function<Identifier, RenderLayer> layerFunction, CallbackInfoReturnable<VertexConsumer> info) {
if (LevitatingItemRenderer.usesTransparency()) { 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()))));
} }
} }
} }

10
src/main/java/com/minelittlepony/client/mixin/MixinClass_4722.java → src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.mixin; package com.minelittlepony.client.mixin;
import net.minecraft.class_4722;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.TexturedRenderLayers;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; 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; import com.minelittlepony.client.render.LevitatingItemRenderer;
@Mixin(class_4722.class) @Mixin(TexturedRenderLayers.class)
abstract class MixinClass_4722 { 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<RenderLayer> info) { private static void onGetItemOpaque(CallbackInfoReturnable<RenderLayer> info) {
if (LevitatingItemRenderer.usesTransparency()) { if (LevitatingItemRenderer.usesTransparency()) {
info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); 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<RenderLayer> info) { private static void onGetItemTranslucent(CallbackInfoReturnable<RenderLayer> info) {
if (LevitatingItemRenderer.usesTransparency()) { if (LevitatingItemRenderer.usesTransparency()) {
info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); info.setReturnValue(LevitatingItemRenderer.getRenderLayer());

4
src/main/java/com/minelittlepony/client/render/MagicGlow.java
View file

@ -24,7 +24,7 @@ public class MagicGlow extends RenderPhase {
RenderSystem.defaultBlendFunc(); 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) .texture(NO_TEXTURE)
.writeMaskState(COLOR_MASK) .writeMaskState(COLOR_MASK)
.transparency(LIGHTNING_TRANSPARENCY) .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) { 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)) .texture(new Color(texture, red, green, blue, alpha))
.writeMaskState(COLOR_MASK) .writeMaskState(COLOR_MASK)
.alpha(ONE_TENTH_ALPHA) .alpha(ONE_TENTH_ALPHA)

4
src/main/resources/minelp.mixin.json
View file

@ -11,8 +11,8 @@
"MixinEntityRenderDispatcher", "MixinEntityRenderDispatcher",
"MixinSkullBlockEntityRenderer", "MixinSkullBlockEntityRenderer",
"MixinFirstPersonRenderer", "MixinFirstPersonRenderer",
"MixinClass_4722", "MixinTexturedRenderLayers",
"MixinClass_4730", "MixinSpriteIdentifier",
"MixinClientPlayerEntity", "MixinClientPlayerEntity",
"MixinPlayerMoveC2SPacket_Both", "MixinPlayerMoveC2SPacket_Both",
"MixinPlayerMoveC2SPacket_LookOnly" "MixinPlayerMoveC2SPacket_LookOnly"