Loads and loads of render work. I can see the light at the end of the tunnel

- Finished CTM
- BasicBlock item rendering
- Balloon item rendering
- Plastic Fence item rendering
- Started work on Portable Tank fluid item rendering
- Fixed Obsidian TNT and Bin rendering
This commit is contained in:
aidancbrady committed 2016-05-10 15:38:12 -04:00
1 parent 98c57960d1
commit 730ee4e450
41 files changed
+759 -386

No files matched your search

+265 -44
View File
@@ -1,10 +1,14 @@
package mekanism.client;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.client;
import mekanism.api.MekanismConfig.general;
import mekanism.api.Pos3D;
@@ -71,6 +75,7 @@ import mekanism.client.render.entity.RenderBalloon;
import mekanism.client.render.entity.RenderFlame;
import mekanism.client.render.entity.RenderObsidianTNTPrimed;
import mekanism.client.render.entity.RenderRobit;
import mekanism.client.render.item.FluidTankItemModel;
import mekanism.client.render.tileentity.RenderBin;
import mekanism.client.render.tileentity.RenderChargepad;
import mekanism.client.render.tileentity.RenderChemicalCrystallizer;
@@ -101,16 +106,27 @@ import mekanism.client.render.tileentity.RenderThermalEvaporationController;
import mekanism.client.render.tileentity.RenderThermoelectricBoiler;
import mekanism.common.CommonProxy;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.Tier.GasTankTier;
import mekanism.common.base.IEnergyCube;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.states.BlockStateBasic.BasicBlockType;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.block.states.BlockStateOre.EnumOreType;
import mekanism.common.entity.EntityBabySkeleton;
import mekanism.common.entity.EntityBalloon;
import mekanism.common.entity.EntityFlame;
import mekanism.common.entity.EntityObsidianTNT;
import mekanism.common.entity.EntityRobit;
import mekanism.common.inventory.InventoryPersonalChest;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemCraftingFormula;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.item.ItemSeismicReader;
@@ -179,6 +195,7 @@ import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderSkeleton;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.entity.monster.EntitySkeleton;
@@ -189,7 +206,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.FMLClientHandler;
@@ -197,6 +216,7 @@ import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
@@ -211,6 +231,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ClientProxy extends CommonProxy
{
public static Map<String, ModelResourceLocation> machineResources = new HashMap<String, ModelResourceLocation>();
public static Map<String, ModelResourceLocation> basicResources = new HashMap<String, ModelResourceLocation>();
public static ModelResourceLocation TANK_MODEL = new ModelResourceLocation("mekanism:fluid_tank", "inventory");
@Override
public void loadConfiguration()
@@ -236,14 +259,6 @@ public class ClientProxy extends CommonProxy
}
}
/*
@Override
public int getArmorIndex(String string)
{
return RenderingRegistry.addNewArmourRendererPrefix(string);
}
*/
@Override
public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos)
{
@@ -329,42 +344,8 @@ public class ClientProxy extends CommonProxy
}
@Override
public void registerRenderInformation()
public void registerItemRenders()
{
//TODO RenderPartTransmitter.init();
//TODO RenderGlowPanel.init();
//Register item handler
//TODO ItemRenderingHandler handler = new ItemRenderingHandler();
/*TODO
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.EnergyCube), handler);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock), handler);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), handler);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.Robit, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.WalkieTalkie, handler);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.GasTank), handler);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), handler);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.BasicBlock), handler);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.Jetpack, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.ArmoredJetpack, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.PartTransmitter, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.GasMask, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.ScubaTank, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.Balloon, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.FreeRunners, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.AtomicDisassembler, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.GlowPanel, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.Flamethrower, handler);
//Register block handlers
RenderingRegistry.registerBlockHandler(new MachineRenderingHandler());
RenderingRegistry.registerBlockHandler(new BasicRenderingHandler());
RenderingRegistry.registerBlockHandler(new PlasticRenderingHandler());
RenderingRegistry.registerBlockHandler(new CTMRenderingHandler());
*/
// registerItemRender(MekanismItems.PartTransmitter);
registerItemRender(MekanismItems.ElectricBow);
registerItemRender(MekanismItems.Dust);
@@ -428,8 +409,236 @@ public class ClientProxy extends CommonProxy
ModelBakery.registerItemVariants(MekanismItems.CraftingFormula, ItemCraftingFormula.MODEL,
ItemCraftingFormula.INVALID_MODEL, ItemCraftingFormula.ENCODED_MODEL);
}
@Override
public void registerBlockRenders()
{
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true"));
Mekanism.logger.info("Render registrations complete.");
for(MachineType type : MachineType.values())
{
List<ModelResourceLocation> modelsToAdd = new ArrayList<ModelResourceLocation>();
String resource = "mekanism:" + type.getName();
RecipeType recipePointer = null;
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
recipePointer = RecipeType.values()[0];
resource = "mekanism:" + type.getName() + "_" + recipePointer.getName();
}
while(true)
{
if(machineResources.get(resource) == null)
{
List<String> entries = new ArrayList<String>();
if(type.hasActiveTexture())
{
entries.add("active=false");
}
if(type.hasRotations())
{
entries.add("facing=north");
}
String properties = new String();
for(int i = 0; i < entries.size(); i++)
{
properties += entries.get(i);
if(i < entries.size()-1)
{
properties += ",";
}
}
if(type == MachineType.FLUID_TANK)
{
properties = "inventory";
}
ModelResourceLocation model = new ModelResourceLocation(resource, properties);
machineResources.put(resource, model);
modelsToAdd.add(model);
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
if(recipePointer.ordinal() < RecipeType.values().length-1)
{
recipePointer = RecipeType.values()[recipePointer.ordinal()+1];
resource = "mekanism:" + type.getName() + "_" + recipePointer.getName();
continue;
}
}
}
break;
}
ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {}));
}
for(BasicBlockType type : BasicBlockType.values())
{
List<ModelResourceLocation> modelsToAdd = new ArrayList<ModelResourceLocation>();
String resource = "mekanism:" + type.getName();
BaseTier tierPointer = null;
if(type.tiers)
{
tierPointer = BaseTier.values()[0];
resource = "mekanism:" + type.getName() + "_" + tierPointer.getName();
}
while(true)
{
if(machineResources.get(resource) == null)
{
List<String> entries = new ArrayList<String>();
if(type.hasActiveTexture())
{
entries.add("active=false");
}
if(type.hasRotations() || type == BasicBlockType.THERMAL_EVAPORATION_CONTROLLER)
{
entries.add("facing=north");
}
String properties = new String();
for(int i = 0; i < entries.size(); i++)
{
properties += entries.get(i);
if(i < entries.size()-1)
{
properties += ",";
}
}
ModelResourceLocation model = new ModelResourceLocation(resource, properties);
basicResources.put(resource, model);
modelsToAdd.add(model);
if(type.tiers)
{
if(tierPointer.ordinal() < BaseTier.values().length-1)
{
tierPointer = BaseTier.values()[tierPointer.ordinal()+1];
resource = "mekanism:" + type.getName() + "_" + tierPointer.getName();
continue;
}
}
}
break;
}
ModelLoader.registerItemVariants(Item.getItemFromBlock(type.blockType.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {}));
}
for(EnumColor color : EnumColor.DYES)
{
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory"));
}
for(EnumOreType ore : EnumOreType.values())
{
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName()));
}
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack);
ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube");
return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier);
}
});
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()];
ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank");
return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier);
}
});
ItemMeshDefinition machineMesher = new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
MachineType type = MachineType.get(stack);
if(type != null)
{
String resource = "mekanism:" + type.getName();
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)];
resource = "mekanism:" + type.getName() + "_" + recipe.getName();
}
return machineResources.get(resource);
}
return null;
}
};
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher);
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher);
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher);
ItemMeshDefinition basicMesher = new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
BasicBlockType type = BasicBlockType.get(stack);
if(type != null)
{
String resource = "mekanism:" + type.getName();
if(type.tiers)
{
BaseTier tier = ((ItemBlockBasic)stack.getItem()).getBaseTier(stack);
resource = "mekanism:" + type.getName() + "_" + tier.getName();
}
return basicResources.get(resource);
}
return null;
}
};
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher);
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher);
}
public void registerItemRender(Item item)
@@ -642,6 +851,17 @@ public class ClientProxy extends CommonProxy
HolidayManager.init();
}
/* @SubscribeEvent
public void onModelBake(ModelBakeEvent event) throws IOException
{
Object obj = event.modelRegistry.getObject(TANK_MODEL);
if(obj instanceof IBakedModel)
{
event.modelRegistry.putObject(TANK_MODEL, new FluidTankItemModel((IBakedModel)obj));
}
}*/
@Override
public void preInit()
@@ -649,6 +869,7 @@ public class ClientProxy extends CommonProxy
MekanismRenderer.init();
MinecraftForge.EVENT_BUS.register(new CTMRegistry());
MinecraftForge.EVENT_BUS.register(this);
//Register entity rendering handlers
RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory<EntityObsidianTNT>() {
@@ -26,7 +26,7 @@ public class CTMRegistry
private IBakedModel baseModel;
public static ResourceLocation baseResource = new ResourceLocation("mekanism:block/ctm_block");
public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port_input", "induction_port_output",
public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port", "induction_port_output",
"induction_cell_basic", "induction_cell_advanced", "induction_cell_elite", "induction_cell_ultimate", "induction_provider_basic", "induction_provider_advanced", "induction_provider_elite",
"induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", "reactor_port",
"reactor_neutron_capture", "reactor_logic_adapter", "reactor_laser_focus", "reactor_glass", "reactor_frame", "reactor_controller_on", "reactor_controller_off", "boiler_casing", "boiler_valve",
@@ -1,25 +1,23 @@
package mekanism.client.render.entity;
import mekanism.client.model.ModelObsidianTNT;
import mekanism.common.MekanismBlocks;
import mekanism.common.entity.EntityObsidianTNT;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class RenderObsidianTNTPrimed extends Render<EntityObsidianTNT>
{
private ModelObsidianTNT model = new ModelObsidianTNT();
public RenderObsidianTNTPrimed(RenderManager renderManager)
{
super(renderManager);
@@ -27,36 +25,27 @@ public class RenderObsidianTNTPrimed extends Render<EntityObsidianTNT>
}
@Override
public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float f, float f1)
public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float entityYaw, float partialTicks)
{
BlockRendererDispatcher renderer = Minecraft.getMinecraft().getBlockRendererDispatcher();
GL11.glPushMatrix();
GL11.glTranslatef((float)x, (float)y+1.2F, (float)z);
GL11.glScalef(0.8F, 0.8F, 0.8F);
GL11.glRotatef(180, 1, 0, 0);
GL11.glTranslatef((float)x, (float)y+0.5F, (float)z);
if((entityobsidiantnt.fuse - f1) + 1.0F < 10F)
{
float scale = 1.0F - ((entityobsidiantnt.fuse - f1) + 1.0F) / 10F;
if(entityobsidiantnt.fuse - partialTicks + 1.0F < 10.0F)
{
float f = 1.0F - (entityobsidiantnt.fuse - partialTicks + 1.0F) / 10.0F;
f = MathHelper.clamp_float(f, 0.0F, 1.0F);
f = f * f;
f = f * f;
float f1 = 1.0F + f * 0.3F;
GlStateManager.scale(f1, f1, f1);
}
if(scale < 0.0F)
{
scale = 0.0F;
}
if(scale > 1.0F)
{
scale = 1.0F;
}
scale *= scale;
scale *= scale;
float renderScale = 1.0F + scale * 0.3F;
GL11.glScalef(renderScale, renderScale, renderScale);
}
float f3 = (1.0F - ((entityobsidiantnt.fuse - f1) + 1.0F) / 100F) * 0.8F;
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png"));
model.render(0.0625F);
float f3 = (1.0F - ((entityobsidiantnt.fuse - partialTicks) + 1.0F) / 100F) * 0.8F;
bindEntityTexture(entityobsidiantnt);
GlStateManager.translate(-0.5F, -0.5F, 0.5F);
renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), entityobsidiantnt.getBrightness(partialTicks));
GlStateManager.translate(0.0F, 0.0F, 1.0F);
if(entityobsidiantnt.fuse / 5 % 2 == 0)
{
@@ -65,7 +54,11 @@ public class RenderObsidianTNTPrimed extends Render<EntityObsidianTNT>
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA);
GL11.glColor4f(1.0F, 1.0F, 1.0F, f3);
model.render(0.0625F);
GlStateManager.doPolygonOffset(-3.0F, -3.0F);
GlStateManager.enablePolygonOffset();
renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), 1.0F);
GlStateManager.doPolygonOffset(0.0F, 0.0F);
GlStateManager.disablePolygonOffset();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_LIGHTING);
@@ -0,0 +1,126 @@
package mekanism.client.render.item;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.util.EnumFacing;
public class BakedFluidModel implements IBakedModel
{
public static final int STAGES = 16;
public static final HashMap<String, IBakedModel>[] MODELS = new HashMap[STAGES];
static
{
for(int x = 0; x < STAGES; x++)
{
MODELS[x] = new HashMap<String, IBakedModel>();
}
}
private IBakedModel baseModel;
private String fluidName;
private int fluidLevel;
private boolean cullFluidTop;
public BakedFluidModel(IBakedModel model, String id, int level, boolean cullTop)
{
baseModel = model;
fluidName = id;
fluidLevel = level;
cullFluidTop = cullTop;
}
@Override
public List<BakedQuad> getFaceQuads(EnumFacing facing)
{
List<BakedQuad> faceQuads = new LinkedList<BakedQuad>();
faceQuads.addAll(baseModel.getFaceQuads(facing));
if(fluidLevel > 0 && fluidLevel <= STAGES)
{
HashMap<String, IBakedModel> fluidModels = MODELS[fluidLevel - 1];
if(fluidModels.containsKey(fluidName))
{
faceQuads.addAll(fluidModels.get(fluidName).getFaceQuads(facing));
}
}
return faceQuads;
}
@Override
public List<BakedQuad> getGeneralQuads()
{
List<BakedQuad> generalQuads = new LinkedList<BakedQuad>();
generalQuads.addAll(baseModel.getGeneralQuads());
if(fluidLevel > 0 && fluidLevel <= STAGES)
{
HashMap<String, IBakedModel> fluidModels = MODELS[fluidLevel - 1];
if(fluidModels.containsKey(fluidName))
{
// The fluid model needs a separate culling logic from the rest of the tank,
// because the top of the fluid is supposed to be visible if the tank block
// above is empty. (getGeneralQuads() handles quads that don't have a cullface
// annotation in the .json)
if(cullFluidTop)
{
for(BakedQuad quad : fluidModels.get(fluidName).getGeneralQuads())
{
if(quad.getFace() != EnumFacing.UP)
{
generalQuads.add(quad);
}
}
}
else {
generalQuads.addAll(fluidModels.get(fluidName).getGeneralQuads());
}
}
}
return generalQuads;
}
@Override
public boolean isAmbientOcclusion()
{
return baseModel.isAmbientOcclusion();
}
@Override
public boolean isGui3d()
{
return baseModel.isGui3d();
}
@Override
public boolean isBuiltInRenderer()
{
return baseModel.isBuiltInRenderer();
}
@Override
public TextureAtlasSprite getParticleTexture()
{
return baseModel.getParticleTexture();
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
return baseModel.getItemCameraTransforms();
}
}
@@ -0,0 +1,82 @@
package mekanism.client.render.item;
import java.util.HashMap;
import java.util.List;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.client.model.ISmartItemModel;
public class FluidTankItemModel implements ISmartItemModel
{
public static final int STAGES = 16;
public static final HashMap<String, IBakedModel>[] MODELS = new HashMap[STAGES];
static
{
for(int x = 0; x < STAGES; x++)
{
MODELS[x] = new HashMap<String, IBakedModel>();
}
}
private IBakedModel baseModel;
public FluidTankItemModel(IBakedModel base)
{
baseModel = base;
}
@Override
public IBakedModel handleItemState(ItemStack stack)
{
return null;
}
@Override
public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_)
{
throw new UnsupportedOperationException();
}
@Override
public List<BakedQuad> getGeneralQuads()
{
throw new UnsupportedOperationException();
}
@Override
public boolean isAmbientOcclusion()
{
throw new UnsupportedOperationException();
}
@Override
public boolean isGui3d()
{
throw new UnsupportedOperationException();
}
@Override
public boolean isBuiltInRenderer()
{
throw new UnsupportedOperationException();
}
@Override
public TextureAtlasSprite getParticleTexture()
{
throw new UnsupportedOperationException();
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
throw new UnsupportedOperationException();
}
}
@@ -5,19 +5,15 @@ import mekanism.client.render.MekanismRenderer;
import mekanism.common.tile.TileEntityBin;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class RenderBin extends TileEntitySpecialRenderer<TileEntityBin>
{
@@ -41,8 +37,7 @@ public class RenderBin extends TileEntitySpecialRenderer<TileEntityBin>
return;
}
doLight(tileEntity.getWorld(), obj);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
MekanismRenderer.glowOn();
if(itemStack != null)
{
@@ -70,15 +65,11 @@ public class RenderBin extends TileEntitySpecialRenderer<TileEntityBin>
float scale = 0.03125F;
float scaler = 0.9F;
GL11.glScalef(scale*scaler, scale*scaler, 0);
GL11.glScalef(scale*scaler, scale*scaler, -0.0001F);
GL11.glRotatef(180, 0, 0, 1);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST);
renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}
@@ -87,21 +78,7 @@ public class RenderBin extends TileEntitySpecialRenderer<TileEntityBin>
renderText(amount, tileEntity.facing, 0.02F, x, y - 0.31F, z);
}
}
private void doLight(World world, Coord4D obj)
{
if(obj.getBlockState(world).getBlock().isOpaqueCube())
{
return;
}
int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj.getPos());
int lightX = brightness % 65536;
int lightY = brightness / 65536;
float scale = 0.6F;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightX * scale, lightY * scale);
MekanismRenderer.glowOff();
}
@SuppressWarnings("incomplete-switch")
+5 -10
View File
@@ -226,19 +226,14 @@ public class CommonProxy implements IGuiProvider
public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) {}
/**
* Register and load client-only render information.
* Register and load client-only item render information.
*/
public void registerRenderInformation() {}
public void registerItemRenders() {}
/**
* Gets the armor index number from ClientProxy.
* @param string - armor indicator
* @return armor index number
* Register and load client-only block render information.
*/
public int getArmorIndex(String string)
{
return 0;
}
public void registerBlockRenders() {}
/**
* Set and load the mod's common configuration properties.
+1 -1
View File
@@ -1379,7 +1379,7 @@ public class Mekanism
packetHandler.initialize();
//Load proxy
proxy.registerRenderInformation();
proxy.registerItemRenders();
proxy.loadUtilities();
//Completion notification
@@ -5,16 +5,6 @@ import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOC
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.EnumColor;
import mekanism.client.ClientProxy;
import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.Tier.GasTankTier;
import mekanism.common.base.IEnergyCube;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.block.BlockBasic;
import mekanism.common.block.BlockBounding;
import mekanism.common.block.BlockCardboardBox;
@@ -28,11 +18,8 @@ import mekanism.common.block.BlockPlasticFence;
import mekanism.common.block.BlockPlasticFence.PlasticFenceStateMapper;
import mekanism.common.block.BlockSalt;
import mekanism.common.block.states.BlockStateBasic.BasicBlockStateMapper;
import mekanism.common.block.states.BlockStateBasic.BasicBlockType;
import mekanism.common.block.states.BlockStateCardboardBox.CardboardBoxStateMapper;
import mekanism.common.block.states.BlockStateMachine.MachineBlockStateMapper;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.block.states.BlockStateOre.EnumOreType;
import mekanism.common.block.states.BlockStatePlastic.PlasticBlockStateMapper;
import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType;
import mekanism.common.item.ItemBlockBasic;
@@ -43,12 +30,7 @@ import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemBlockOre;
import mekanism.common.item.ItemBlockPlastic;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.statemap.IStateMapper;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@@ -118,167 +100,6 @@ public class MekanismBlocks
ModelLoader.setCustomStateMapper(PlasticFence, fenceMapper);
ModelLoader.setCustomStateMapper(CardboardBox, boxMapper);
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true"));
for(MachineType type : MachineType.values())
{
List<ModelResourceLocation> modelsToAdd = new ArrayList<ModelResourceLocation>();
String resource = "mekanism:" + type.getName();
RecipeType recipePointer = null;
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
recipePointer = RecipeType.values()[0];
resource = "mekanism:" + type.getName() + "_" + recipePointer.getName();
}
while(true)
{
if(ClientProxy.machineResources.get(resource) == null)
{
List<String> entries = new ArrayList<String>();
if(type.hasActiveTexture())
{
entries.add("active=false");
}
if(type.hasRotations())
{
entries.add("facing=north");
}
String properties = new String();
for(int i = 0; i < entries.size(); i++)
{
properties += entries.get(i);
if(i < entries.size()-1)
{
properties += ",";
}
}
ModelResourceLocation model = new ModelResourceLocation(resource, properties);
ClientProxy.machineResources.put(resource, model);
modelsToAdd.add(model);
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
if(recipePointer.ordinal() < RecipeType.values().length-1)
{
recipePointer = RecipeType.values()[recipePointer.ordinal()+1];
resource = "mekanism:" + type.getName() + "_" + recipePointer.getName();
continue;
}
}
}
break;
}
ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {}));
}
for(BasicBlockType type : BasicBlockType.values())
{
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory"));
}
for(EnumColor color : EnumColor.DYES)
{
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory"));
}
for(EnumOreType ore : EnumOreType.values())
{
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName()));
}
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack);
ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube");
return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier);
}
});
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()];
ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank");
return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier);
}
});
ItemMeshDefinition machineMesher = new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
MachineType type = MachineType.get(stack);
if(type != null)
{
String resource = "mekanism:" + type.getName();
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)];
resource = "mekanism:" + type.getName() + "_" + recipe.getName();
}
return ClientProxy.machineResources.get(resource);
}
return null;
}
};
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher);
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher);
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher);
ItemMeshDefinition basicMesher = new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
MachineType type = MachineType.get(stack);
if(type != null)
{
String resource = "mekanism:" + type.getName();
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)];
resource = "mekanism:" + type.getName() + "_" + recipe.getName();
}
return ClientProxy.machineResources.get(resource);
}
return null;
}
};
//ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher);
//ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher);
Mekanism.proxy.registerBlockRenders();
}
}
@@ -176,6 +176,11 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple
state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityInductionProvider)tile).tier.getBaseTier());
}
if(tile instanceof TileEntityBin)
{
state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityBin)tile).tier.getBaseTier());
}
if(tile instanceof TileEntityInductionPort)
{
state = state.withProperty(BlockStateBasic.activeProperty, ((TileEntityInductionPort)tile).mode);
@@ -1008,7 +1013,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple
if(type == BasicBlockType.INDUCTION_PORT)
{
return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "output" : "input");
return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_output" : "");
}
return null;
@@ -91,7 +91,7 @@ public class BlockStateBasic extends ExtendedBlockState
COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false, Predicates.<EnumFacing>alwaysFalse(), false, false),
REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.<EnumFacing>alwaysFalse(), false, false),
STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.<EnumFacing>alwaysFalse(), false, false),
BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, false),
BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, true),
TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.<EnumFacing>alwaysFalse(), false, false),
STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.<EnumFacing>alwaysFalse(), false, false),
DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.<EnumFacing>alwaysFalse(), false, false),
@@ -21,6 +21,8 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemBalloon extends ItemMekanism implements IMetaItem
{
@@ -34,7 +36,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem
@Override
public String getTexture(int meta)
{
return EnumColor.DYES[meta].getOreDictName() + "Balloon";
return "Balloon";
}
@Override
@@ -42,6 +44,14 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem
{
return EnumColor.DYES.length;
}
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int renderPass)
{
EnumColor dye = getColor(stack);
return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255);
}
public EnumColor getColor(ItemStack stack)
{
@@ -74,7 +84,10 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem
world.spawnEntityInWorld(new EntityBalloon(world, pos.xCoord-0.5, pos.yCoord-0.25, pos.zCoord-0.5, getColor(itemstack)));
}
itemstack.stackSize--;
if(!entityplayer.capabilities.isCreativeMode)
{
itemstack.stackSize--;
}
return itemstack;
}
@@ -242,6 +255,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem
}
stack.stackSize--;
return stack;
}
}
@@ -1,6 +1,5 @@
package mekanism.tools.common;
import mekanism.common.Mekanism;
import mekanism.tools.item.ItemMekanismArmor;
import mekanism.tools.item.ItemMekanismAxe;
import mekanism.tools.item.ItemMekanismHoe;
@@ -108,60 +107,60 @@ public class ToolsItems
GlowstoneShovel = new ItemMekanismShovel(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneShovel");
GlowstoneHoe = new ItemMekanismHoe(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneHoe");
GlowstoneSword = new ItemMekanismSword(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneSword");
GlowstoneHelmet = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 0).setUnlocalizedName("GlowstoneHelmet");
GlowstoneChestplate = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 1).setUnlocalizedName("GlowstoneChestplate");
GlowstoneLeggings = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 2).setUnlocalizedName("GlowstoneLeggings");
GlowstoneBoots = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 3).setUnlocalizedName("GlowstoneBoots");
GlowstoneHelmet = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 0).setUnlocalizedName("GlowstoneHelmet");
GlowstoneChestplate = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 1).setUnlocalizedName("GlowstoneChestplate");
GlowstoneLeggings = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 2).setUnlocalizedName("GlowstoneLeggings");
GlowstoneBoots = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 3).setUnlocalizedName("GlowstoneBoots");
BronzePaxel = new ItemMekanismPaxel(MekanismTools.toolBRONZE2).setUnlocalizedName("BronzePaxel");
BronzePickaxe = new ItemMekanismPickaxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzePickaxe");
BronzeAxe = new ItemMekanismAxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeAxe");
BronzeShovel = new ItemMekanismShovel(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeShovel");
BronzeHoe = new ItemMekanismHoe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeHoe");
BronzeSword = new ItemMekanismSword(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeSword");
BronzeHelmet = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet");
BronzeChestplate = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate");
BronzeLeggings = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 2)).setUnlocalizedName("BronzeLeggings");
BronzeBoots = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 3)).setUnlocalizedName("BronzeBoots");
BronzeHelmet = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 0)).setUnlocalizedName("BronzeHelmet");
BronzeChestplate = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 1)).setUnlocalizedName("BronzeChestplate");
BronzeLeggings = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 2)).setUnlocalizedName("BronzeLeggings");
BronzeBoots = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 3)).setUnlocalizedName("BronzeBoots");
OsmiumPaxel = new ItemMekanismPaxel(MekanismTools.toolOSMIUM2).setUnlocalizedName("OsmiumPaxel");
OsmiumPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumPickaxe");
OsmiumAxe = new ItemMekanismAxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumAxe");
OsmiumShovel = new ItemMekanismShovel(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumShovel");
OsmiumHoe = new ItemMekanismHoe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumHoe");
OsmiumSword = new ItemMekanismSword(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumSword");
OsmiumHelmet = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 0)).setUnlocalizedName("OsmiumHelmet");
OsmiumChestplate = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 1)).setUnlocalizedName("OsmiumChestplate");
OsmiumLeggings = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 2)).setUnlocalizedName("OsmiumLeggings");
OsmiumBoots = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 3)).setUnlocalizedName("OsmiumBoots");
OsmiumHelmet = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 0)).setUnlocalizedName("OsmiumHelmet");
OsmiumChestplate = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 1)).setUnlocalizedName("OsmiumChestplate");
OsmiumLeggings = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 2)).setUnlocalizedName("OsmiumLeggings");
OsmiumBoots = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 3)).setUnlocalizedName("OsmiumBoots");
ObsidianPaxel = new ItemMekanismPaxel(MekanismTools.toolOBSIDIAN2).setUnlocalizedName("ObsidianPaxel");
ObsidianPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianPickaxe");
ObsidianAxe = new ItemMekanismAxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianAxe");
ObsidianShovel = new ItemMekanismShovel(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianShovel");
ObsidianHoe = new ItemMekanismHoe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianHoe");
ObsidianSword = new ItemMekanismSword(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianSword");
ObsidianHelmet = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 0)).setUnlocalizedName("ObsidianHelmet");
ObsidianChestplate = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 1)).setUnlocalizedName("ObsidianChestplate");
ObsidianLeggings = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 2)).setUnlocalizedName("ObsidianLeggings");
ObsidianBoots = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 3)).setUnlocalizedName("ObsidianBoots");
ObsidianHelmet = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 0)).setUnlocalizedName("ObsidianHelmet");
ObsidianChestplate = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 1)).setUnlocalizedName("ObsidianChestplate");
ObsidianLeggings = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 2)).setUnlocalizedName("ObsidianLeggings");
ObsidianBoots = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 3)).setUnlocalizedName("ObsidianBoots");
LazuliPaxel = new ItemMekanismPaxel(MekanismTools.toolLAZULI2).setUnlocalizedName("LazuliPaxel");
LazuliPickaxe = new ItemMekanismPickaxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliPickaxe");
LazuliAxe = new ItemMekanismAxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliAxe");
LazuliShovel = new ItemMekanismShovel(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliShovel");
LazuliHoe = new ItemMekanismHoe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliHoe");
LazuliSword = new ItemMekanismSword(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliSword");
LazuliHelmet = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 0)).setUnlocalizedName("LazuliHelmet");
LazuliChestplate = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 1)).setUnlocalizedName("LazuliChestplate");
LazuliLeggings = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 2)).setUnlocalizedName("LazuliLeggings");
LazuliBoots = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 3)).setUnlocalizedName("LazuliBoots");
LazuliHelmet = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 0)).setUnlocalizedName("LazuliHelmet");
LazuliChestplate = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 1)).setUnlocalizedName("LazuliChestplate");
LazuliLeggings = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 2)).setUnlocalizedName("LazuliLeggings");
LazuliBoots = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 3)).setUnlocalizedName("LazuliBoots");
SteelPaxel = new ItemMekanismPaxel(MekanismTools.toolSTEEL2).setUnlocalizedName("SteelPaxel");
SteelPickaxe = new ItemMekanismPickaxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelPickaxe");
SteelAxe = new ItemMekanismAxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelAxe");
SteelShovel = new ItemMekanismShovel(MekanismTools.toolSTEEL).setUnlocalizedName("SteelShovel");
SteelHoe = new ItemMekanismHoe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelHoe");
SteelSword = new ItemMekanismSword(MekanismTools.toolSTEEL).setUnlocalizedName("SteelSword");
SteelHelmet = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet");
SteelChestplate = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate");
SteelLeggings = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 2).setUnlocalizedName("SteelLeggings");
SteelBoots = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 3).setUnlocalizedName("SteelBoots");
SteelHelmet = new ItemMekanismArmor(MekanismTools.armorSTEEL, 0).setUnlocalizedName("SteelHelmet");
SteelChestplate = new ItemMekanismArmor(MekanismTools.armorSTEEL, 1).setUnlocalizedName("SteelChestplate");
SteelLeggings = new ItemMekanismArmor(MekanismTools.armorSTEEL, 2).setUnlocalizedName("SteelLeggings");
SteelBoots = new ItemMekanismArmor(MekanismTools.armorSTEEL, 3).setUnlocalizedName("SteelBoots");
}
public static void setHarvestLevels()
@@ -21,9 +21,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemMekanismArmor extends ItemArmor
{
public ItemMekanismArmor(ArmorMaterial enumarmormaterial, int renderIndex, int armorType)
public ItemMekanismArmor(ArmorMaterial enumarmormaterial, int renderIndex)
{
super(enumarmormaterial, renderIndex, armorType);
super(enumarmormaterial, renderIndex, 0);
setCreativeTab(Mekanism.tabMekanism);
}
@@ -33,14 +33,6 @@ public class ItemMekanismArmor extends ItemArmor
list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage()));
}
/*
@Override
public void registerIcons(IIconRegister register)
{
itemIcon = register.registerIcon("mekanism:" + getUnlocalizedName().replace("item.", ""));
}
*/
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{