PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-23 04:57:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony

Browse source
This commit is contained in:
Sollace 2018-08-17 08:48:42 +02:00
commit cf34174ac1
2 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java
View file

@ -1,8 +1,5 @@
package com.minelittlepony.render.player; package com.minelittlepony.render.player;
import java.util.Map;
import java.util.Optional;
import com.minelittlepony.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.PonyConfig; import com.minelittlepony.PonyConfig;
import com.minelittlepony.ducks.IRenderPony; import com.minelittlepony.ducks.IRenderPony;
@ -11,8 +8,8 @@ import com.minelittlepony.model.components.ModelDeadMau5Ears;
import com.minelittlepony.pony.data.Pony; import com.minelittlepony.pony.data.Pony;
import com.minelittlepony.pony.data.PonyLevel; import com.minelittlepony.pony.data.PonyLevel;
import com.minelittlepony.render.PonySkull; import com.minelittlepony.render.PonySkull;
import com.minelittlepony.render.RenderPony;
import com.minelittlepony.render.PonySkullRenderer.ISkull; import com.minelittlepony.render.PonySkullRenderer.ISkull;
import com.minelittlepony.render.RenderPony;
import com.minelittlepony.render.layer.LayerEntityOnPonyShoulder; import com.minelittlepony.render.layer.LayerEntityOnPonyShoulder;
import com.minelittlepony.render.layer.LayerHeldPonyItemMagical; import com.minelittlepony.render.layer.LayerHeldPonyItemMagical;
import com.minelittlepony.render.layer.LayerPonyArmor; import com.minelittlepony.render.layer.LayerPonyArmor;
@ -23,19 +20,19 @@ import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
import com.voxelmodpack.hdskins.HDSkinManager; import com.voxelmodpack.hdskins.HDSkinManager;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumHandSide;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.layers.LayerArrow; import net.minecraft.client.renderer.entity.layers.LayerArrow;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import java.util.Map;
import java.util.Optional;
public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<AbstractClientPlayer> { public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<AbstractClientPlayer> {
@ -84,9 +81,11 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<Abstra
}.register(ISkull.PLAYER); }.register(ISkull.PLAYER);
protected final RenderPony<AbstractClientPlayer> renderPony = new RenderPony<>(this); protected final RenderPony<AbstractClientPlayer> renderPony = new RenderPony<>(this);
private final RenderPlayer renderPlayer;
public RenderPonyPlayer(RenderManager manager, boolean useSmallArms, ModelWrapper model) { public RenderPonyPlayer(RenderManager manager, boolean useSmallArms, ModelWrapper model) {
super(manager, useSmallArms); super(manager, useSmallArms);
renderPlayer = new RenderPlayer(manager, useSmallArms);
mainModel = renderPony.setPonyModel(model); mainModel = renderPony.setPonyModel(model);
@ -143,27 +142,12 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<Abstra
@Override @Override
public final void renderRightArm(AbstractClientPlayer player) { public final void renderRightArm(AbstractClientPlayer player) {
renderArm(player, EnumHandSide.RIGHT); renderPlayer.renderRightArm(player);
} }
@Override @Override
public final void renderLeftArm(AbstractClientPlayer player) { public final void renderLeftArm(AbstractClientPlayer player) {
renderArm(player, EnumHandSide.LEFT); renderPlayer.renderLeftArm(player);
}
protected void renderArm(AbstractClientPlayer player, EnumHandSide side) {
renderPony.updateModel(player);
bindEntityTexture(player);
GlStateManager.pushMatrix();
GlStateManager.translate(side == EnumHandSide.LEFT ? 0.06 : 0, -0.37, 0);
if (side == EnumHandSide.LEFT) {
super.renderLeftArm(player);
} else {
super.renderRightArm(player);
}
GlStateManager.popMatrix();
} }
@Override @Override

6
src/main/resources/assets/minelittlepony/lang/ru_ru.lang
View file

@ -18,7 +18,7 @@ minelp.mobs.pigzombies=Понифицировать свинозомби
minelp.mobs.skeletons=Понифицировать скелетов minelp.mobs.skeletons=Понифицировать скелетов
minelp.mobs.illagers=Понифицировать обитателей Особняка minelp.mobs.illagers=Понифицировать обитателей Особняка
minelp.mobs.guardians=Понифицировать Стражей minelp.mobs.guardians=Понифицировать Стражей
minelp.mobs.endermen=Понифицировать Эндермен minelp.mobs.endermen=Понифицировать Странников Края
minelp.mode.dry=Земля пони minelp.mode.dry=Пони на земле
minelp.mode.wet=Морской пони minelp.mode.wet=Пони под водой