PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-03-31 16:55:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manually fix the problem children

Browse source
This commit is contained in:
Sollace 2018-08-01 12:16:54 +02:00
parent bf83ff68ae
commit b9231a5bfd
15 changed files with 135 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
View file

@ -186,9 +186,7 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
final IImageBuffer imagebufferdownload = type == Type.SKIN ? new ImageBufferDownloadHD() : null;
ITextureObject texObject = new ThreadDownloadImageETag(file2, bustCache(texture.getUrl()),
DefaultPlayerSkin.getDefaultSkinLegacy(),
new IImageBuffer() {
ITextureObject texObject = new ThreadDownloadImageETag(file2, bustCache(texture.getUrl()), DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer() {
@Nonnull
@Override
public BufferedImage parseUserSkin(@Nonnull BufferedImage image) {
@ -283,8 +281,8 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
.forEach(textures::deleteTexture);
INSTANCE.skinCache.clear();
INSTANCE.skins.invalidateAll();
} catch (IOException var1) {
var1.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
INSTANCE.clearListeners = INSTANCE.clearListeners.stream()

32
src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
View file

@ -80,7 +80,7 @@ public class GuiSkins extends GuiScreen {
private final Object skinLock = new Object();
private File pendingSkinFile;
private File selectedSkin;
private float uploadOpacity = 0.0F;
private float uploadOpacity = 0;
private int lastMouseX = 0;
@ -474,19 +474,19 @@ public class GuiSkins extends GuiScreen {
}
}
if (uploadingSkin || uploadOpacity > 0.0F) {
if (uploadingSkin || uploadOpacity > 0) {
if (!uploadingSkin) {
uploadOpacity -= deltaTime * 0.05F;
} else if (uploadOpacity < 1.0F) {
} else if (uploadOpacity < 1) {
uploadOpacity += deltaTime * 0.1F;
}
if (uploadOpacity > 1.0F) {
uploadOpacity = 1.0F;
if (uploadOpacity > 1) {
uploadOpacity = 1;
}
int opacity = Math.min(180, (int) (uploadOpacity * 180.0F)) & 255;
if (uploadOpacity > 0.0F) {
int opacity = Math.min(180, (int) (uploadOpacity * 180)) & 255;
if (uploadOpacity > 0) {
Gui.drawRect(0, 0, width, height, opacity << 24);
if (uploadingSkin) {
drawCenteredString(fontRenderer, skinUploadMessage, width / 2, height / 2, opacity << 24 | 0xffffff);
@ -508,16 +508,16 @@ public class GuiSkins extends GuiScreen {
float partialTick) {
enableColorMaterial();
pushMatrix();
translate(xPosition, yPosition, 300.0F);
translate(xPosition, yPosition, 300);
scale(-scale, scale, scale);
rotate(180.0F, 0.0F, 0.0F, 1.0F);
rotate(135.0F, 0.0F, 1.0F, 0.0F);
rotate(180, 0, 0, 1);
rotate(135, 0, 1, 0);
RenderHelper.enableStandardItemLighting();
rotate(-135.0F, 0.0F, 1.0F, 0.0F);
rotate(15.0F, 1.0F, 0.0F, 0.0F);
rotate(-135, 0, 1, 0);
rotate(15, 1, 0, 0);
float rot = (updateCounter + partialTick) * 2.5F % 360;
@ -526,10 +526,10 @@ public class GuiSkins extends GuiScreen {
thePlayer.rotationYawHead = (float) Math.atan(mouseX / 20) * 30;
thePlayer.rotationPitch = -((float) Math.atan(mouseY / 40)) * 20;
translate(0.0D, thePlayer.getYOffset(), 0.0D);
translate(0, thePlayer.getYOffset(), 0);
RenderManager rm = Minecraft.getMinecraft().getRenderManager();
rm.playerViewY = 180.0F;
rm.playerViewY = 180;
rm.renderEntity(thePlayer, 0, 0, 0, 0, 1, false);
popMatrix();
@ -543,11 +543,11 @@ public class GuiSkins extends GuiScreen {
}
doubleBuffer.clear();
doubleBuffer.put(0.0D).put(1.0D).put(0.0D).put(-30).flip();
doubleBuffer.put(0).put(1).put(0).put(-30).flip();
GL11.glClipPlane(GL11.GL_CLIP_PLANE0, doubleBuffer);
doubleBuffer.clear();
doubleBuffer.put(0.0D).put(-1.0D).put(0.0D).put(yBottom).flip();
doubleBuffer.put(0).put(-1).put(0).put(yBottom).flip();
GL11.glClipPlane(GL11.GL_CLIP_PLANE1, doubleBuffer);
GL11.glEnable(GL11.GL_CLIP_PLANE0);

4
src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
View file

@ -64,8 +64,8 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor {
protected void initHead(float yOffset, float stretch) {
super.initHead(yOffset, stretch * 1.1F);
((PonyRenderer)bipedHead).child()
.tex(0, 4).box(2, -6, 1, 2, 2, 2, stretch * 0.5F)
.box(-4, -6, 1, 2, 2, 2, stretch * 0.5F);
.tex(0, 4).box( 2, -6, 1, 2, 2, 2, stretch / 2)
.box(-4, -6, 1, 2, 2, 2, stretch / 2);
}
@Override

3
src/main/java/com/minelittlepony/model/components/ModelPonyHead.java
View file

@ -27,7 +27,8 @@ public class ModelPonyHead extends ModelHumanoidHead implements ICapitated {
snout.init(0, 0);
ears = new PonyRenderer(this, 0, 0).offset(0, -3, 2).around(0, 0, -2)
ears = new PonyRenderer(this, 0, 0)
.offset(0, -3, 2).around(0, 0, -2)
.tex(12, 16).box(-4, -6, 1, 2, 2, 2, 0)
.flip().box( 2, -6, 1, 2, 2, 2, 0);

2
src/main/java/com/minelittlepony/model/components/PonyTail.java
View file

@ -110,7 +110,7 @@ public class PonyTail extends PlaneRenderer implements IModelPart {
.addWestPlane(-2, 0, 2, 4, 4, stretch);
tex(32, texX).addBackPlane(-2, 0, 2, 4, 4, stretch)
.addFrontPlane(-2, 0, 6, 4, 4, stretch);
tex(32, 0).addBottomPlane(-2, 4, 2, 4, 4, stretch);
tex(32, 0) .addBottomPlane(-2, 4, 2, 4, 4, stretch);
}
@Override

13
src/main/java/com/minelittlepony/model/components/SaddleBags.java
View file

@ -39,12 +39,12 @@ public class SaddleBags implements IModelPart {
strap.offset(-x, y + 0.2F, z + 3).around(0, 4, 4)
.tex(56, 31).addTopPlane(0, 0, 0, 8, 1, stretch)
.addTopPlane(0, 0, 1, 8, 1, stretch)
.addBackPlane(0, 0, 2, 8, 1, stretch)
.addTopPlane( 0, 0, 1, 8, 1, stretch)
.addBackPlane( 0, 0, 2, 8, 1, stretch)
.addFrontPlane(0, 0, 0, 8, 1, stretch)
.child(0).offset(0, -3, -0.305F).tex(56, 31)
.addWestPlane(4.0002F, 0, 0, 1, 3, stretch) // 0.0001 is there
.addWestPlane(4.0002F, -1, 0, 1, 3, stretch) // otherwise straps
.addWestPlane( 4.0002F, 0, 0, 1, 3, stretch) // 0.0001 is there
.addWestPlane( 4.0002F, -1, 0, 1, 3, stretch) // otherwise straps
.addWestPlane(-4.0002F, 0, 0, 1, 3, stretch) // clip into the body
.addWestPlane(-4.0002F, -1, 0, 1, 3, stretch)
.rotateAngleX = ROTATE_270;
@ -56,7 +56,8 @@ public class SaddleBags implements IModelPart {
.addWestPlane(0, 0, 0, 6, 8, stretch)
.child(0).offset(z, y, -x).tex(56, 16)
.addTopPlane(0, 0, -3, 8, 3, stretch)
.tex(56, 22).flipZ().addBottomPlane(0, 6, -3, 8, 3, stretch)
.tex(56, 22).flipZ()
.addBottomPlane(0, 6, -3, 8, 3, stretch)
.rotateAngleY = ROTATE_270;
x += 3;
@ -67,7 +68,7 @@ public class SaddleBags implements IModelPart {
.tex(56, 19).addWestPlane(3, 0, 0, 6, 8, stretch)
.addWestPlane(0, 0, 0, 6, 8, stretch)
.child(0).offset(z, y, x).tex(56, 16)
.flipZ().addTopPlane(0, 0, -3, 8, 3, stretch)
.flipZ().addTopPlane( 0, 0, -3, 8, 3, stretch)
.tex(56, 22).flipZ().addBottomPlane(0, 6, -3, 8, 3, stretch)
.rotateAngleY = ROTATE_270;

6
src/main/java/com/minelittlepony/model/player/ModelZebra.java
View file

@ -36,10 +36,10 @@ public class ModelZebra extends ModelEarthPony {
.box(0, -10, 2, 2, 6, 2, stretch)
.box(0, -10, 4, 2, 8, 2, stretch)
.box(0, -8, 6, 2, 6, 2, stretch)
.rotateAngleX = 0.3F;
bristles.child(0).offset(-1.01F, 2, -7) //0.01 to prevent z-fighting
.rotate(0.3F, 0, 0)
.child(0).offset(-1.01F, 2, -7) //0.01 to prevent z-fighting
.box(0, -10, 4, 2, 8, 2, stretch)
.box(0, -8, 6, 2, 6, 2, stretch)
.rotateAngleX = -1F;
.rotate(-1, 0, 0);
}
}

3
src/main/java/com/minelittlepony/model/ponies/ModelIllagerPony.java
View file

@ -48,8 +48,7 @@ public class ModelIllagerPony extends ModelAlicorn {
bipedLeftArm.rotateAngleX -= sin;
} else if (pose == IllagerArmPose.SPELLCASTING) {
// waving arms!
// this.bipedRightArm.rotationPointZ = 0;
arm.rotateAngleX = (float) (-.75F * Math.PI);
arm.rotateAngleX = (float) (-0.75F * Math.PI);
arm.rotateAngleZ = mult * MathHelper.cos(ticks * 0.6662F) / 4;
arm.rotateAngleY = mult * 1.1F;
} else if (pose == IllagerArmPose.BOW_AND_ARROW) {