diff --git a/src/main/java/com/hbm/blocks/machine/GeigerCounter.java b/src/main/java/com/hbm/blocks/machine/GeigerCounter.java index d7dab303a..b9d3e933c 100644 --- a/src/main/java/com/hbm/blocks/machine/GeigerCounter.java +++ b/src/main/java/com/hbm/blocks/machine/GeigerCounter.java @@ -24,26 +24,26 @@ public class GeigerCounter extends BlockContainer { public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileEntityGeiger(); } - + @Override public int getRenderType(){ return -1; } - + @Override public boolean isOpaqueCube() { return false; } - + @Override public boolean renderAsNormalBlock() { return false; } - + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - + if(i == 0) { world.setBlockMetadataWithNotify(x, y, z, 3, 2); @@ -61,57 +61,61 @@ public class GeigerCounter extends BlockContainer { world.setBlockMetadataWithNotify(x, y, z, 5, 2); } } - + @Override public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) { int te = p_149719_1_.getBlockMetadata(p_149719_2_, p_149719_3_, p_149719_4_); float f = 0.0625F; - + this.setBlockBounds(0.0F, 0.0F, 2*f, 1.0F, 1.0F, 14*f); switch(te) { case 4: - this.setBlockBounds(2*f, 0.0F, 1*f, 14*f, 9*f, 15*f); + this.setBlockBounds(0*f, 0.0F, 0*f, 14*f, 9*f, 14.5F*f); break; case 2: - this.setBlockBounds(1*f, 0.0F, 2*f, 15*f, 9*f, 14*f); + this.setBlockBounds(1.5F*f, 0.0F, 0*f, 16*f, 9*f, 14*f); break; case 5: - this.setBlockBounds(2*f, 0.0F, 1*f, 14*f, 9*f, 15*f); + this.setBlockBounds(2*f, 0.0F, 1.5F*f, 16*f, 9*f, 16*f); break; case 3: - this.setBlockBounds(1*f, 0.0F, 2*f, 15*f, 9*f, 14*f); + this.setBlockBounds(0*f, 0.0F, 2*f, 14.5F*f, 9*f, 16*f); break; } } - + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - + // xyz,xyz (negative, positive) int te = world.getBlockMetadata(x, y, z); float f = 0.0625F; - + this.setBlockBounds(0.0F, 0.0F, 2*f, 1.0F, 1.0F, 14*f); switch(te) { + // FACING WEST case 4: - this.setBlockBounds(2*f, 0.0F, 1*f, 14*f, 9*f, 15*f); + this.setBlockBounds(0*f, 0.0F, 0*f, 14*f, 9*f, 14.5F*f); break; + // FACING NORTH case 2: - this.setBlockBounds(1*f, 0.0F, 2*f, 15*f, 9*f, 14*f); + this.setBlockBounds(1.5F*f, 0.0F, 0*f, 16*f, 9*f, 14*f); break; + // FACING EAST case 5: - this.setBlockBounds(2*f, 0.0F, 1*f, 14*f, 9*f, 15*f); + this.setBlockBounds(2*f, 0.0F, 1.5F*f, 16*f, 9*f, 16*f); break; + // FACING SOUTH case 3: - this.setBlockBounds(1*f, 0.0F, 2*f, 15*f, 9*f, 14*f); + this.setBlockBounds(0*f, 0.0F, 2*f, 14.5F*f, 9*f, 16*f); break; } - + return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } - + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index ecbfcd42a..9b36cf4d3 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -277,6 +277,7 @@ public class ClientProxy extends ServerProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineEPress.class, new RenderEPress()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineAmmoPress.class, new RenderAmmoPress()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadGen.class, new RenderRadGen()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGeiger.class, new RenderGeiger()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadarNT.class, new RenderRadar()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadarLarge.class, new RenderRadarLarge()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadarScreen.class, new RenderRadarScreen()); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 07ee1615c..17d352e19 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -112,7 +112,7 @@ public class ResourceManager { //Cooling Tower public static final IModelCustom tower_small = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/tower_small.obj")).asVBO(); public static final IModelCustom tower_large = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/tower_large.obj")).asVBO(); - + //Air stuff public static final IModelCustom intake = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/intake.obj")).asVBO(); public static final IModelCustom condenser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/condenser.obj")).asVBO(); @@ -231,6 +231,8 @@ public class ResourceManager { //Radgen public static final IModelCustom radgen = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/radgen.obj")); + //Geiger Counter + public static final IModelCustom geiger = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/geiger_counter.obj")).asVBO(); //Small Reactor public static final IModelCustom reactor_small_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/reactors/reactor_small_base.obj")); @@ -659,6 +661,8 @@ public class ResourceManager { //Radgen public static final ResourceLocation radgen_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/radgen.png"); + //Geiger Counter + public static final ResourceLocation geiger_tex = new ResourceLocation(RefStrings.MODID, "textures/blocks/geiger.png"); //Small Reactor public static final ResourceLocation reactor_small_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/reactor_small_base.png"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderDecoBlock.java b/src/main/java/com/hbm/render/tileentity/RenderDecoBlock.java index 724423e3c..ddcdafaee 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderDecoBlock.java +++ b/src/main/java/com/hbm/render/tileentity/RenderDecoBlock.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.render.model.ModelBroadcaster; -import com.hbm.render.model.ModelGeiger; import com.hbm.render.model.ModelRadio; import com.hbm.render.model.ModelSteelRoof; @@ -21,30 +20,27 @@ public class RenderDecoBlock extends TileEntitySpecialRenderer { private static final ResourceLocation texture6 = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/ModelBroadcaster.png"); private static final ResourceLocation texture7 = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/ModelRadio.png"); private static final ResourceLocation texture8 = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/ModelRadioReceiver.png"); - private static final ResourceLocation texture9 = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/ModelGeiger.png"); - + private ModelSteelRoof model3; private ModelBroadcaster model6; private ModelRadio model7; - private ModelGeiger model8; - + public RenderDecoBlock() { this.model3 = new ModelSteelRoof(); this.model6 = new ModelBroadcaster(); this.model7 = new ModelRadio(); - this.model8 = new ModelGeiger(); } - + @Override public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); GL11.glRotatef(180, 0F, 0F, 1F); - + GL11.glEnable(GL11.GL_LIGHTING); - + Block b = tileentity.getWorldObj().getBlock(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord); - + if(b == ModBlocks.steel_roof) { this.bindTexture(texture3); } @@ -58,16 +54,6 @@ public class RenderDecoBlock extends TileEntitySpecialRenderer { case 3: GL11.glRotatef(0, 0F, 1F, 0F); break; } } - if(b == ModBlocks.geiger) { - this.bindTexture(texture9); - switch(tileentity.getBlockMetadata()) - { - case 4: GL11.glRotatef(90, 0F, 1F, 0F); break; - case 2: GL11.glRotatef(180, 0F, 1F, 0F); break; - case 5: GL11.glRotatef(270, 0F, 1F, 0F); break; - case 3: GL11.glRotatef(0, 0F, 1F, 0F); break; - } - } if(b == ModBlocks.radiorec) { this.bindTexture(texture8); switch(tileentity.getBlockMetadata()) @@ -93,15 +79,14 @@ public class RenderDecoBlock extends TileEntitySpecialRenderer { } GL11.glTranslatef(0, 0, 1); } - + GL11.glPushMatrix(); if(b == ModBlocks.steel_roof) this.model3.renderModel(0.0625F); if(b == ModBlocks.broadcaster_pc) this.model6.renderModel(0.0625F); - if(b== ModBlocks.geiger) this.model8.renderModel(0.0625F); if(b == ModBlocks.radiobox) this.model7.renderModel(0.0625F, tileentity.getBlockMetadata() > 5 ? 160 : 20); if(b == ModBlocks.radiorec) this.model6.renderModel(0.0625F); GL11.glPopMatrix(); - + if(b == ModBlocks.boxcar) { GL11.glRotatef(180, 0F, 0F, 1F); diff --git a/src/main/java/com/hbm/render/tileentity/RenderGeiger.java b/src/main/java/com/hbm/render/tileentity/RenderGeiger.java new file mode 100644 index 000000000..1fe30607e --- /dev/null +++ b/src/main/java/com/hbm/render/tileentity/RenderGeiger.java @@ -0,0 +1,61 @@ +package com.hbm.render.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.blocks.ModBlocks; +import com.hbm.main.ResourceManager; +import com.hbm.render.item.ItemRenderBase; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.IItemRenderer; +public class RenderGeiger extends TileEntitySpecialRenderer implements IItemRendererProvider { + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + switch(tileEntity.getBlockMetadata()) { + case 2: GL11.glRotatef(0, 0F, 1F, 0F); break; + case 4: GL11.glRotatef(90, 0F, 1F, 0F); break; + case 3: GL11.glRotatef(180, 0F, 1F, 0F); break; + case 5: GL11.glRotatef(270, 0F, 1F, 0F); break; + } + + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.geiger_tex); + ResourceManager.geiger.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + + GL11.glEnable(GL11.GL_CULL_FACE); + + GL11.glPopMatrix(); + } + @Override + public Item getItemForRenderer() { + return Item.getItemFromBlock(ModBlocks.geiger); + } + + @Override + public IItemRenderer getRenderer() { + return new ItemRenderBase() { + public void renderInventory() { + GL11.glScaled(10, 10, 10); + } + + public void renderCommon() { + GL11.glTranslated(0.2F, 0, 0); + GL11.glRotated(90, 0, 1, 0); + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glDisable(GL11.GL_CULL_FACE); + bindTexture(ResourceManager.geiger_tex); + ResourceManager.geiger.renderAll(); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glShadeModel(GL11.GL_FLAT); + } + }; + } +} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java b/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java index 4ad991c38..6d88426b1 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java @@ -10,29 +10,32 @@ import com.hbm.util.ContaminationUtil; import api.hbm.tile.IInfoProviderEC; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) public class TileEntityGeiger extends TileEntity implements SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent { - + int timer = 0; int ticker = 0; - + @Override public void updateEntity() { - + timer++; - + if(timer == 10) { timer = 0; ticker = check(); } - + if(timer % 5 == 0) { if(ticker > 0) { List list = new ArrayList(); @@ -53,16 +56,16 @@ public class TileEntityGeiger extends TileEntity implements SimpleComponent, IIn list.add(5); if(ticker > 25) list.add(6); - + int r = list.get(worldObj.rand.nextInt(list.size())); - + if(r > 0) worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:item.geiger" + r, 1.0F, 1.0F); } else if(worldObj.rand.nextInt(50) == 0) { worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:item.geiger"+ (1 + worldObj.rand.nextInt(1)), 1.0F, 1.0F); } } - + } public int check() { @@ -86,5 +89,17 @@ public class TileEntityGeiger extends TileEntity implements SimpleComponent, IIn int rads = check(); String chunkPrefix = ContaminationUtil.getPreffixFromRad(rads); data.setString(CompatEnergyControl.S_CHUNKRAD, chunkPrefix + rads + " RAD/s"); + + } + @Override + public AxisAlignedBB getRenderBoundingBox() { + return TileEntity.INFINITE_EXTENT_AABB; + } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; } } diff --git a/src/main/resources/assets/hbm/models/blocks/geiger_counter.obj b/src/main/resources/assets/hbm/models/blocks/geiger_counter.obj new file mode 100644 index 000000000..ed48ab2ee --- /dev/null +++ b/src/main/resources/assets/hbm/models/blocks/geiger_counter.obj @@ -0,0 +1,724 @@ +# Blender 4.0.2 +# www.blender.org +mtllib geiger_counter.mtl +o Cube.001 +v -0.250000 0.088388 0.062500 +v -0.224112 0.062500 0.062500 +v -0.224112 0.500000 0.062500 +v -0.250000 0.474112 0.062500 +v -0.250000 0.000000 -0.312500 +v -0.312500 0.062500 -0.312500 +v -0.312500 0.500000 -0.312500 +v -0.250000 0.562500 -0.312500 +v 0.411612 0.062500 0.062500 +v 0.437500 0.088388 0.062500 +v 0.437500 0.474112 0.062500 +v 0.411612 0.500000 0.062500 +v 0.500000 0.062500 -0.312500 +v 0.437500 0.000000 -0.312500 +v 0.437500 0.562500 -0.312500 +v 0.500000 0.500000 -0.312500 +v -0.250000 0.000000 0.062500 +v -0.312500 0.062500 0.062500 +v -0.312500 0.500000 0.062500 +v -0.250000 0.562500 0.062500 +v 0.500000 0.062500 0.062500 +v 0.437500 0.000000 0.062500 +v 0.437500 0.562500 0.062500 +v 0.500000 0.500000 0.062500 +v -0.224112 0.062500 0.000000 +v -0.250000 0.088388 0.000000 +v -0.250000 0.474112 0.000000 +v -0.224112 0.500000 0.000000 +v 0.437500 0.088388 0.000000 +v 0.411612 0.062500 0.000000 +v 0.411612 0.500000 0.000000 +v 0.437500 0.474112 0.000000 +v -0.250000 0.000000 -0.312500 +v -0.250000 0.562500 -0.312500 +v 0.437500 0.000000 -0.312500 +v 0.437500 0.562500 -0.312500 +v -0.250000 0.000000 0.062500 +v -0.250000 0.562500 0.062500 +v 0.437500 0.000000 0.062500 +v 0.437500 0.562500 0.062500 +v -0.312500 0.375000 -0.312500 +v 0.500000 0.375000 -0.312500 +v 0.500000 0.375000 -0.500000 +v -0.312500 0.375000 -0.500000 +v -0.312500 0.062500 -0.312500 +v -0.250000 0.000000 -0.312500 +v -0.250000 0.000000 -0.500000 +v -0.312500 0.062500 -0.500000 +v 0.437500 0.000000 -0.312500 +v 0.500000 0.062500 -0.312500 +v 0.500000 0.062500 -0.500000 +v 0.437500 0.000000 -0.500000 +v 0.281250 0.375000 0.000000 +v 0.281250 0.375000 0.062500 +v 0.325444 0.356694 0.000000 +v 0.325444 0.356694 0.062500 +v 0.343750 0.312500 0.000000 +v 0.343750 0.312500 0.062500 +v 0.325444 0.268306 0.000000 +v 0.325444 0.268306 0.062500 +v 0.281250 0.250000 0.000000 +v 0.281250 0.250000 0.062500 +v 0.237056 0.268306 0.000000 +v 0.237056 0.268306 0.062500 +v 0.218750 0.312500 0.000000 +v 0.218750 0.312500 0.062500 +v 0.237056 0.356694 0.000000 +v 0.237056 0.356694 0.062500 +v -0.187500 0.187500 0.031250 +v -0.187500 0.437500 0.031250 +v -0.187500 0.187500 -0.031250 +v -0.187500 0.437500 -0.031250 +v 0.187500 0.187500 0.031250 +v 0.187500 0.437500 0.031250 +v 0.187500 0.187500 -0.031250 +v 0.187500 0.437500 -0.031250 +v -0.125000 0.000000 0.318750 +v -0.125000 0.056250 0.375000 +v -0.125000 0.131250 0.375000 +v -0.125000 0.187500 0.318750 +v -0.125000 0.056250 0.187500 +v -0.125000 0.000000 0.243750 +v -0.125000 0.187500 0.243750 +v -0.125000 0.131250 0.187500 +v 0.375000 0.056250 0.375000 +v 0.375000 0.000000 0.318750 +v 0.375000 0.187500 0.318750 +v 0.375000 0.131250 0.375000 +v 0.375000 0.000000 0.243750 +v 0.375000 0.056250 0.187500 +v 0.375000 0.131250 0.187500 +v 0.375000 0.187500 0.243750 +v -0.125000 0.000000 0.318750 +v -0.125000 0.056250 0.375000 +v -0.125000 0.131250 0.375000 +v -0.125000 0.187500 0.318750 +v -0.125000 0.056250 0.187500 +v -0.125000 0.000000 0.243750 +v -0.125000 0.187500 0.243750 +v -0.125000 0.131250 0.187500 +v 0.375000 0.056250 0.375000 +v 0.375000 0.000000 0.318750 +v 0.375000 0.187500 0.318750 +v 0.375000 0.131250 0.375000 +v 0.375000 0.000000 0.243750 +v 0.375000 0.056250 0.187500 +v 0.375000 0.131250 0.187500 +v 0.375000 0.187500 0.243750 +v -0.187500 0.562500 -0.062500 +v -0.187500 0.562500 -0.125000 +v -0.125000 0.562500 -0.062500 +v -0.125000 0.687500 -0.062500 +v -0.125000 0.562500 -0.125000 +v -0.125000 0.687500 -0.125000 +v 0.312500 0.562500 -0.062500 +v 0.312500 0.687500 -0.062500 +v 0.312500 0.562500 -0.125000 +v 0.312500 0.687500 -0.125000 +v 0.375000 0.562500 -0.062500 +v 0.375000 0.562500 -0.125000 +v -0.187500 0.625000 -0.062500 +v -0.187500 0.625000 -0.125000 +v 0.375000 0.625000 -0.062500 +v 0.375000 0.625000 -0.125000 +v -0.125000 0.625000 -0.062500 +v -0.125000 0.687500 -0.062500 +v -0.125000 0.625000 -0.125000 +v -0.125000 0.687500 -0.125000 +v 0.312500 0.625000 -0.062500 +v 0.312500 0.687500 -0.062500 +v 0.312500 0.625000 -0.125000 +v 0.312500 0.687500 -0.125000 +v -0.406250 0.000000 0.312500 +v -0.406250 0.062500 0.312500 +v -0.406250 0.000000 -0.187500 +v -0.406250 0.062500 -0.187500 +v -0.343750 0.000000 0.312500 +v -0.343750 0.062500 0.312500 +v -0.343750 0.000000 -0.187500 +v -0.343750 0.062500 -0.187500 +v -0.343750 0.000000 0.312500 +v -0.343750 0.062500 0.312500 +v -0.343750 0.000000 0.250000 +v -0.343750 0.062500 0.250000 +v -0.187500 0.000000 0.312500 +v -0.187500 0.062500 0.312500 +v -0.187500 0.000000 0.250000 +v -0.187500 0.062500 0.250000 +v -0.187500 0.000000 0.312500 +v -0.187500 0.125000 0.312500 +v -0.187500 0.000000 0.250000 +v -0.187500 0.125000 0.250000 +v -0.125000 0.000000 0.312500 +v -0.125000 0.125000 0.312500 +v -0.125000 0.000000 0.250000 +v -0.125000 0.125000 0.250000 +v -0.406250 0.000000 -0.187500 +v -0.406250 0.343750 -0.187500 +v -0.406250 0.000000 -0.250000 +v -0.406250 0.343750 -0.250000 +v -0.343750 0.000000 -0.187500 +v -0.343750 0.343750 -0.187500 +v -0.343750 0.000000 -0.250000 +v -0.343750 0.343750 -0.250000 +v 0.117518 0.562744 -0.174255 +v 0.365085 0.562744 -0.139462 +v 0.134915 0.562744 -0.298038 +v 0.382482 0.562744 -0.263245 +v -0.281250 0.375000 -0.218750 +v -0.343750 0.375000 -0.218750 +v -0.281250 0.356694 -0.174556 +v -0.343750 0.356694 -0.174556 +v -0.281250 0.312500 -0.156250 +v -0.343750 0.312500 -0.156250 +v -0.281250 0.268306 -0.174556 +v -0.343750 0.268306 -0.174556 +v -0.281250 0.250000 -0.218750 +v -0.343750 0.250000 -0.218750 +v -0.281250 0.268306 -0.262944 +v -0.343750 0.268306 -0.262944 +v -0.281250 0.312500 -0.281250 +v -0.343750 0.312500 -0.281250 +v -0.281250 0.356694 -0.262944 +v -0.343750 0.356694 -0.262944 +vn 0.7071 0.7071 -0.0000 +vn 1.0000 -0.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 0.7071 -0.0000 +vn 0.7071 -0.7071 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -0.0000 0.3827 0.9239 +vn -0.0000 -0.3827 0.9239 +vn -0.0000 0.9239 -0.3827 +vn -0.0000 0.9239 0.3827 +vn -0.0000 0.3827 -0.9239 +vn -0.0000 -0.3827 -0.9239 +vn -0.0000 -0.9239 -0.3827 +vn -0.0000 -0.9239 0.3827 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vt 0.708278 0.727278 +vt 0.728085 0.738881 +vt 0.708278 0.738881 +vt 0.454545 0.872727 +vt 0.345455 0.745455 +vt 0.454545 0.745455 +vt 0.109091 0.872727 +vt 0.000000 0.745455 +vt 0.109091 0.745455 +vt 0.672711 0.890896 +vt 0.454565 0.872717 +vt 0.472744 0.727287 +vt 0.109091 0.727273 +vt 0.000000 0.727273 +vt 0.000000 0.890909 +vt 0.109091 0.890909 +vt 0.454545 0.727273 +vt 0.345455 0.727273 +vt 0.345455 0.890909 +vt 0.454545 0.890909 +vt 0.127289 0.752995 +vt 0.127289 0.727287 +vt 0.134819 0.745465 +vt 0.134819 0.872717 +vt 0.109111 0.872717 +vt 0.127289 0.865187 +vt 0.319726 0.745465 +vt 0.345435 0.745465 +vt 0.327256 0.752995 +vt 0.327256 0.865187 +vt 0.327256 0.890896 +vt 0.319726 0.872717 +vt 0.327256 0.727287 +vt 0.109111 0.745466 +vt 0.345435 0.872717 +vt 0.127289 0.890896 +vt 0.919727 0.872717 +vt 0.727289 0.865187 +vt 0.734819 0.745465 +vt 0.745460 0.890755 +vt 0.927267 0.872882 +vt 0.927267 0.890755 +vt 0.728085 0.861119 +vt 0.708278 0.861119 +vt 0.945455 0.872722 +vt 0.927273 0.861119 +vt 0.945455 0.861119 +vt 0.728085 0.872722 +vt 0.708278 0.872722 +vt 0.927273 0.738881 +vt 0.945455 0.738881 +vt 0.927267 0.727427 +vt 0.745460 0.745301 +vt 0.745460 0.727427 +vt 0.927273 0.727278 +vt 0.945455 0.727278 +vt 0.127273 1.000000 +vt 0.327273 0.890909 +vt 0.327273 1.000000 +vt 0.327273 0.618182 +vt 0.127273 0.727273 +vt 0.127273 0.618182 +vt 0.290909 0.454545 +vt 0.054545 0.545455 +vt 0.072727 0.436364 +vt 0.272727 0.381818 +vt 0.272727 0.436364 +vt 0.290909 0.545455 +vt 0.054545 0.600000 +vt 0.000000 0.454545 +vt 0.054545 0.454545 +vt 0.345455 0.436364 +vt 0.290909 0.436364 +vt 0.054545 0.436364 +vt 0.000000 0.436364 +vt 0.345455 0.545455 +vt 0.345455 0.454545 +vt 0.672727 0.481818 +vt 0.654545 0.500000 +vt 0.654545 0.481818 +vt 0.672727 0.500000 +vt 0.654545 0.518182 +vt 0.672727 0.518182 +vt 0.654545 0.536364 +vt 0.672727 0.536364 +vt 0.654545 0.554545 +vt 0.672727 0.554545 +vt 0.654545 0.572727 +vt 0.672727 0.572727 +vt 0.654545 0.590909 +vt 0.721947 0.478052 +vt 0.696234 0.478052 +vt 0.696234 0.503765 +vt 0.672727 0.590909 +vt 0.654545 0.609091 +vt 0.672727 0.609091 +vt 0.654545 0.627273 +vt 0.381818 0.527273 +vt 0.363636 0.454545 +vt 0.381818 0.454545 +vt 0.509091 0.527273 +vt 0.490909 0.454545 +vt 0.509091 0.454545 +vt 0.490909 0.527273 +vt 0.490909 0.436364 +vt 0.381818 0.436364 +vt 0.381818 0.545455 +vt 0.490909 0.545455 +vt 0.581818 0.327273 +vt 0.436364 0.309091 +vt 0.581818 0.309091 +vt 0.436364 0.363636 +vt 0.581818 0.345455 +vt 0.581818 0.363636 +vt 0.436364 0.381818 +vt 0.581818 0.400000 +vt 0.436364 0.400000 +vt 0.436364 0.418182 +vt 0.581818 0.418182 +vt 0.581818 0.290909 +vt 0.436364 0.290909 +vt 0.436364 0.345455 +vt 0.581818 0.272727 +vt 0.436364 0.272727 +vt 0.401927 0.345455 +vt 0.363636 0.329200 +vt 0.379891 0.290909 +vt 0.401927 0.418182 +vt 0.363636 0.401927 +vt 0.379891 0.363636 +vt 0.727273 0.709091 +vt 0.709091 0.672727 +vt 0.727273 0.672727 +vt 0.690909 0.690909 +vt 0.672727 0.672727 +vt 0.690909 0.672727 +vt 0.672727 0.690909 +vt 0.654545 0.672727 +vt 0.963636 0.709091 +vt 0.945455 0.672727 +vt 0.963636 0.672727 +vt 0.909091 0.690909 +vt 0.890909 0.672727 +vt 0.909091 0.672727 +vt 0.927273 0.690909 +vt 0.927273 0.672727 +vt 0.672727 0.709091 +vt 0.690909 0.709091 +vt 0.909091 0.709091 +vt 0.927273 0.709091 +vt 0.745455 0.690909 +vt 0.872727 0.709091 +vt 0.745455 0.709091 +vt 0.872727 0.672727 +vt 0.745455 0.654545 +vt 0.872727 0.654545 +vt 0.872727 0.636364 +vt 0.745455 0.636364 +vt 0.872727 0.690909 +vt 0.109091 0.345455 +vt 0.127273 0.200000 +vt 0.127273 0.345455 +vt 0.163636 0.200000 +vt 0.145455 0.345455 +vt 0.145455 0.200000 +vt 0.109091 0.363636 +vt 0.181818 0.200000 +vt 0.163636 0.345455 +vt 0.200000 0.345455 +vt 0.218182 0.300000 +vt 0.218182 0.345455 +vt 0.272727 0.345455 +vt 0.254545 0.300000 +vt 0.272727 0.300000 +vt 0.236364 0.345455 +vt 0.236364 0.300000 +vt 0.309091 0.345455 +vt 0.290909 0.309091 +vt 0.309091 0.309091 +vt 0.309091 0.290909 +vt 0.290909 0.290909 +vt 0.290909 0.363636 +vt 0.290909 0.345455 +vt 0.345455 0.345455 +vt 0.327273 0.309091 +vt 0.345455 0.309091 +vt 0.036364 0.345455 +vt 0.018182 0.245455 +vt 0.036364 0.245455 +vt 0.090909 0.345455 +vt 0.072727 0.245455 +vt 0.090909 0.245455 +vt 0.072727 0.345455 +vt 0.054545 0.245455 +vt 0.054545 0.345455 +vt 0.036364 0.218182 +vt 0.018182 0.236364 +vt 0.018182 0.218182 +vt 0.018182 0.363636 +vt 0.018182 0.345455 +vt 0.636364 0.563636 +vt 0.345455 0.709091 +vt 0.345455 0.563636 +vt 0.763636 0.472727 +vt 0.745454 0.490909 +vt 0.745454 0.472727 +vt 0.763636 0.490909 +vt 0.745454 0.509091 +vt 0.763636 0.509091 +vt 0.745454 0.527273 +vt 0.763636 0.527273 +vt 0.745455 0.545455 +vt 0.763636 0.545455 +vt 0.745455 0.563636 +vt 0.763636 0.563636 +vt 0.745455 0.581818 +vt 0.709090 0.581818 +vt 0.690908 0.600000 +vt 0.709090 0.618182 +vt 0.763636 0.581818 +vt 0.745455 0.600000 +vt 0.763636 0.600000 +vt 0.745455 0.618182 +vt 0.728085 0.727278 +vt 0.345455 0.872727 +vt 0.000000 0.872727 +vt 0.672711 0.727287 +vt 0.690890 0.745465 +vt 0.690890 0.872717 +vt 0.472744 0.890896 +vt 0.454565 0.745465 +vt 0.919727 0.745465 +vt 0.927257 0.752994 +vt 0.927257 0.865187 +vt 0.734819 0.872717 +vt 0.727289 0.752995 +vt 0.745460 0.872882 +vt 0.927273 0.872722 +vt 0.927267 0.745301 +vt 0.127273 0.890909 +vt 0.327273 0.727273 +vt 0.072727 0.381818 +vt 0.290909 0.600000 +vt 0.000000 0.545455 +vt 0.709091 0.509091 +vt 0.721947 0.503765 +vt 0.727273 0.490909 +vt 0.709091 0.472727 +vt 0.690909 0.490909 +vt 0.672727 0.627273 +vt 0.363636 0.527273 +vt 0.436364 0.327273 +vt 0.581818 0.381818 +vt 0.401927 0.290909 +vt 0.418182 0.307164 +vt 0.418182 0.329200 +vt 0.379891 0.345455 +vt 0.363636 0.307164 +vt 0.401927 0.363636 +vt 0.418182 0.379891 +vt 0.418182 0.401927 +vt 0.379891 0.418182 +vt 0.363636 0.379891 +vt 0.709091 0.709091 +vt 0.654545 0.709091 +vt 0.945455 0.709091 +vt 0.890909 0.709091 +vt 0.745455 0.672727 +vt 0.109091 0.200000 +vt 0.127273 0.363636 +vt 0.181818 0.345455 +vt 0.200000 0.300000 +vt 0.254545 0.345455 +vt 0.309091 0.363636 +vt 0.327273 0.345455 +vt 0.036364 0.236364 +vt 0.036364 0.363636 +vt 0.636364 0.709091 +vt 0.721947 0.612856 +vt 0.727272 0.600000 +vt 0.721947 0.587143 +vt 0.696234 0.587143 +vt 0.696234 0.612856 +vt 0.763636 0.618182 +s 1 +usemtl Texture +f 2/1/1 26/2/1 1/3/1 +f 16/4/2 21/5/2 13/6/2 +f 19/7/3 6/8/3 18/9/3 +f 8/10/4 16/11/4 14/12/4 +f 17/13/5 6/8/5 5/14/5 +f 8/15/6 19/7/6 20/16/6 +f 14/17/7 21/5/7 22/18/7 +f 23/19/1 16/4/1 15/20/1 +f 1/21/8 17/22/8 2/23/8 +f 3/24/8 19/25/8 4/26/8 +f 9/27/8 21/28/8 10/29/8 +f 11/30/8 23/31/8 12/32/8 +f 2/23/8 22/33/8 9/27/8 +f 4/26/8 18/34/8 1/21/8 +f 10/29/8 24/35/8 11/30/8 +f 12/32/8 20/36/8 3/24/8 +f 31/37/8 27/38/8 25/39/8 +f 3/40/9 31/41/9 12/42/9 +f 1/3/2 27/43/2 4/44/2 +f 12/45/5 32/46/5 11/47/5 +f 4/44/7 28/48/7 3/49/7 +f 11/47/3 29/50/3 10/51/3 +f 9/52/10 25/53/10 2/54/10 +f 10/51/6 30/55/6 9/56/6 +f 34/57/10 40/58/10 36/59/10 +f 35/60/9 37/61/9 33/62/9 +f 48/63/4 43/64/4 52/65/4 +f 52/65/9 46/66/9 47/67/9 +f 44/68/10 42/69/10 43/64/10 +f 43/64/2 50/70/2 51/71/2 +f 46/72/5 48/63/5 47/73/5 +f 52/74/7 50/70/7 49/75/7 +f 41/76/3 48/63/3 45/77/3 +f 54/78/10 55/79/1 53/80/10 +f 56/81/1 57/82/2 55/79/1 +f 58/83/2 59/84/7 57/82/2 +f 60/85/7 61/86/9 59/84/7 +f 62/87/9 63/88/5 61/86/9 +f 64/89/5 65/90/3 63/88/5 +f 66/91/8 62/92/8 58/93/8 +f 66/94/3 67/95/6 65/90/3 +f 68/96/6 53/97/10 67/95/6 +f 70/98/3 71/99/3 69/100/3 +f 76/101/2 73/102/2 75/103/2 +f 74/104/8 69/100/8 73/102/8 +f 75/105/9 69/100/9 71/106/9 +f 72/107/10 74/104/10 76/108/10 +f 88/109/11 78/110/12 85/111/12 +f 83/112/13 87/113/14 92/114/13 +f 84/115/15 90/116/16 81/117/16 +f 82/118/17 90/116/16 89/119/17 +f 92/114/13 84/115/15 83/112/13 +f 86/120/18 78/110/12 77/121/18 +f 80/122/14 88/109/11 87/113/14 +f 89/123/17 77/121/18 82/124/17 +f 108/125/2 104/126/2 102/127/2 +f 96/128/3 100/129/3 98/130/3 +f 114/131/2 111/132/2 113/133/2 +f 121/134/3 110/135/3 109/136/3 +f 122/137/4 113/138/4 110/135/4 +f 116/139/3 117/140/3 115/141/3 +f 123/142/8 115/143/8 119/144/8 +f 117/140/4 124/145/4 120/146/4 +f 124/145/2 119/144/2 120/146/2 +f 114/147/6 121/134/6 112/148/6 +f 116/149/1 124/145/1 118/150/1 +f 111/132/8 121/134/8 109/136/8 +f 128/151/4 131/152/4 127/153/4 +f 130/154/8 125/155/8 129/156/8 +f 131/157/9 125/155/9 127/158/9 +f 128/151/10 130/154/10 132/159/10 +f 134/160/3 135/161/3 133/162/3 +f 140/163/2 137/164/2 139/165/2 +f 138/162/8 133/166/8 137/160/8 +f 139/167/9 133/168/9 135/163/9 +f 136/165/10 138/162/10 140/161/10 +f 146/169/8 141/170/8 145/171/8 +f 147/172/9 141/173/9 143/174/9 +f 144/170/10 146/175/10 148/171/10 +f 144/173/4 147/175/4 143/176/4 +f 154/177/8 149/178/8 153/179/8 +f 155/180/9 149/178/9 151/181/9 +f 152/177/10 154/182/10 156/183/10 +f 152/184/4 155/185/4 151/186/4 +f 149/185/3 152/177/3 151/179/3 +f 158/187/3 159/188/3 157/189/3 +f 160/190/4 163/191/4 159/192/4 +f 164/193/2 161/194/2 163/191/2 +f 162/195/8 157/189/8 161/194/8 +f 163/196/9 157/197/9 159/198/9 +f 160/187/10 162/199/10 164/200/10 +f 166/201/10 167/202/10 165/203/10 +f 170/204/10 171/205/19 169/206/10 +f 172/207/19 173/208/8 171/205/19 +f 174/209/8 175/210/20 173/208/8 +f 176/211/20 177/212/9 175/210/20 +f 178/213/9 179/214/21 177/212/9 +f 180/215/21 181/216/4 179/214/21 +f 182/217/3 178/218/3 174/219/3 +f 182/220/4 183/221/22 181/216/4 +f 184/222/22 169/223/10 183/221/22 +f 2/1/1 25/224/1 26/2/1 +f 16/4/2 24/225/2 21/5/2 +f 19/7/3 7/226/3 6/8/3 +f 14/12/4 5/227/4 6/228/4 +f 6/228/4 7/229/4 8/10/4 +f 8/10/4 15/230/4 16/11/4 +f 16/11/4 13/231/4 14/12/4 +f 14/12/4 6/228/4 8/10/4 +f 17/13/5 18/9/5 6/8/5 +f 8/15/6 7/226/6 19/7/6 +f 14/17/7 13/6/7 21/5/7 +f 23/19/1 24/225/1 16/4/1 +f 1/21/8 18/34/8 17/22/8 +f 3/24/8 20/36/8 19/25/8 +f 9/27/8 22/33/8 21/28/8 +f 11/30/8 24/35/8 23/31/8 +f 2/23/8 17/22/8 22/33/8 +f 4/26/8 19/25/8 18/34/8 +f 10/29/8 21/28/8 24/35/8 +f 12/32/8 23/31/8 20/36/8 +f 25/39/8 30/232/8 29/233/8 +f 29/233/8 32/234/8 31/37/8 +f 31/37/8 28/235/8 27/38/8 +f 27/38/8 26/236/8 25/39/8 +f 25/39/8 29/233/8 31/37/8 +f 3/40/9 28/237/9 31/41/9 +f 1/3/2 26/2/2 27/43/2 +f 12/45/5 31/238/5 32/46/5 +f 4/44/7 27/43/7 28/48/7 +f 11/47/3 32/46/3 29/50/3 +f 9/52/10 30/239/10 25/53/10 +f 10/51/6 29/50/6 30/55/6 +f 34/57/10 38/240/10 40/58/10 +f 35/60/9 39/241/9 37/61/9 +f 52/65/4 47/67/4 48/63/4 +f 48/63/4 44/68/4 43/64/4 +f 43/64/4 51/71/4 52/65/4 +f 52/65/9 49/242/9 46/66/9 +f 44/68/10 41/243/10 42/69/10 +f 43/64/2 42/244/2 50/70/2 +f 46/72/5 45/77/5 48/63/5 +f 52/74/7 51/71/7 50/70/7 +f 41/76/3 44/68/3 48/63/3 +f 54/78/10 56/81/1 55/79/1 +f 56/81/1 58/83/2 57/82/2 +f 58/83/2 60/85/7 59/84/7 +f 60/85/7 62/87/9 61/86/9 +f 62/87/9 64/89/5 63/88/5 +f 64/89/5 66/94/3 65/90/3 +f 58/93/8 56/245/8 54/246/8 +f 54/246/8 68/247/8 66/91/8 +f 66/91/8 64/248/8 62/92/8 +f 62/92/8 60/249/8 58/93/8 +f 58/93/8 54/246/8 66/91/8 +f 66/94/3 68/96/6 67/95/6 +f 68/96/6 54/250/10 53/97/10 +f 70/98/3 72/251/3 71/99/3 +f 76/101/2 74/104/2 73/102/2 +f 74/104/8 70/98/8 69/100/8 +f 75/105/9 73/102/9 69/100/9 +f 72/107/10 70/98/10 74/104/10 +f 88/109/11 79/252/11 78/110/12 +f 83/112/13 80/122/14 87/113/14 +f 84/115/15 91/253/15 90/116/16 +f 82/118/17 81/117/16 90/116/16 +f 92/114/13 91/253/15 84/115/15 +f 86/120/18 85/111/12 78/110/12 +f 80/122/14 79/252/11 88/109/11 +f 89/123/17 86/120/18 77/121/18 +f 102/127/2 105/254/2 106/255/2 +f 106/255/2 107/256/2 108/125/2 +f 108/125/2 103/257/2 104/126/2 +f 104/126/2 101/258/2 102/127/2 +f 102/127/2 106/255/2 108/125/2 +f 98/130/3 93/259/3 94/260/3 +f 94/260/3 95/261/3 96/128/3 +f 96/128/3 99/262/3 100/129/3 +f 100/129/3 97/263/3 98/130/3 +f 98/130/3 94/260/3 96/128/3 +f 114/131/2 112/264/2 111/132/2 +f 121/134/3 122/137/3 110/135/3 +f 122/137/4 114/265/4 113/138/4 +f 116/139/3 118/266/3 117/140/3 +f 123/142/8 116/267/8 115/143/8 +f 117/140/4 118/266/4 124/145/4 +f 124/145/2 123/142/2 119/144/2 +f 114/147/6 122/137/6 121/134/6 +f 116/149/1 123/142/1 124/145/1 +f 111/132/8 112/264/8 121/134/8 +f 128/151/4 132/159/4 131/152/4 +f 130/154/8 126/268/8 125/155/8 +f 131/157/9 129/156/9 125/155/9 +f 128/151/10 126/268/10 130/154/10 +f 134/160/3 136/269/3 135/161/3 +f 140/163/2 138/168/2 137/164/2 +f 138/162/8 134/270/8 133/166/8 +f 139/167/9 137/271/9 133/168/9 +f 136/165/10 134/164/10 138/162/10 +f 146/169/8 142/272/8 141/170/8 +f 147/172/9 145/273/9 141/173/9 +f 144/170/10 142/176/10 146/175/10 +f 144/173/4 148/273/4 147/175/4 +f 154/177/8 150/183/8 149/178/8 +f 155/180/9 153/179/9 149/178/9 +f 152/177/10 150/274/10 154/182/10 +f 152/184/4 156/275/4 155/185/4 +f 149/185/3 150/275/3 152/177/3 +f 158/187/3 160/200/3 159/188/3 +f 160/190/4 164/193/4 163/191/4 +f 164/193/2 162/195/2 161/194/2 +f 162/195/8 158/187/8 157/189/8 +f 163/196/9 161/276/9 157/197/9 +f 160/187/10 158/277/10 162/199/10 +f 166/201/10 168/278/10 167/202/10 +f 170/204/10 172/207/19 171/205/19 +f 172/207/19 174/209/8 173/208/8 +f 174/209/8 176/211/20 175/210/20 +f 176/211/20 178/213/9 177/212/9 +f 178/213/9 180/215/21 179/214/21 +f 180/215/21 182/220/4 181/216/4 +f 174/219/3 172/279/3 170/280/3 +f 170/280/3 184/281/3 182/217/3 +f 182/217/3 180/282/3 178/218/3 +f 178/218/3 176/283/3 174/219/3 +f 174/219/3 170/280/3 182/217/3 +f 182/220/4 184/222/22 183/221/22 +f 184/222/22 170/284/10 169/223/10 diff --git a/src/main/resources/assets/hbm/textures/blocks/geiger.png b/src/main/resources/assets/hbm/textures/blocks/geiger.png index 1b886777d..9e8559849 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/geiger.png and b/src/main/resources/assets/hbm/textures/blocks/geiger.png differ