PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-22 12:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix armor

Browse source
This commit is contained in:
Matthew Messinger 2015-12-15 00:51:31 -05:00
parent 9dd9384d77
commit f8cc7d3268
4 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/brohoof/minelittlepony/PonyConfig.java
View file

@ -18,8 +18,6 @@ public class PonyConfig implements AdvancedExposable {
@Expose @Expose
private Value<Boolean> sizes = new Value<Boolean>(true); private Value<Boolean> sizes = new Value<Boolean>(true);
@Expose @Expose
private Value<Boolean> ponyarmor = new Value<Boolean>(true);
@Expose
private Value<Boolean> snuzzles = new Value<Boolean>(true); private Value<Boolean> snuzzles = new Value<Boolean>(true);
@Expose @Expose
private Value<Boolean> hd = new Value<Boolean>(true); private Value<Boolean> hd = new Value<Boolean>(true);
@ -44,10 +42,6 @@ public class PonyConfig implements AdvancedExposable {
return sizes; return sizes;
} }
public Value<Boolean> getPonyArmor() {
return ponyarmor;
}
public Value<Boolean> getSnuzzles() { public Value<Boolean> getSnuzzles() {
return snuzzles; return snuzzles;
} }

2
src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java
View file

@ -19,7 +19,6 @@ public class MineLittlePonyGUI extends GuiVoxelBoxSettingsPanel {
private static final String OPTIONS = _PREFIX + "options"; private static final String OPTIONS = _PREFIX + "options";
private static final String HD = _PREFIX + "hd"; private static final String HD = _PREFIX + "hd";
private static final String SIZES = _PREFIX + "sizes"; private static final String SIZES = _PREFIX + "sizes";
private static final String PONY_ARMOR = _PREFIX + "ponyarmor";
private static final String SNUZZLES = _PREFIX + "snuzzles"; private static final String SNUZZLES = _PREFIX + "snuzzles";
private static final String SHOW_SCALE = _PREFIX + "showscale"; private static final String SHOW_SCALE = _PREFIX + "showscale";
@ -34,7 +33,6 @@ public class MineLittlePonyGUI extends GuiVoxelBoxSettingsPanel {
this.properties.add(new VoxelPropertyLabel(I18n.format(OPTIONS), PANEL_LEFT + 15, row += 45)); this.properties.add(new VoxelPropertyLabel(I18n.format(OPTIONS), PANEL_LEFT + 15, row += 45));
this.properties.add(check(config.getHd(), HD, PANEL_LEFT + col1, row += 15)); this.properties.add(check(config.getHd(), HD, PANEL_LEFT + col1, row += 15));
this.properties.add(check(config.getSizes(), SIZES, PANEL_LEFT + col1, row += 15)); this.properties.add(check(config.getSizes(), SIZES, PANEL_LEFT + col1, row += 15));
this.properties.add(check(config.getPonyArmor(), PONY_ARMOR, PANEL_LEFT + col1, row += 15));
this.properties.add(check(config.getSnuzzles(), SNUZZLES, PANEL_LEFT + col1, row += 15)); this.properties.add(check(config.getSnuzzles(), SNUZZLES, PANEL_LEFT + col1, row += 15));
this.properties.add(check(config.getShowScale(), SHOW_SCALE, PANEL_LEFT + col1, row += 15)); this.properties.add(check(config.getShowScale(), SHOW_SCALE, PANEL_LEFT + col1, row += 15));
} }

6
src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java
View file

@ -60,14 +60,14 @@ public class LayerPonyArmor implements LayerRenderer {
if (itemstack != null && itemstack.getItem() instanceof ItemArmor) { if (itemstack != null && itemstack.getItem() instanceof ItemArmor) {
ItemArmor itemarmor = (ItemArmor) itemstack.getItem(); ItemArmor itemarmor = (ItemArmor) itemstack.getItem();
boolean isLegs = armorSlot == 3; boolean isLegs = armorSlot == 2;
ModelPony modelbase = isLegs ? pony.getArmor().modelArmorChestplate : pony.getArmor().modelArmor; ModelPony modelbase = isLegs ? pony.getArmor().modelArmor : pony.getArmor().modelArmorChestplate;
modelbase.setModelAttributes(this.pony.getModel()); modelbase.setModelAttributes(this.pony.getModel());
modelbase.setLivingAnimations(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks); modelbase.setLivingAnimations(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks);
modelbase = getArmorModel(entitylivingbaseIn, itemstack, armorSlot, modelbase); modelbase = getArmorModel(entitylivingbaseIn, itemstack, armorSlot, modelbase);
prepareToRender((pm_newPonyArmor) modelbase, armorSlot); prepareToRender((pm_newPonyArmor) modelbase, armorSlot);
// this.bindPonyArmorTexture(itemarmor, armorSlot, null);
this.renderer.bindTexture(getArmorTexture(entitylivingbaseIn, itemstack, isLegs ? 2 : 1, null)); this.renderer.bindTexture(getArmorTexture(entitylivingbaseIn, itemstack, isLegs ? 2 : 1, null));
if (itemarmor.getArmorMaterial() == ArmorMaterial.LEATHER) { if (itemarmor.getArmorMaterial() == ArmorMaterial.LEATHER) {
int j = itemarmor.getColor(itemstack); int j = itemarmor.getColor(itemstack);

1
src/main/resources/assets/minelittlepony/lang/en_US.lang
View file

@ -9,7 +9,6 @@ minelp.options.ponylevel.both=Both
minelp.options.options=Pony Options minelp.options.options=Pony Options
minelp.options.hd=Enable MineLP skin server (requries restart) minelp.options.hd=Enable MineLP skin server (requries restart)
minelp.options.sizes=Allow all different sizes of pony minelp.options.sizes=Allow all different sizes of pony
minelp.options.ponyarmor=Use Mine Little Pony compatible armor
minelp.options.snuzzles=Display snuzzles on ponies minelp.options.snuzzles=Display snuzzles on ponies
minelp.options.showscale=Use show-accurate scaling minelp.options.showscale=Use show-accurate scaling