Fixed missing texture errors, fixed bounding block particles, fixed Digital Miner in-world and item render

This commit is contained in:
aidancbrady committed 2016-05-11 23:48:10 -04:00
1 parent 20bef9c94f
commit 10098e300d
24 files changed
+50 -521

No files matched your search

@@ -224,7 +224,7 @@ public class ClientProxy extends CommonProxy
public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate",
"Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest",
"solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator", "security_desk",
"quantum_entangloporter", "resistive_heater", "EnergyCube"};
"quantum_entangloporter", "resistive_heater", "EnergyCube", "digital_miner"};
@Override
public void loadConfiguration()
@@ -250,7 +250,7 @@ public class ModelArmoredJetpack extends ModelBase
WingbladeL.render(size);
WingbladeR.render(size);
GL11.glColor4f(1, 1, 1, 1);
MekanismRenderer.resetColor();
GL11.glDisable(GL11.GL_CULL_FACE);
MekanismRenderer.glowOff();
MekanismRenderer.blendOff();
@@ -1,6 +1,7 @@
package mekanism.client.model;
import mekanism.api.EnumColor;
import mekanism.client.render.MekanismRenderer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GlStateManager;
@@ -67,7 +68,7 @@ public class ModelBalloon extends ModelBase
Balloon3.render(size);
Balloonnub.render(size);
GL11.glColor3f(1, 1, 1);
MekanismRenderer.resetColor();
GlStateManager.popMatrix();
GlStateManager.pushMatrix();
@@ -250,7 +250,7 @@ public class ModelGasMask extends ModelBase
glassbackL.render(size);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glColor4f(1, 1, 1, 1);
MekanismRenderer.resetColor();
MekanismRenderer.glowOff();
MekanismRenderer.blendOff();
@@ -196,7 +196,7 @@ public class ModelJetpack extends ModelBase
WingbladeL.render(size);
WingbladeR.render(size);
GL11.glColor4f(1, 1, 1, 1);
MekanismRenderer.resetColor();
GL11.glDisable(GL11.GL_CULL_FACE);
MekanismRenderer.glowOff();
MekanismRenderer.blendOff();
@@ -23,7 +23,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemModelMesher;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -36,6 +35,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Timer;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -129,8 +129,6 @@ public class MekanismRenderer
public static void registerItemRender(String domain, Item item)
{
ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
if(item instanceof IMetaItem)
{
IMetaItem metaItem = (IMetaItem)item;
@@ -144,7 +142,7 @@ public class MekanismRenderer
}
ModelResourceLocation loc = new ModelResourceLocation(domain + ":" + metaItem.getTexture(i), "inventory");
mesher.register(item, i, loc);
ModelLoader.setCustomModelResourceLocation(item, i, loc);
variants.add(loc);
ModelBakery.addVariantName(item, domain + ":" + metaItem.getTexture(i));
}
@@ -152,7 +150,7 @@ public class MekanismRenderer
return;
}
mesher.register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
}
@@ -35,6 +35,7 @@ public final class MinerVisualRenderer
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.8F);
mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture());
getList(new MinerRenderData(miner)).render();
MekanismRenderer.resetColor();
MekanismRenderer.glowOff();
MekanismRenderer.blendOff();
GlStateManager.popMatrix();
@@ -74,6 +74,7 @@ public class RenderFlame extends Render<EntityFlame>
}
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
MekanismRenderer.resetColor();
MekanismRenderer.glowOff();
MekanismRenderer.blendOff();
GlStateManager.popMatrix();
@@ -1,5 +1,6 @@
package mekanism.client.render.entity;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.MekanismBlocks;
import mekanism.common.entity.EntityObsidianTNT;
import net.minecraft.client.Minecraft;
@@ -59,7 +60,7 @@ public class RenderObsidianTNTPrimed extends Render<EntityObsidianTNT>
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);
MekanismRenderer.resetColor();
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_TEXTURE_2D);
@@ -10,6 +10,7 @@ import mekanism.client.model.ModelArmoredJetpack;
import mekanism.client.model.ModelAtomicDisassembler;
import mekanism.client.model.ModelChemicalCrystallizer;
import mekanism.client.model.ModelChemicalDissolutionChamber;
import mekanism.client.model.ModelDigitalMiner;
import mekanism.client.model.ModelEnergyCube;
import mekanism.client.model.ModelFlamethrower;
import mekanism.client.model.ModelFreeRunners;
@@ -67,6 +68,7 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.fluids.Fluid;
import org.apache.commons.lang3.tuple.Pair;
import org.lwjgl.opengl.GL11;
public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
{
@@ -94,6 +96,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
public static ModelResistiveHeater resistiveHeater = new ModelResistiveHeater();
public static ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter();
public static ModelEnergyCube energyCube = new ModelEnergyCube();
public static ModelDigitalMiner digitalMiner = new ModelDigitalMiner();
public BakedCustomItemModel(IBakedModel model, ItemStack s)
{
@@ -207,6 +210,13 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png"));
resistiveHeater.render(0.0625F, false, mc.renderEngine, true);
}
else if(machineType == MachineType.DIGITAL_MINER)
{
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(0.35F, 0.1F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png"));
digitalMiner.render(0.022F, false, mc.renderEngine);
}
return;
}
@@ -1,489 +0,0 @@
package mekanism.client.render.item;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ItemRenderingHandler// implements IItemRenderer
{
/*
private Minecraft mc = Minecraft.getMinecraft();
public ModelRobit robit = new ModelRobit();
public ModelChest personalChest = new ModelChest();
public ModelEnergyCube energyCube = new ModelEnergyCube();
public ModelEnergyCore energyCore = new ModelEnergyCore();
public ModelGasTank gasTank = new ModelGasTank();
public ModelObsidianTNT obsidianTNT = new ModelObsidianTNT();
public ModelJetpack jetpack = new ModelJetpack();
public ModelArmoredJetpack armoredJetpack = new ModelArmoredJetpack();
public ModelGasMask gasMask = new ModelGasMask();
public ModelScubaTank scubaTank = new ModelScubaTank();
public ModelFreeRunners freeRunners = new ModelFreeRunners();
public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler();
public ModelFlamethrower flamethrower = new ModelFlamethrower();
private final RenderBalloon balloonRenderer = new RenderBalloon();
private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class);
private final RenderFluidTank portableTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class);
private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class);
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
{
if(item.getItem() == MekanismItems.WalkieTalkie)
{
return type != ItemRenderType.INVENTORY;
}
return true;
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
{
return true;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
RenderBlocks renderBlocks = (RenderBlocks)data[0];
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON)
{
GlStateManager.translate(0.5F, 0.5F, 0.5F);
}
if(item.getItem() instanceof IEnergyCube)
{
EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getEnergyCubeTier(item);
IEnergizedItem energized = (IEnergizedItem)item.getItem();
mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture);
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(270F, 0.0F, -1.0F, 0.0F);
GlStateManager.translate(0.0F, -1.0F, 0.0F);
MekanismRenderer.blendOn();
energyCube.render(0.0625F, tier, mc.renderEngine);
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture);
energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine);
}
MekanismRenderer.blendOff();
GlStateManager.pushMatrix();
GL11.glTranslated(0.0, 1.0, 0.0);
mc.renderEngine.bindTexture(RenderEnergyCube.coreTexture);
GL11.glShadeModel(GL11.GL_SMOOTH);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
MekanismRenderer.glowOn();
EnumColor c = tier.getBaseTier().getColor();
GlStateManager.pushMatrix();
GlStateManager.scale(0.4F, 0.4F, 0.4F);
GL11.glColor4f(c.getColor(0), c.getColor(1), c.getColor(2), (float)(energized.getEnergy(item)/energized.getMaxEnergy(item)));
GlStateManager.translate(0, (float)Math.sin(Math.toRadians((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 3)) / 7, 0);
GlStateManager.rotate((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 0);
GlStateManager.rotate(36F + (MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 1);
energyCore.render(0.0625F);
GlStateManager.popMatrix();
MekanismRenderer.glowOff();
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glDisable(GL11.GL_LINE_SMOOTH);
GL11.glDisable(GL11.GL_POLYGON_SMOOTH);
GL11.glDisable(GL11.GL_BLEND);
GlStateManager.popMatrix();
}
else if(BasicType.get(item) == BasicType.INDUCTION_CELL || BasicType.get(item) == BasicType.INDUCTION_PROVIDER)
{
MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item);
}
else if(BasicType.get(item) == BasicType.BIN)
{
GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F);
MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item);
GlStateManager.rotate(-270, 0.0F, 1.0F, 0.0F);
if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()* / == null)
{
return;
}
InventoryBin inv = new InventoryBin(item);
ForgeDirection side = ForgeDirection.getOrientation(2);
String amount = "";
ItemStack itemStack = inv.getStack();
if(itemStack != null)
{
amount = Integer.toString(inv.getItemCount());
}
MekanismRenderer.glowOn();
if(itemStack != null)
{
GlStateManager.pushMatrix();
if(!(itemStack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemStack.getItem()).getRenderType() != 0)
{
GlStateManager.rotate(180, 0, 0, 1);
GlStateManager.translate(-1.02F, -0.2F, 0);
if(type == ItemRenderType.INVENTORY)
{
GlStateManager.translate(-0.45F, -0.4F, 0.0F);
}
}
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY)
{
GlStateManager.translate(-0.22F, -0.2F, -0.22F);
}
GL11.glTranslated(0.73, 0.08, 0.44);
GlStateManager.rotate(90, 0, 1, 0);
float scale = 0.03125F;
float scaler = 0.9F;
GlStateManager.scale(scale*scaler, scale*scaler, 0);
TextureManager renderEngine = mc.renderEngine;
GL11.glDisable(GL11.GL_LIGHTING);
renderItem.renderItemAndEffectIntoGUI(binRenderer.func_147498_b()/*getFontRenderer()* /, renderEngine, itemStack, 0, 0);
GL11.glEnable(GL11.GL_LIGHTING);
GlStateManager.popMatrix();
}
MekanismRenderer.glowOff();
if(amount != "")
{
float maxScale = 0.02F;
GlStateManager.pushMatrix();
GL11.glPolygonOffset(-10, -10);
GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL);
float displayWidth = 1 - (2 / 16);
float displayHeight = 1 - (2 / 16);
GlStateManager.translate(0, -0.31F, 0);
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY)
{
GL11.glTranslated(-0.5, -0.4, -0.5);
}
GlStateManager.translate(0, 0.9F, 1);
GlStateManager.rotate(90, 0, 1, 0);
GlStateManager.rotate(90, 1, 0, 0);
GlStateManager.translate(displayWidth / 2, 1F, displayHeight / 2);
GlStateManager.rotate(-90, 1, 0, 0);
FontRenderer fontRenderer = binRenderer.func_147498_b();//getFontRenderer();
int requiredWidth = Math.max(fontRenderer.getStringWidth(amount), 1);
int lineHeight = fontRenderer.FONT_HEIGHT + 2;
int requiredHeight = lineHeight * 1;
float scaler = 0.4F;
float scaleX = (displayWidth / requiredWidth);
float scale = scaleX * scaler;
if(maxScale > 0)
{
scale = Math.min(scale, maxScale);
}
GlStateManager.scale(scale, -scale, scale);
GL11.glDepthMask(false);
int offsetX;
int offsetY;
int realHeight = (int)Math.floor(displayHeight / scale);
int realWidth = (int)Math.floor(displayWidth / scale);
offsetX = (realWidth - requiredWidth) / 2;
offsetY = (realHeight - requiredHeight) / 2;
GL11.glDisable(GL11.GL_LIGHTING);
fontRenderer.drawString("\u00a7f" + amount, offsetX - (realWidth / 2), 1 + offsetY - (realHeight / 2), 1);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDepthMask(true);
GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL);
GlStateManager.popMatrix();
}
}
else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank)
{
GlStateManager.pushMatrix();
BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png"));
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F);
GlStateManager.translate(0.0F, -1.0F, 0.0F);
gasTank.render(0.0625F);
GlStateManager.popMatrix();
}
else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT)
{
GlStateManager.pushMatrix();
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png"));
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(180F, 0.0F, -1.0F, 0.0F);
GlStateManager.translate(0.0F, -1.0F, 0.0F);
obsidianTNT.render(0.0625F);
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemWalkieTalkie)
{
if(((ItemWalkieTalkie)item.getItem()).getOn(item))
{
MekanismRenderer.glowOn();
}
MekanismRenderer.renderItem(item);
if(((ItemWalkieTalkie)item.getItem()).getOn(item))
{
MekanismRenderer.glowOff();
}
}
else if(MachineType.get(item) == MachineType.PERSONAL_CHEST)
{
GlStateManager.pushMatrix();
ItemBlockMachine chest = (ItemBlockMachine)item.getItem();
GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F);
GlStateManager.translate(-0.5F, -0.5F, -0.5F);
GlStateManager.translate(0, 1.0F, 1.0F);
GlStateManager.scale(1.0F, -1F, -1F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png"));
personalChest.renderAll();
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemRobit)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F);
GlStateManager.translate(0.0F, -1.5F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png"));
robit.render(0.08F);
GlStateManager.popMatrix();
}
else if(item.getItem() == MekanismItems.Jetpack)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F);
GlStateManager.translate(0.2F, -0.35F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png"));
jetpack.render(0.0625F);
GlStateManager.popMatrix();
}
else if(item.getItem() == MekanismItems.ArmoredJetpack)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F);
GlStateManager.translate(0.2F, -0.35F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png"));
armoredJetpack.render(0.0625F);
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemGasMask)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F);
GlStateManager.translate(0.1F, 0.2F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png"));
gasMask.render(0.0625F);
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemScubaTank)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F);
GlStateManager.scale(1.6F, 1.6F, 1.6F);
GlStateManager.translate(0.2F, -0.5F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png"));
scubaTank.render(0.0625F);
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemFreeRunners)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F);
GlStateManager.scale(2.0F, 2.0F, 2.0F);
GlStateManager.translate(0.2F, -1.43F, 0.12F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png"));
freeRunners.render(0.0625F);
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemBalloon)
{
GlStateManager.pushMatrix();
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON)
{
GlStateManager.scale(2.5F, 2.5F, 2.5F);
GlStateManager.translate(0.2F, 0, 0.1F);
GlStateManager.rotate(15, -1, 0, 1);
balloonRenderer.render(((ItemBalloon)item.getItem()).getColor(item), 0, 1.9F, 0);
}
else {
balloonRenderer.render(((ItemBalloon)item.getItem()).getColor(item), 0, 1, 0);
}
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemAtomicDisassembler)
{
GlStateManager.pushMatrix();
GlStateManager.scale(1.4F, 1.4F, 1.4F);
GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F);
if(type == ItemRenderType.EQUIPPED)
{
GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(50, 1.0F, 0.0F, 0.0F);
GlStateManager.scale(2.0F, 2.0F, 2.0F);
GlStateManager.translate(0.0F, -0.4F, 0.4F);
}
else if(type == ItemRenderType.INVENTORY)
{
GlStateManager.rotate(225, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(45, -1.0F, 0.0F, -1.0F);
GlStateManager.scale(0.6F, 0.6F, 0.6F);
GlStateManager.translate(0.0F, -0.2F, 0.0F);
}
else {
GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F);
GlStateManager.translate(0.0F, -0.7F, 0.0F);
}
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png"));
atomicDisassembler.render(0.0625F);
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemPartTransmitter)
{
GlStateManager.pushMatrix();
GL11.glTranslated(-0.5, -0.5, -0.5);
MekanismRenderer.blendOn();
GL11.glDisable(GL11.GL_CULL_FACE);
RenderPartTransmitter.getInstance().renderItem(TransmitterType.values()[item.getItemDamage()]);
GL11.glEnable(GL11.GL_CULL_FACE);
MekanismRenderer.blendOff();
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemGlowPanel)
{
GlStateManager.pushMatrix();
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
GL11.glTranslated(-0.5, -0.5, -0.5);
double d = 0.15;
GL11.glTranslated(d, d, d);
GL11.glScaled(2, 2, 2);
GL11.glTranslated(0.4-2*d, -2*d, -2*d);
GL11.glDisable(GL11.GL_CULL_FACE);
RenderHelper.disableStandardItemLighting();
RenderGlowPanel.getInstance().renderItem(item.getItemDamage());
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopAttrib();
GlStateManager.popMatrix();
}
else if(item.getItem() instanceof ItemFlamethrower)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(160, 0.0F, 0.0F, 1.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png"));
GlStateManager.translate(0.0F, -1.0F, 0.0F);
GlStateManager.rotate(135, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(-20, 0.0F, 0.0F, 1.0F);
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON)
{
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON)
{
GlStateManager.rotate(55, 0.0F, 1.0F, 0.0F);
}
else {
GlStateManager.translate(0.0F, 0.5F, 0.0F);
}
GlStateManager.scale(2.5F, 2.5F, 2.5F);
GlStateManager.translate(0.0F, -1.0F, -0.5F);
}
else if(type == ItemRenderType.INVENTORY)
{
GlStateManager.translate(-0.6F, 0.0F, 0.0F);
GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F);
}
flamethrower.render(0.0625F);
GlStateManager.popMatrix();
}
else if(MachineType.get(item) == MachineType.FLUID_TANK)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(270F, 0.0F, -1.0F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png"));
ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem();
float targetScale = (float)(itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).amount : 0)/itemMachine.getCapacity(item);
FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()];
Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null;
portableTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5);
GlStateManager.popMatrix();
}
else {
if(item.getItem() instanceof ItemBlockMachine)
{
MachineType machine = MachineType.get(item);
if(machine == MachineType.BASIC_FACTORY || machine == MachineType.ADVANCED_FACTORY || machine == MachineType.ELITE_FACTORY)
{
GlStateManager.rotate(-90F, 0.0F, 1.0F, 0.0F);
MekanismRenderer.renderCustomItem(((RenderBlocks)data[0]), item);
}
else {
RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.MACHINE_RENDER_ID);
}
}
else if(item.getItem() instanceof ItemBlockBasic)
{
RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.BASIC_RENDER_ID);
}
}
}
*/
}
@@ -71,6 +71,8 @@ public class RenderConfigurableMachine<S extends TileEntity & ISideConfiguration
int display = getOverlayDisplay(pos.sideHit, type).display;
GL11.glCallList(display);
MekanismRenderer.resetColor();
pop();
}
@@ -46,6 +46,8 @@ public class RenderTeleporter extends TileEntitySpecialRenderer<TileEntityTelepo
int display = getOverlayDisplay(type).display;
GL11.glCallList(display);
MekanismRenderer.resetColor();
pop();
}
@@ -153,7 +153,7 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere
displays[i].endList();
}
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
MekanismRenderer.resetColor();
return displays;
}
@@ -1407,7 +1407,6 @@ public class Mekanism
packetHandler.initialize();
//Load proxy
proxy.registerItemRenders();
proxy.loadUtilities();
//Completion notification
@@ -172,5 +172,7 @@ public class MekanismItems
MinecraftForge.EVENT_BUS.register(GasMask);
MinecraftForge.EVENT_BUS.register(FreeRunners);
Mekanism.proxy.registerItemRenders();
}
}
@@ -47,15 +47,6 @@ public class BlockBounding extends Block
return isAdvanced ? 1 : 0;
}
/*
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
{
blockIcon = register.registerIcon(BlockBasic.ICON_BASE);
}
*/
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ)
{
@@ -145,6 +136,12 @@ public class BlockBounding extends Block
{
return false;
}
@Override
public boolean isFullCube()
{
return false;
}
@Override
public boolean hasTileEntity(IBlockState state)
@@ -159,8 +156,7 @@ public class BlockBounding extends Block
{
return new TileEntityAdvancedBoundingBlock();
}
else
{
else {
return new TileEntityBoundingBlock();
}
}
@@ -156,9 +156,9 @@ public class BlockStateMachine extends ExtendedBlockState
SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false, Plane.HORIZONTAL, true),
AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false, Predicates.alwaysFalse(), true),
OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false, Plane.HORIZONTAL, true),
RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false, Predicates.alwaysTrue(), true),
FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true, Predicates.alwaysTrue(), true),
FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false, Predicates.alwaysTrue(), true);
RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false, Plane.HORIZONTAL, true),
FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true, Plane.HORIZONTAL, true),
FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false, Plane.HORIZONTAL, true);
public MachineBlock typeBlock;
public int meta;
@@ -408,7 +408,7 @@ public class BlockStateMachine extends ExtendedBlockState
@Override
public boolean apply(MachineType input)
{
return input.typeBlock == machineBlock;
return input.typeBlock == machineBlock && input.isValidMachine();
}
}
@@ -8,7 +8,7 @@ import net.minecraft.item.Item;
public class ToolsClientProxy extends ToolsCommonProxy
{
@Override
public void registerRenderInformation()
public void registerItemRenders()
{
//Vanilla Material Paxels
registerItemRender(ToolsItems.WoodPaxel);
@@ -79,7 +79,6 @@ public class MekanismTools implements IModule
//Load the proxy
proxy.loadConfiguration();
proxy.registerRenderInformation();
//Load this module
addRecipes();
@@ -18,5 +18,5 @@ public class ToolsCommonProxy
}
}
public void registerRenderInformation() {}
public void registerItemRenders() {}
}
@@ -289,5 +289,7 @@ public class ToolsItems
GameRegistry.registerItem(SteelChestplate, "SteelChestplate");
GameRegistry.registerItem(SteelLeggings, "SteelLeggings");
GameRegistry.registerItem(SteelBoots, "SteelBoots");
MekanismTools.proxy.registerItemRenders();
}
}