Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '6.5.x' of github.com:BuildCraft/BuildCraft into 6.5.x

Browse source
This commit is contained in:
asiekierka 2015-06-11 09:08:48 +02:00
commit fa0d2e1b33
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/buildcraft/robotics/EntityRobot.java
View file

@ -571,7 +571,10 @@ public class EntityRobot extends EntityRobotBase implements
if (nbt.hasKey("wearables")) {
NBTTagList list = nbt.getTagList("wearables", 10);
for (int i = 0; i < list.tagCount(); i++) {
wearables.add(ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i)));
ItemStack stack = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i));
if (stack != null) {
wearables.add(stack);
}
}
}

16
common/buildcraft/robotics/render/RenderRobot.java
View file

@ -37,6 +37,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.common.util.Constants.NBT;
import buildcraft.BuildCraftRobotics;
import buildcraft.api.robots.IRobotOverlayItem;
@ -60,7 +61,9 @@ public class RenderRobot extends Render implements IItemRenderer {
};
private ModelBase modelHelmet = new ModelBase() {
};
private ModelRenderer box, helmetBox;
private ModelBase modelSkullOverlay = new ModelBase() {
};
private ModelRenderer box, helmetBox, skullOverlayBox;
private Map<String, GameProfile> gameProfileCache = new HashMap<String, GameProfile>();
@ -84,6 +87,9 @@ public class RenderRobot extends Render implements IItemRenderer {
helmetBox = new ModelRenderer(modelHelmet, 0, 0);
helmetBox.addBox(-4F, -8F, -4F, 8, 8, 8);
helmetBox.setRotationPoint(0.0F, 0.0F, 0.0F);
skullOverlayBox = new ModelRenderer(modelSkullOverlay, 32, 0);
skullOverlayBox.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.5F);
skullOverlayBox.setRotationPoint(0.0F, 0.0F, 0.0F);
}
@Override
@ -265,7 +271,7 @@ public class RenderRobot extends Render implements IItemRenderer {
NBTTagCompound nbt = wearable.getTagCompound();
if (nbt.hasKey("Name")) {
gameProfile = gameProfileCache.get(nbt.getString("Name"));
} else if (nbt.hasKey("SkullOwner")) {
} else if (nbt.hasKey("SkullOwner", NBT.TAG_COMPOUND)) {
gameProfile = NBTUtil.func_152459_a(nbt.getCompoundTag("SkullOwner"));
nbt.setString("Name", gameProfile.getName());
gameProfileCache.put(gameProfile.getName(), gameProfile);
@ -274,6 +280,12 @@ public class RenderRobot extends Render implements IItemRenderer {
TileEntitySkullRenderer.field_147536_b.func_152674_a(-0.5F, -0.25F, -0.5F, 1, -90.0F,
wearable.getItemDamage(), gameProfile);
if (gameProfile != null) {
GL11.glTranslatef(0.0f, -0.25f, 0.0f);
GL11.glRotatef(180F, 0, 0, 1);
GL11.glRotatef(-90.0f, 0.0f, 1.0f, 0.0f);
skullOverlayBox.render(1 / 16f);
}
GL11.glPopMatrix();
}