Fix brewery rendering and operation

This commit is contained in:
Vincent Lee committed 2015-12-27 22:38:26 -06:00
1 parent 90fcc98bd0
commit bf07f10ac7
6 files changed
+20 -37

No files matched your search

@@ -67,7 +67,7 @@ public class MultiblockBlockAccess implements IBlockAccess {
@Override
public WorldType getWorldType() {
return null; // todo 1.8
return WorldType.DEFAULT;
}
@Override
@@ -463,7 +463,7 @@ public class ClientProxy extends CommonProxy {
}
}
private static boolean noclipEnabled = false;
private static boolean noclipEnabled = true;
private static boolean corruptSparkle = false;
@Override
@@ -59,9 +59,11 @@ public class ModelBrewery extends ModelBase {
GlStateManager.rotate(polerot, 0F, 1F, 0F);
if(render.brewery.getStackInSlot(0) != null) {
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F);
GlStateManager.translate(0, -0.45, 0);
//GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F);
render.renderItemStack(render.brewery.getStackInSlot(0));
GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F);
//GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F);
GlStateManager.translate(0, 0.45, 0);
GlStateManager.rotate(-180F, 1F, 0F, 0F);
}
@@ -86,7 +88,9 @@ public class ModelBrewery extends ModelBase {
GlStateManager.rotate(rot, 0F, 1F, 0F);
GlStateManager.translate(transX, transY, transZ);
GlStateManager.rotate(-90F, 1F, 0F, 0F);
GlStateManager.translate(0.125, 0.125, 0);
render.renderItemStack(render.brewery.getStackInSlot(i + 1));
GlStateManager.translate(-0.125, -0.125, 0);
GlStateManager.rotate(90F, 1F, 0F, 0F);
GlStateManager.translate(-transX, -transY, -transZ);
GlStateManager.rotate(-rot, 0F, 1F, 0F);
@@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.item.EntityItem;
@@ -65,43 +66,14 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer {
public void renderItemStack(ItemStack stack) {
if(stack != null) {
Minecraft mc = Minecraft.getMinecraft();
GlStateManager.pushMatrix();
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
float s = 0.25F;
GlStateManager.scale(s, s, s);
GlStateManager.scale(2F, 2F, 2F);
// mc.getRenderItem().renderItemModel(stack); // todo 1.8
// if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) {
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) {
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
// GlStateManager.translate(1F, 1.1F, 0F);
// GlStateManager.pushMatrix();
// RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F);
// GlStateManager.popMatrix();
// GlStateManager.translate(-1F, -1.1F, 0F);
// GlStateManager.scale(2F, 2F, 2F);
// } else {
// int renderPass = 0;
// do {
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
// if(icon != null) {
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
// float f = icon.getMinU();
// float f1 = icon.getMaxU();
// float f2 = icon.getMinV();
// float f3 = icon.getMaxV();
//
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
// GlStateManager.color(1F, 1F, 1F);
// }
// renderPass++;
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
// }
// }
mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND);
GlStateManager.scale(1F / s, 1F / s, 1F / s);
GlStateManager.popMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
}
}
@@ -29,7 +29,6 @@ import org.lwjgl.opengl.GL11;
// I HAVE NO IDEA WHAT I'M DOING
// SO MUCH STUFF I DON'T UNDERSTAND D:
// HELP
// todo 1.8 copied directly from new class, so need to update to be what botania was. possibly json model for frame, tesr for starfield
public class RenderTileStarfield extends TileEntitySpecialRenderer {
private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png");
@@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile;
import java.awt.Color;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.item.EntityItem;
@@ -20,9 +21,11 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
import net.minecraft.util.ITickable;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.IBrewContainer;
import vazkii.botania.api.brew.IBrewItem;
@@ -45,6 +48,11 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory,
int manaLastTick = 0;
public int signal = 0;
@Override
public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}
public boolean addItem(EntityPlayer player, ItemStack stack) {
if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer)
return false;