mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 05:02:25 +00:00
#1450 Capacitor render bug. Fix obelisk block bounds.
This commit is contained in:
1 parent
6394b7961d
commit
fb66d0d181
7 files changed
+19
-26
No files matched your search
@@ -349,4 +349,8 @@ public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> exte
|
||||
public int getDefaultDisplayMask(World world, int x, int y, int z) {
|
||||
return IWailaInfoProvider.ALL_BITS;
|
||||
}
|
||||
|
||||
protected void setObeliskBounds() {
|
||||
setBlockBounds(0.11f, 0, 0.11f, 0.91f, 0.48f, 0.91f);
|
||||
}
|
||||
}
|
||||
@@ -2,15 +2,14 @@ package crazypants.enderio.machine.attractor;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.GuiHandler;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.AbstractMachineBlock;
|
||||
@@ -27,6 +26,7 @@ public class BlockAttractor extends AbstractMachineBlock<TileAttractor> {
|
||||
|
||||
protected BlockAttractor() {
|
||||
super(ModObject.blockAttractor, TileAttractor.class);
|
||||
setObeliskBounds();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -105,12 +105,7 @@ public class BlockAttractor extends AbstractMachineBlock<TileAttractor> {
|
||||
public int getRenderType() {
|
||||
return renderId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getSelectedBoundingBoxFromPool(World p_149633_1_, int x, int y, int z) {
|
||||
return AxisAlignedBB.getBoundingBox(x + 0.1, y, z + 0.1, x + 0.9, y + 0.5, z + 0.9);
|
||||
}
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
|
||||
@@ -128,9 +123,7 @@ public class BlockAttractor extends AbstractMachineBlock<TileAttractor> {
|
||||
fx.setRBGColorF(0.2f, 0.2f, 0.8f);
|
||||
fx.motionY *= 0.5f;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -143,7 +143,6 @@ public class ObeliskRenderer<T extends TileEntity> extends TileEntitySpecialRend
|
||||
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
|
||||
|
||||
BoundingBox bb = BoundingBox.UNIT_CUBE;
|
||||
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, null, world != null);
|
||||
|
||||
Tessellator.instance.addTranslation(x, y, z);
|
||||
|
||||
|
||||
@@ -46,7 +46,6 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl
|
||||
infoRenderers = new HashMap<InfoDisplayType, IInfoRenderer>();
|
||||
infoRenderers.put(InfoDisplayType.LEVEL_BAR, fillGaugeRenderer);
|
||||
infoRenderers.put(InfoDisplayType.IO, new IoDisplay());
|
||||
|
||||
}
|
||||
|
||||
//------- Block
|
||||
|
||||
@@ -9,7 +9,10 @@ import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.machine.capbank.CapBankType;
|
||||
import crazypants.enderio.machine.capbank.InfoDisplayType;
|
||||
@@ -46,6 +49,7 @@ public class FillGauge implements IInfoRenderer {
|
||||
private float barMinV;
|
||||
|
||||
FillGauge() {
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -164,6 +168,11 @@ public class FillGauge implements IInfoRenderer {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onTextureRestitch(TextureStitchEvent.Post event) {
|
||||
createVertexCache();
|
||||
}
|
||||
|
||||
private void createVertexCache() {
|
||||
barIcon = EnderIO.blockCapBank.getFillBarIcon();
|
||||
|
||||
@@ -13,10 +13,6 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.GuiHandler;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.AbstractMachineBlock;
|
||||
import crazypants.enderio.machine.attractor.BlockAttractor;
|
||||
import crazypants.enderio.machine.attractor.ContainerAttractor;
|
||||
import crazypants.enderio.machine.attractor.GuiAttractor;
|
||||
import crazypants.enderio.machine.attractor.TileAttractor;
|
||||
|
||||
public class BlockSpawnGuard extends AbstractMachineBlock<TileSpawnGuard> {
|
||||
|
||||
@@ -34,6 +30,7 @@ public class BlockSpawnGuard extends AbstractMachineBlock<TileSpawnGuard> {
|
||||
|
||||
protected BlockSpawnGuard() {
|
||||
super(ModObject.blockSpawnGuard, TileSpawnGuard.class);
|
||||
setObeliskBounds();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,28 +2,19 @@ package crazypants.enderio.machine.xp;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.BlockEio;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.GuiHandler;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.gui.IResourceTooltipProvider;
|
||||
import crazypants.enderio.machine.AbstractMachineBlock;
|
||||
import crazypants.enderio.machine.monitor.ContainerPowerMonitor;
|
||||
import crazypants.enderio.machine.tank.TileTank;
|
||||
import crazypants.enderio.xp.XpUtil;
|
||||
|
||||
public class BlockExperienceObelisk extends AbstractMachineBlock<TileExperienceOblisk> {
|
||||
|
||||
@@ -37,6 +28,7 @@ public class BlockExperienceObelisk extends AbstractMachineBlock<TileExperienceO
|
||||
|
||||
private BlockExperienceObelisk() {
|
||||
super(ModObject.blockExperienceObelisk, TileExperienceOblisk.class);
|
||||
setObeliskBounds();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user