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

20w10a -> 20w13b

Browse source
This commit is contained in:
Sollace 2020-03-27 20:14:50 +02:00
parent f2016efcc4
commit 8692c124c0
16 changed files with 28 additions and 28 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
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=20w10a
yarn_mappings=20w10a+build.16:v2
loader_version=0.7.8+build.187
# check these on https://modmuss50.me/fabric.html
minecraft_version=20w13b
yarn_mappings=20w13b+build.5:v2
loader_version=0.7.8+build.189
# Mod Properties
group=com.minelittlepony
@ -17,6 +17,6 @@ org.gradle.daemon=false
# Dependencies
modmenu_version=1.11.+
kirin_version=1.6-20w10a-SNAPSHOT
hd_skins_version=6.1.4-20w10a-SNAPSHOT
mson_version=1.1.11-20w10a-SNAPSHOT
kirin_version=1.6-20w13b-SNAPSHOT
hd_skins_version=6.1.4-20w13b-SNAPSHOT
mson_version=1.1.11-20w13b-SNAPSHOT

2
src/main/java/com/minelittlepony/client/hdskins/DummyPony.java
View file

@ -5,7 +5,7 @@ import net.minecraft.entity.EntityType;
import com.minelittlepony.hdskins.client.dummy.DummyPlayer;
import com.minelittlepony.hdskins.client.dummy.TextureProxy;
import com.minelittlepony.hdskins.skins.SkinType;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.hdskins.client.resources.LocalTexture;
import com.minelittlepony.model.IRotatedSwimmer;

2
src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java
View file

@ -11,7 +11,7 @@ import com.minelittlepony.client.render.entity.feature.GlowingItemFeature;
import com.minelittlepony.client.render.entity.feature.ArmourFeature;
import com.minelittlepony.client.render.entity.feature.ElytraFeature;
import com.minelittlepony.hdskins.client.dummy.DummyPlayerRenderer;
import com.minelittlepony.hdskins.skins.SkinType;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;

4
src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java
View file

@ -5,8 +5,8 @@ import com.minelittlepony.common.client.gui.element.IconicToggle;
import com.minelittlepony.common.client.gui.style.Style;
import com.minelittlepony.hdskins.client.dummy.PlayerPreview;
import com.minelittlepony.hdskins.client.gui.GuiSkins;
import com.minelittlepony.hdskins.skins.SkinServerList;
import com.minelittlepony.hdskins.skins.SkinType;
import com.minelittlepony.hdskins.server.SkinServerList;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.pony.IPonyManager;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;

2
src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
View file

@ -5,7 +5,7 @@ import com.minelittlepony.client.SkinsProxy;
import com.minelittlepony.common.event.ClientReadyCallback;
import com.minelittlepony.hdskins.client.SkinCacheClearCallback;
import com.minelittlepony.hdskins.client.gui.GuiSkins;
import com.minelittlepony.hdskins.skins.SkinType;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.mson.api.Mson;
import com.mojang.authlib.GameProfile;

2
src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java
View file

@ -5,7 +5,7 @@ import net.minecraft.util.Identifier;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.hdskins.client.dummy.DummyPlayer;
import com.minelittlepony.hdskins.client.dummy.PlayerPreview;
import com.minelittlepony.hdskins.skins.SkinType;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;

4
src/main/java/com/minelittlepony/client/model/PonySkullModel.java
View file

@ -40,8 +40,8 @@ public class PonySkullModel extends SkullOverlayEntityModel implements MsonModel
}
@Override
public void render(float poweredTicks, float yaw, float pitch) {
super.render(poweredTicks, yaw, pitch);
public void method_2821(float poweredTicks, float yaw, float pitch) {
super.method_2821(poweredTicks, yaw, pitch);
hair.yaw = skull.yaw;
hair.pitch = skull.pitch;
}

2
src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
View file

@ -84,7 +84,7 @@ public class SeaponyModel<T extends LivingEntity> extends UnicornModel<T> {
rightArm.pitch -= 0.5F;
}
if (!entity.isSubmergedInWater() || entity.method_24828()) {
if (!entity.isSubmergedInWater() || entity.isOnGround()) {
leftArm.yaw -= 0.5F;
rightArm.yaw += 0.5F;
}

6
src/main/java/com/minelittlepony/client/pony/Pony.java
View file

@ -81,12 +81,12 @@ public class Pony implements IPony {
* this is to keep Pegasus wings from flapping in odd situations (Hypixel).
*/
private boolean isOnGround(LivingEntity entity) {
if (entity.method_24828()) {
if (entity.isOnGround()) {
return true;
}
BlockState below = entity.getEntityWorld()
.getBlockState(entity.getSenseCenterPos().down(1));
.getBlockState(entity.getBlockPos().down(1));
// Check for stairs so we can keep Pegasi from flailing their wings as they descend
double offsetAmount = below.getBlock() instanceof StairsBlock ? 1 : 0.05;
@ -108,7 +108,7 @@ public class Pony implements IPony {
@Override
public boolean isPartiallySubmerged(LivingEntity entity) {
return entity.isSubmergedInWater()
|| entity.getEntityWorld().getBlockState(entity.getSenseCenterPos()).getMaterial() == Material.WATER;
|| entity.getEntityWorld().getBlockState(entity.getBlockPos()).getMaterial() == Material.WATER;
}
@Override

2
src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java
View file

@ -14,7 +14,7 @@ public abstract class AbstractPonySkull implements ISkull {
@Override
public void setAngles(float angle, float poweredTicks) {
ponyHead.render(poweredTicks, angle, 0);
ponyHead.method_2821(poweredTicks, angle, 0);
}
@Override

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

@ -83,7 +83,7 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen
@Override
public void render(AbstractClientPlayerEntity entity, float entityYaw, float tickDelta, MatrixStack stack, VertexConsumerProvider renderContext, int lightUv) {
shadowSize = manager.getShadowScale();
shadowRadius = manager.getShadowScale();
super.render(entity, entityYaw, tickDelta, stack, renderContext, lightUv);
DebugBoundingBoxRenderer.render(manager.getPony(entity), this, entity, stack, renderContext, tickDelta);

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

@ -22,7 +22,7 @@ public class PonyPiglinRenderer extends PonyRenderer.Caster<HostileEntity, Pigli
}
@Override
protected boolean method_25450(HostileEntity entity) {
protected boolean isShaking(HostileEntity entity) {
return entity instanceof PiglinEntity && ((PiglinEntity)entity).canConvert();
}
}

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

@ -84,10 +84,10 @@ public abstract class PonyRenderer<T extends MobEntity, M extends EntityModel<T>
@Override
public void scale(T entity, MatrixStack stack, float tickDelta) {
shadowSize = manager.getShadowScale();
shadowRadius = manager.getShadowScale();
if (entity.isBaby()) {
shadowSize *= 3; // undo vanilla shadow scaling
shadowRadius *= 3; // undo vanilla shadow scaling
}
if (!entity.hasVehicle()) {

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

@ -41,8 +41,8 @@ public class PassengerFeature<T extends PlayerEntity, M extends ClientPonyModel<
stack.translate(left ? 0.25 : -0.25, entity.isInSneakingPose() ? -0.5 : -0.25, 0.35);
stack.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(left ? -5 : 5));
VertexConsumer vertexConsumer = renderContext.getBuffer(model.getLayer(ParrotEntityRenderer.SKINS[riderTag.getInt("Variant")]));
model.method_17106(stack, vertexConsumer, lightUv, OverlayTexture.DEFAULT_UV, limbDistance, limbAngle, headYaw, headPitch, entity.age);
VertexConsumer vertexConsumer = renderContext.getBuffer(model.getLayer(ParrotEntityRenderer.TEXTURES[riderTag.getInt("Variant")]));
model.poseOnShoulder(stack, vertexConsumer, lightUv, OverlayTexture.DEFAULT_UV, limbDistance, limbAngle, headYaw, headPitch, entity.age);
stack.pop();
});
}

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

@ -96,7 +96,7 @@ public abstract class IllagerPonyRenderer<T extends IllagerEntity> extends PonyR
}
@Override
protected boolean isFullyVisible(IllusionerEntity entity) {
protected boolean isVisible(IllusionerEntity entity) {
return true;
}
}

2
src/main/java/com/minelittlepony/client/transform/PonyPosture.java
View file

@ -21,7 +21,7 @@ public interface PonyPosture<T extends LivingEntity> {
default void apply(T player, IModel model, MatrixStack stack, float yaw, float ticks, int invert) {
if (applies(player)) {
double motionX = player.getX() - player.prevX;
double motionY = player.method_24828() ? 0 : player.getY() - player.prevY;
double motionY = player.isOnGround() ? 0 : player.getY() - player.prevY;
double motionZ = player.getZ() - player.prevZ;
transform(model, player, stack, motionX, invert * motionY, motionZ, yaw, ticks);