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

1.15 -> 1.15.1

Browse source
This commit is contained in:
Sollace 2020-01-08 20:17:05 +01:00
parent dc15af62a6
commit 4d1d596b88
7 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gradle.properties
View file

@ -3,9 +3,9 @@ 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 minecraft_version=1.15.1
yarn_mappings=1.15+build.1:v2 yarn_mappings=1.15.1+build.26:v2
loader_version=0.7.2+build.174 loader_version=0.7.3+build.176
# Mod Properties # Mod Properties
group=com.minelittlepony group=com.minelittlepony
@ -17,6 +17,6 @@ org.gradle.daemon=false
# Dependencies # Dependencies
modmenu_version=1.8.+ modmenu_version=1.8.+
kirin_version=1.5-1.15 kirin_version=1.5.1-1.15.1-SNAPSHOT
hd_skins_version=6.0.1-1.15 hd_skins_version=6.0.2-1.15.1-SNAPSHOT
mson_version=1.1.6-1.15 mson_version=1.1.8-1.15.1-SNAPSHOT

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

@ -10,7 +10,7 @@ import javax.annotation.Nullable;
import net.minecraft.client.render.item.HeldItemRenderer; import net.minecraft.client.render.item.HeldItemRenderer;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.model.json.ModelTransformation.Type; import net.minecraft.client.render.model.json.ModelTransformation.Mode;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -22,7 +22,7 @@ abstract class MixinFirstPersonRenderer {
private static final String LivingEntity = "Lnet/minecraft/entity/LivingEntity;"; private static final String LivingEntity = "Lnet/minecraft/entity/LivingEntity;";
private static final String MatrixStack = "Lnet/minecraft/client/util/math/MatrixStack;"; private static final String MatrixStack = "Lnet/minecraft/client/util/math/MatrixStack;";
private static final String ItemStack = "Lnet/minecraft/item/ItemStack;"; private static final String ItemStack = "Lnet/minecraft/item/ItemStack;";
private static final String Type = "Lnet/minecraft/client/render/model/json/ModelTransformation$Type;"; private static final String Mode = "Lnet/minecraft/client/render/model/json/ModelTransformation$Mode;";
private static final String VertexConsumerProvider = "Lnet/minecraft/client/render/VertexConsumerProvider;"; private static final String VertexConsumerProvider = "Lnet/minecraft/client/render/VertexConsumerProvider;";
private static final String World = "Lnet/minecraft/world/World;"; private static final String World = "Lnet/minecraft/world/World;";
private static final String ItemRenderer = "Lnet/minecraft/client/render/item/ItemRenderer;"; private static final String ItemRenderer = "Lnet/minecraft/client/render/item/ItemRenderer;";
@ -30,13 +30,13 @@ abstract class MixinFirstPersonRenderer {
private static final String Boolean = "Z"; private static final String Boolean = "Z";
private static final String Int = "I"; private static final String Int = "I";
@Redirect(method = "renderItem(" + LivingEntity + ItemStack + Type + Boolean + MatrixStack + VertexConsumerProvider + Int + ")V", @Redirect(method = "renderItem(" + LivingEntity + ItemStack + Mode + Boolean + MatrixStack + VertexConsumerProvider + Int + ")V",
at = @At(value = "INVOKE", at = @At(value = "INVOKE",
target = ItemRenderer + "renderItem(" + LivingEntity + ItemStack + Type + Boolean + MatrixStack + VertexConsumerProvider + World + Int + Int + ")V")) target = ItemRenderer + "renderItem(" + LivingEntity + ItemStack + Mode + Boolean + MatrixStack + VertexConsumerProvider + World + Int + Int + ")V"))
private void redirectRenderItem(ItemRenderer target, private void redirectRenderItem(ItemRenderer target,
@Nullable LivingEntity entity, @Nullable LivingEntity entity,
ItemStack item, ItemStack item,
Type transform, Mode transform,
boolean left, boolean left,
MatrixStack stack, MatrixStack stack,
VertexConsumerProvider renderContext, VertexConsumerProvider renderContext,

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

@ -46,7 +46,7 @@ public class LevitatingItemRenderer {
/** /**
* Renders a magical overlay over an item in third person. * Renders a magical overlay over an item in third person.
*/ */
public void renderItemGlow(LivingEntity entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, int glowColor, MatrixStack stack, VertexConsumerProvider renderContext) { public void renderItemGlow(LivingEntity entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, int glowColor, MatrixStack stack, VertexConsumerProvider renderContext) {
setColor(glowColor); setColor(glowColor);
stack.push(); stack.push();
@ -76,7 +76,7 @@ public class LevitatingItemRenderer {
/** /**
* Renders an item in first person optionally with a magical overlay. * Renders an item in first person optionally with a magical overlay.
*/ */
public void renderItemInFirstPerson(ItemRenderer itemRenderer, @Nullable LivingEntity entity, ItemStack stack, ModelTransformation.Type transform, boolean left, MatrixStack matrix, VertexConsumerProvider renderContext, @Nullable World world, int lightUv) { public void renderItemInFirstPerson(ItemRenderer itemRenderer, @Nullable LivingEntity entity, ItemStack stack, ModelTransformation.Mode transform, boolean left, MatrixStack matrix, VertexConsumerProvider renderContext, @Nullable World world, int lightUv) {
if (entity instanceof PlayerEntity) { if (entity instanceof PlayerEntity) {

2
src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java
View file

@ -25,7 +25,7 @@ public class WitchRenderer extends PonyRenderer<WitchEntity, WitchPonyModel> {
protected HeldItemFeature<WitchEntity, WitchPonyModel> createItemHoldingLayer() { protected HeldItemFeature<WitchEntity, WitchPonyModel> createItemHoldingLayer() {
return new HeldItemFeature<WitchEntity, WitchPonyModel>(this) { return new HeldItemFeature<WitchEntity, WitchPonyModel>(this) {
@Override @Override
protected void preItemRender(WitchEntity entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, MatrixStack stack) { protected void preItemRender(WitchEntity entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, MatrixStack stack) {
stack.translate(0, -0.3F, -0.8F); stack.translate(0, -0.3F, -0.8F);
stack.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(10)); stack.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(10));
} }

4
src/main/java/com/minelittlepony/client/render/entity/feature/GlowingItemFeature.java
View file

@ -25,7 +25,7 @@ public class GlowingItemFeature<T extends LivingEntity, M extends EntityModel<T>
} }
@Override @Override
protected void preItemRender(T entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, MatrixStack stack) { protected void preItemRender(T entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, MatrixStack stack) {
if (isUnicorn()) { if (isUnicorn()) {
stack.translate(hand == Arm.LEFT ? -0.6F : 0, 0.5F, -0.3F); stack.translate(hand == Arm.LEFT ? -0.6F : 0, 0.5F, -0.3F);
} else { } else {
@ -34,7 +34,7 @@ public class GlowingItemFeature<T extends LivingEntity, M extends EntityModel<T>
} }
@Override @Override
protected void postItemRender(T entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, MatrixStack stack, VertexConsumerProvider renderContext) { protected void postItemRender(T entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, MatrixStack stack, VertexConsumerProvider renderContext) {
if (isUnicorn()) { if (isUnicorn()) {
PonyRenderDispatcher.getInstance().getMagicRenderer().renderItemGlow(entity, drop, transform, hand, ((IUnicorn<?>)getContextModel()).getMagicColor(), stack, renderContext); PonyRenderDispatcher.getInstance().getMagicRenderer().renderItemGlow(entity, drop, transform, hand, ((IUnicorn<?>)getContextModel()).getMagicColor(), stack, renderContext);
} }

10
src/main/java/com/minelittlepony/client/render/entity/feature/HeldItemFeature.java
View file

@ -46,14 +46,14 @@ public class HeldItemFeature<T extends LivingEntity, M extends EntityModel<T> &
model.transform(BodyPart.LEGS, stack); model.transform(BodyPart.LEGS, stack);
renderHeldItem(entity, right, ModelTransformation.Type.THIRD_PERSON_RIGHT_HAND, Arm.RIGHT, stack, renderContext, lightUv); renderHeldItem(entity, right, ModelTransformation.Mode.THIRD_PERSON_RIGHT_HAND, Arm.RIGHT, stack, renderContext, lightUv);
renderHeldItem(entity, left, ModelTransformation.Type.THIRD_PERSON_LEFT_HAND, Arm.LEFT, stack, renderContext, lightUv); renderHeldItem(entity, left, ModelTransformation.Mode.THIRD_PERSON_LEFT_HAND, Arm.LEFT, stack, renderContext, lightUv);
stack.pop(); stack.pop();
} }
} }
private void renderHeldItem(T entity, ItemStack drop, ModelTransformation.Type transform, Arm arm, MatrixStack stack, VertexConsumerProvider renderContext, int lightUv) { private void renderHeldItem(T entity, ItemStack drop, ModelTransformation.Mode transform, Arm arm, MatrixStack stack, VertexConsumerProvider renderContext, int lightUv) {
if (!drop.isEmpty()) { if (!drop.isEmpty()) {
stack.push(); stack.push();
renderArm(arm, stack); renderArm(arm, stack);
@ -80,11 +80,11 @@ public class HeldItemFeature<T extends LivingEntity, M extends EntityModel<T> &
} }
} }
protected void preItemRender(T entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, MatrixStack stack) { protected void preItemRender(T entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, MatrixStack stack) {
stack.translate(0, 0.125F, -1); stack.translate(0, 0.125F, -1);
} }
protected void postItemRender(T entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, MatrixStack stack, VertexConsumerProvider renderContext) { protected void postItemRender(T entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, MatrixStack stack, VertexConsumerProvider renderContext) {
} }
/** /**

2
src/main/java/com/minelittlepony/client/render/entity/feature/SkullFeature.java
View file

@ -68,7 +68,7 @@ public class SkullFeature<T extends LivingEntity, M extends EntityModel<T> & IPo
stack.scale(0.625F, -0.625F, -0.625F); stack.scale(0.625F, -0.625F, -0.625F);
stack.translate(0, 0.4F, -0.21F); stack.translate(0, 0.4F, -0.21F);
MinecraftClient.getInstance().getHeldItemRenderer().renderItem(entity, itemstack, ModelTransformation.Type.HEAD, false, stack, renderContext, lightUv); MinecraftClient.getInstance().getHeldItemRenderer().renderItem(entity, itemstack, ModelTransformation.Mode.HEAD, false, stack, renderContext, lightUv);
} }
private void renderSkull(MatrixStack stack, VertexConsumerProvider renderContext, ItemStack itemstack, boolean isVillager, float limbDistance, int lightUv) { private void renderSkull(MatrixStack stack, VertexConsumerProvider renderContext, ItemStack itemstack, boolean isVillager, float limbDistance, int lightUv) {