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

Fix crash when opening Skin manager

Browse source
This commit is contained in:
Matthew Messinger 2016-05-13 00:26:46 -04:00
parent 4d59f6c0d6
commit 5ca99920c7
3 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -82,7 +82,7 @@ processResources {
} }
dependencies { dependencies {
factory 'org.spongepowered:mixin:0.5.3-SNAPSHOT' factory 'org.spongepowered:mixin:0.5.5-SNAPSHOT'
} }
processor { processor {
options.reobfSrgFile = project.tasks.genSrgs.mcpToSrg.path options.reobfSrgFile = project.tasks.genSrgs.mcpToSrg.path

34
src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
View file

@ -6,6 +6,7 @@ import java.io.IOException;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import com.google.common.collect.Iterables;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.voxelmodpack.hdskins.HDSkinManager; import com.voxelmodpack.hdskins.HDSkinManager;
import com.voxelmodpack.hdskins.ImageBufferDownloadHD; import com.voxelmodpack.hdskins.ImageBufferDownloadHD;
@ -15,11 +16,14 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHandSide;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World; import net.minecraft.world.World;
public class EntityPlayerModel extends EntityLiving { public class EntityPlayerModel extends EntityLivingBase {
public static final ResourceLocation NOSKIN = new ResourceLocation("hdskins", "textures/mob/noskin.png"); public static final ResourceLocation NOSKIN = new ResourceLocation("hdskins", "textures/mob/noskin.png");
private PreviewTexture remoteSkinTexture; private PreviewTexture remoteSkinTexture;
private ResourceLocation remoteSkinResource; private ResourceLocation remoteSkinResource;
@ -127,4 +131,30 @@ public class EntityPlayerModel extends EntityLiving {
this.swingProgress = this.swingProgressInt / 8.0F; this.swingProgress = this.swingProgressInt / 8.0F;
} }
@Override
public EnumHandSide getPrimaryHand() {
return Minecraft.getMinecraft().gameSettings.mainHand;
}
@Override
public int getBrightnessForRender(float partialTicks) {
return 1;
}
@Override
public Iterable<ItemStack> getArmorInventoryList() {
return Iterables.cycle(null, null, null, null);
}
@Override
public ItemStack getItemStackFromSlot(EntityEquipmentSlot slotIn) {
return null;
}
@Override
public void setItemStackToSlot(EntityEquipmentSlot slotIn, ItemStack stack) {
}
} }

4
src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java
View file

@ -6,11 +6,11 @@ import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.model.ModelPlayer;
import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderLivingBase;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
public class RenderPlayerModel<M extends EntityPlayerModel> extends RenderLiving<M> { public class RenderPlayerModel<M extends EntityPlayerModel> extends RenderLivingBase<M> {
public RenderPlayerModel(RenderManager renderer) { public RenderPlayerModel(RenderManager renderer) {
super(renderer, new ModelPlayer(0, false), 0.0F); super(renderer, new ModelPlayer(0, false), 0.0F);