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

Once again, mappings changed

Browse source
This commit is contained in:
Sollace 2019-03-27 21:22:50 +02:00
parent 130085c718
commit 95cf371e4f
10 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java
View file

@ -53,7 +53,7 @@ public class DefaultPonyArmorTextureResolver<T extends EntityLivingBase> impleme
private ResourceLocation resolve(ResourceLocation... resources) { private ResourceLocation resolve(ResourceLocation... resources) {
// check resource packs for either texture. // check resource packs for either texture.
for (ResourcePackInfoClient entry : Minecraft.getInstance().getResourcePackList().getPackInfos()) { for (ResourcePackInfoClient entry : Minecraft.getInstance().getResourcePackList().getAllPacks()) {
for (ResourceLocation candidate : resources) { for (ResourceLocation candidate : resources) {
if (entry.getResourcePack().resourceExists(ResourcePackType.CLIENT_RESOURCES, candidate)) { if (entry.getResourcePack().resourceExists(ResourcePackType.CLIENT_RESOURCES, candidate)) {
// ponies are more important // ponies are more important

2
src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
View file

@ -27,7 +27,7 @@ public class LevitatingItemRenderer {
public static void enableItemGlowRenderProfile() { public static void enableItemGlowRenderProfile() {
enableBlend(); enableBlend();
blendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO); blendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO);
Minecraft.getInstance().entityRenderer.disableLightmap(); Minecraft.getInstance().gameRenderer.disableLightmap();
} }
/** /**

4
src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java
View file

@ -42,7 +42,7 @@ public class RenderEnderStallion extends RenderPonyMob<EntityEnderman> implement
return new LayerHeldPonyItemMagical<EntityEnderman>(this) { return new LayerHeldPonyItemMagical<EntityEnderman>(this) {
@Override @Override
protected ItemStack getRightItem(EntityEnderman entity) { protected ItemStack getRightItem(EntityEnderman entity) {
IBlockState state = entity.func_195405_dq(); IBlockState state = entity.getHeldBlockState();
if (state == null) { if (state == null) {
return ItemStack.EMPTY; return ItemStack.EMPTY;
} }
@ -61,7 +61,7 @@ public class RenderEnderStallion extends RenderPonyMob<EntityEnderman> implement
public void doRender(EntityEnderman entity, double x, double y, double z, float entityYaw, float partialTicks) { public void doRender(EntityEnderman entity, double x, double y, double z, float entityYaw, float partialTicks) {
ModelEnderStallion modelenderman = (ModelEnderStallion)getMainModel(); ModelEnderStallion modelenderman = (ModelEnderStallion)getMainModel();
modelenderman.isCarrying = entity.func_195405_dq() != null; modelenderman.isCarrying = entity.getHeldBlockState() != null;
modelenderman.isAttacking = entity.isScreaming(); modelenderman.isAttacking = entity.isScreaming();
if (entity.isScreaming()) { if (entity.isScreaming()) {

2
src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java
View file

@ -36,7 +36,7 @@ public class RenderSeaponyPlayer extends RenderPonyPlayer {
double y = player.posY + (player.getEntityWorld().rand.nextFloat() * 2); double y = player.posY + (player.getEntityWorld().rand.nextFloat() * 2);
double z = player.posZ + (player.getEntityWorld().rand.nextFloat() * 2) - 1; double z = player.posZ + (player.getEntityWorld().rand.nextFloat() * 2) - 1;
player.getEntityWorld().spawnParticle(Particles.END_ROD, x, y, z, 0, 0, 0); player.getEntityWorld().addParticle(Particles.END_ROD, x, y, z, 0, 0, 0);
} }
return pony; return pony;

4
src/client/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java
View file

@ -32,11 +32,11 @@ public class LayerEyeGlow<T extends EntityLiving> extends AbstractPonyLayer<T> {
color4f(1, 1, 1, 1); color4f(1, 1, 1, 1);
Minecraft.getInstance().entityRenderer.setupFogColor(true); Minecraft.getInstance().gameRenderer.setupFogColor(true);
getMainModel().render(entity, move, swing, ticks, headYaw, headPitch, scale); getMainModel().render(entity, move, swing, ticks, headYaw, headPitch, scale);
Minecraft.getInstance().entityRenderer.setupFogColor(false); Minecraft.getInstance().gameRenderer.setupFogColor(false);
((RenderLiving<T>)getRenderer()).setLightmap(entity); ((RenderLiving<T>)getRenderer()).setLightmap(entity);

2
src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
View file

@ -98,7 +98,7 @@ public class LayerPonyCustomHead<T extends EntityLivingBase> implements LayerRen
profile = NBTUtil.readGameProfile(nbt.getCompound("SkullOwner")); profile = NBTUtil.readGameProfile(nbt.getCompound("SkullOwner"));
} else if (nbt.contains("SkullOwner", 8)) { } else if (nbt.contains("SkullOwner", 8)) {
profile = TileEntitySkull.updateGameProfile(new GameProfile(null, nbt.getString("SkullOwner"))); profile = TileEntitySkull.updateGameProfile(new GameProfile(null, nbt.getString("SkullOwner")));
nbt.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), profile)); nbt.put("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), profile));
} }
} }

2
src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java
View file

@ -38,7 +38,7 @@ public class GlowRenderer extends AbstractRenderer<GlowRenderer> {
@Override @Override
public void render(float scale) { public void render(float scale) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
Minecraft.getInstance().entityRenderer.disableLightmap(); Minecraft.getInstance().gameRenderer.disableLightmap();
super.render(scale); super.render(scale);
GL11.glPopAttrib(); GL11.glPopAttrib();
} }

2
src/common/java/com/minelittlepony/common/client/gui/GameGui.java
View file

@ -30,7 +30,7 @@ public abstract class GameGui extends GuiScreen {
} }
protected void playSound(SoundEvent event) { protected void playSound(SoundEvent event) {
mc.getSoundHandler().play(SimpleSound.getMasterRecord(event, 1)); mc.getSoundHandler().play(SimpleSound.master(event, 1));
} }
/** /**

2
src/common/java/com/minelittlepony/common/client/gui/IconicButton.java
View file

@ -17,7 +17,7 @@ public class IconicButton extends Button {
} }
public IconicButton setIcon(ItemStack stack, int colour) { public IconicButton setIcon(ItemStack stack, int colour) {
stack.getOrCreateChildTag("display").setInt("color", colour); stack.getOrCreateChildTag("display").putInt("color", colour);
return setIcon(stack); return setIcon(stack);
} }

2
src/common/java/com/minelittlepony/common/client/gui/Style.java
View file

@ -21,7 +21,7 @@ public class Style implements IGuiTooltipped<Style> {
} }
public Style setIcon(ItemStack stack, int colour) { public Style setIcon(ItemStack stack, int colour) {
stack.getOrCreateChildTag("display").setInt("color", colour); stack.getOrCreateChildTag("display").putInt("color", colour);
return setIcon(stack); return setIcon(stack);
} }