diff --git a/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java b/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java index 1a664f6..d61cf7d 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java @@ -16,7 +16,7 @@ public class ModelPackagerPiston extends ModelBase { ModelRenderer shape1; ModelRenderer shape2; - public ModelPackagerPiston() + public ModelPackagerPiston(boolean cut) { textureWidth = 64; textureHeight = 32; @@ -26,9 +26,10 @@ public class ModelPackagerPiston extends ModelBase { shape1.setRotationPoint(-5F, 16F, -5F); shape1.setTextureSize(64, 32); shape1.mirror = true; - shape2 = new ModelRenderer(this, 41, 0); + + shape2 = new ModelRenderer(this, 41, cut ? 1 : 0); shape2.addBox(0F, 0F, 0F, 4, 4, 4); - shape2.setRotationPoint(-2F, 12F, -2F); + shape2.setRotationPoint(-2F, cut ? 13F : 12F, -2F); shape2.setTextureSize(64, 32); shape2.mirror = true; } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java index 2277eaf..35911ea 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java @@ -23,7 +23,8 @@ public class RenderTileArcanePackager extends TileEntitySpecialRenderer { private static final ModelArcanePackager MODEL = new ModelArcanePackager(); private static final ResourceLocation TEXTURE_PISTON = new SimpleResourceLocation("/models/packager_piston.png"); - private static final ModelPackagerPiston MODEL_PISTON = new ModelPackagerPiston(); + private static final ModelPackagerPiston MODEL_PISTON = new ModelPackagerPiston(false); + private static final ModelPackagerPiston MODEL_PISTON_CUT = new ModelPackagerPiston(true); @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { @@ -49,13 +50,20 @@ public class RenderTileArcanePackager extends TileEntitySpecialRenderer { } GL11.glTranslatef(0, pistonOffset, 0); - bindTexture(TEXTURE_PISTON); - MODEL_PISTON.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - - GL11.glPopMatrix(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + bindTexture(TEXTURE_PISTON); + + if(pistonOffset < 1/16f) { + MODEL_PISTON_CUT.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + } else { + MODEL_PISTON.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + } + + GL11.glPopMatrix(); + bindTexture(TEXTURE); MODEL.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java index 9ffca31..31f2247 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java @@ -275,12 +275,12 @@ public class BlockStoneMachine extends Block { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 11 || metadata == 15 || metadata == 1) { setBlockBounds(0, 0, 0, 1, 1, 1); - } else if (metadata == 0 || metadata == 3) { - setBlockBoundsBasedOnState(world, x, y, z); } else if(metadata == 2) { setBlockBounds(3 / 16f, 0, 3 / 16f, 1 - (3 / 16f), 9.5f/16f, 1 - (3 / 16f)); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); setBlockBoundsBasedOnState(world, x, y, z); + } else { + setBlockBoundsBasedOnState(world, x, y, z); } super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java b/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java index 6ccceab..88de42a 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java @@ -1,14 +1,19 @@ package makeo.gadomancy.common.items; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.NBTHelper; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.blocks.BlockCustomOreItem; import java.util.List; @@ -52,16 +57,55 @@ public class ItemAuraCore extends Item { } } - public void setCoreType(ItemStack itemStack, AuraCoreType type) { - if(itemStack == null || !(itemStack.getItem() instanceof ItemAuraCore)) return; - if(type == null) return; - NBTHelper.getData(itemStack).setInteger("type", type.ordinal()); + private IIcon coreBlankIcon; + private IIcon coreIcon; + private IIcon borderIcon; + + @Override + public void registerIcons(IIconRegister ir) { + coreBlankIcon = ir.registerIcon(Gadomancy.MODID + ":core_core_blank"); + coreIcon = ir.registerIcon(Gadomancy.MODID + ":core_core"); + borderIcon = ir.registerIcon(Gadomancy.MODID + ":core_border"); + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + //shhhhh don't tell it anyone! + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + if(getCoreType(stack) == AuraCoreType.BLANK && pass == 0) { + return coreBlankIcon; + } + return pass == 0 ? coreIcon : borderIcon; + } + + @Override + public boolean requiresMultipleRenderPasses() { + return true; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int pass) { + if(pass == 0) { + AuraCoreType type = getCoreType(stack); + if(type.isAspect()) { + if(type.ordinal() < 7) { + return BlockCustomOreItem.colors[type.ordinal()]; + } + return type.getAspect().getColor(); + } + } + return super.getColorFromItemStack(stack, pass); + } + + public ItemStack setCoreType(ItemStack itemStack, AuraCoreType type) { + itemStack.setItemDamage(type.ordinal()); + return itemStack; } public AuraCoreType getCoreType(ItemStack itemStack) { - if(itemStack == null || !(itemStack.getItem() instanceof ItemAuraCore)) return null; - int ordinal = NBTHelper.getData(itemStack).getInteger("type"); - return AuraCoreType.values()[ordinal]; + return AuraCoreType.values()[itemStack.getItemDamage()]; } public boolean isBlank(ItemStack itemStack) { @@ -70,26 +114,49 @@ public class ItemAuraCore extends Item { } public static enum AuraCoreType { + BLANK("blank"), - BLANK("Blank", "blank"), + AIR(Aspect.AIR), + FIRE(Aspect.FIRE, true), + WATER(Aspect.WATER, true), + EARTH(Aspect.EARTH, true), + ORDER(Aspect.ORDER), + ENTROPY(Aspect.ENTROPY, true); - AIR("Aer", "aer"), - FIRE("Ignis", "ignis"), - WATER("Aqua", "aqua"), - EARTH("Terra", "terra"), - ORDER("Ordo", "ordo"), - ENTROPY("Perditio", "perditio"); + private final Aspect aspect; + private final String unlocName; + private final boolean unused; - public final String unlocName, fallback; + AuraCoreType(String unlocName) { + this.unlocName = unlocName; + this.aspect = null; + this.unused = false; + } - AuraCoreType(String fallback, String unlocName) { - this.unlocName = "gadomancy.auracore." + unlocName; - this.fallback = fallback; + AuraCoreType(Aspect aspect) { + this(aspect, false); + } + + AuraCoreType(Aspect aspect, boolean unused) { + this.aspect = aspect; + this.unlocName = null; + this.unused = unused; + } + + public boolean isAspect() { + return aspect != null; + } + + public Aspect getAspect() { + return aspect; } public String getLocalizedName() { - return StatCollector.canTranslate(unlocName) ? StatCollector.translateToLocal(unlocName) : fallback; + String name = isAspect() ? aspect.getName() : StatCollector.translateToLocal("gadomancy.auracore." + unlocName); + if(unused) { + name += " " + StatCollector.translateToLocal("gadomancy.auracore.unused"); + } + return name; } } - } diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 6083877..3a57865 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -150,13 +150,8 @@ tile.BlockAuraPylon.1.name=Aura Pylon Peak gadomancy.nodes.GROWING=Growing gadomancy.nodes.STARVING=Starving +gadomancy.auracore.unused=(Unused at the moment) gadomancy.auracore.blank=Blank -gadomancy.auracore.aer=Aer -gadomancy.auracore.ignis=Ignis (Unused at the moment) -gadomancy.auracore.aqua=Aqua (Unused at the moment) -gadomancy.auracore.terra=Terra (Unused at the moment) -gadomancy.auracore.ordo=Ordo -gadomancy.auracore.perditio=Perditio (Unused at the moment) gadomancy.aura.research.unlock=You've researched the aura of %s diff --git a/src/main/resources/assets/gadomancy/textures/items/core_border.png b/src/main/resources/assets/gadomancy/textures/items/core_border.png new file mode 100644 index 0000000..32cd8c4 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/core_border.png differ diff --git a/src/main/resources/assets/gadomancy/textures/items/core_core.png b/src/main/resources/assets/gadomancy/textures/items/core_core.png new file mode 100644 index 0000000..b08e172 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/core_core.png differ diff --git a/src/main/resources/assets/gadomancy/textures/items/core_core_blank.png b/src/main/resources/assets/gadomancy/textures/items/core_core_blank.png new file mode 100644 index 0000000..32b9b7e Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/core_core_blank.png differ diff --git a/src/main/resources/assets/gadomancy/textures/items/core_core_blank.png.mcmeta b/src/main/resources/assets/gadomancy/textures/items/core_core_blank.png.mcmeta new file mode 100644 index 0000000..4f0718a --- /dev/null +++ b/src/main/resources/assets/gadomancy/textures/items/core_core_blank.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file