diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 7f679402d..91ea2d966 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1697,7 +1697,7 @@ public class ModBlocks { steel_corner = new DecoBlock(Material.iron).setBlockName("steel_corner").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_corner"); steel_roof = new DecoBlock(Material.iron).setBlockName("steel_roof").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_roof"); steel_beam = new DecoBlock(Material.iron).setBlockName("steel_beam").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_beam"); - steel_scaffold = new DecoBlock(Material.iron).setBlockName("steel_scaffold").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel_orig"); + steel_scaffold = new BlockScaffold().setBlockName("steel_scaffold").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel_orig"); steel_grate = new BlockGrate(Material.iron).setBlockName("steel_grate").setStepSound(soundTypeGrate).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(5.0F); deco_pipe = new BlockPipe(Material.iron, RefStrings.MODID + ":pipe_side", 0).setBlockName("deco_pipe").setStepSound(soundTypeGrate).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(5.0F).setBlockTextureName(RefStrings.MODID + ":pipe_top"); diff --git a/src/main/java/com/hbm/blocks/bomb/BlockVolcano.java b/src/main/java/com/hbm/blocks/bomb/BlockVolcano.java index 56ffcde41..e3f53b449 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockVolcano.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockVolcano.java @@ -2,7 +2,6 @@ package com.hbm.blocks.bomb; import java.util.Arrays; import java.util.List; -import java.util.Random; import com.hbm.blocks.IBlockMulti; import com.hbm.blocks.ITooltipProvider; @@ -66,114 +65,6 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB list.add(BlockVolcano.isGrowing(meta) ? (EnumChatFormatting.RED + "DOES GROW") : (EnumChatFormatting.DARK_GRAY + "DOES NOT GROW")); list.add(BlockVolcano.isExtinguishing(meta) ? (EnumChatFormatting.RED + "DOES EXTINGUISH") : (EnumChatFormatting.DARK_GRAY + "DOES NOT EXTINGUISH")); } - - /*@Override - public int tickRate(World world) { - return 5; - } - - @Override - public void onBlockAdded(World world, int x, int y, int z) { - - if(!world.isRemote) - world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); - } - - @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - - if(!world.isRemote) { - - int meta = world.getBlockMetadata(x, y, z); - blastMagmaChannel(world, x, y, z, rand); - raiseMagma(world, x, y, z, rand); - spawnBlobs(world, x, y, z, rand); - spawnSmoke(world, x, y, z, rand); - - updateVolcano(world, x, y, z, rand, meta); - } - }*/ - - private void blastMagmaChannel(World world, int x, int y, int z, Random rand) { - - List attribs = Arrays.asList(new ExAttrib[] {ExAttrib.NODROP, ExAttrib.LAVA_V, ExAttrib.NOSOUND, ExAttrib.ALLMOD, ExAttrib.NOHURT}); - - ExplosionNT explosion = new ExplosionNT(world, null, x + 0.5, y + rand.nextInt(15) + 1.5, z + 0.5, 7); - explosion.addAllAttrib(attribs); - explosion.explode(); - - ExplosionNT explosion2 = new ExplosionNT(world, null, x + 0.5 + rand.nextGaussian() * 3, rand.nextInt(y + 1), z + 0.5 + rand.nextGaussian() * 3, 10); - explosion2.addAllAttrib(attribs); - explosion2.explode(); - } - - private void raiseMagma(World world, int x, int y, int z, Random rand) { - - int rX = x - 10 + rand.nextInt(21); - int rY = y + rand.nextInt(11); - int rZ = z - 10 + rand.nextInt(21); - - if(world.getBlock(rX, rY, rZ) == Blocks.air && world.getBlock(rX, rY - 1, rZ) == ModBlocks.volcanic_lava_block) - world.setBlock(rX, rY, rZ, ModBlocks.volcanic_lava_block); - } - - private void spawnBlobs(World world, int x, int y, int z, Random rand) { - - for(int i = 0; i < 3; i++) { - EntityShrapnel frag = new EntityShrapnel(world); - frag.setLocationAndAngles(x + 0.5, y + 1.5, z + 0.5, 0.0F, 0.0F); - frag.motionY = 1D + rand.nextDouble(); - frag.motionX = rand.nextGaussian() * 0.2D; - frag.motionZ = rand.nextGaussian() * 0.2D; - frag.setVolcano(true); - world.spawnEntityInWorld(frag); - } - } - - /* - * I SEE SMOKE, AND WHERE THERE'S SMOKE THERE'S FIRE! - */ - private void spawnSmoke(World world, int x, int y, int z, Random rand) { - NBTTagCompound dPart = new NBTTagCompound(); - dPart.setString("type", "vanillaExt"); - dPart.setString("mode", "volcano"); - PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(dPart, x + 0.5, y + 10, z + 0.5), new TargetPoint(world.provider.dimensionId, x + 0.5, y + 10, z + 0.5, 250)); - } - - private void updateVolcano(World world, int x, int y, int z, Random rand, int meta) { - - if(rand.nextDouble() < this.getProgressChance(world, x, y, z, rand, meta)) { - - //if there's progress, check if the volcano can grow or not - if(shouldGrow(world, x, y, z, rand, meta)) { - - //raise the level for growing volcanos, spawn lava, schedule update at the new position - y++; - world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); - - for(int i = -1; i <= 1; i++) { - for(int j = -1; j <= 1; j++) { - for(int k = -1; k <= 1; k++) { - - if(i + j + k == 0) { - world.setBlock(x, y, z, this, meta, 3); - } else { - world.setBlock(x + i, y + j, z + k, ModBlocks.volcanic_lava_block); - } - } - } - } - - //a progressing volcano that can't grow will extinguish - } else if(isExtinguishing(meta)) { - world.setBlock(x, y, z, ModBlocks.volcanic_lava_block); - } - - //if there's no progress, schedule an update on the current position - } - - world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); - } public static final int META_STATIC_ACTIVE = 0; public static final int META_STATIC_EXTINGUISHING = 1; @@ -189,30 +80,6 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB return meta == META_STATIC_EXTINGUISHING || meta == META_GROWING_EXTINGUISHING; } - private boolean shouldGrow(World world, int x, int y, int z, Random rand, int meta) { - - //non-growing volcanoes should extinguish - if(!isGrowing(meta)) - return false; - - //growing volcanoes extinguish when exceeding 200 blocks - return y < 200; - } - - private double getProgressChance(World world, int x, int y, int z, Random rand, int meta) { - - if(meta == META_STATIC_EXTINGUISHING) - return 0.00003D; //about once every hour - - if(isGrowing(meta)) { - - if(meta != META_GROWING_ACTIVE || y < 199) - return 0.007D; //about 250x an hour - } - - return 0; - } - public static class TileEntityVolcanoCore extends TileEntity { private static List volcanoExplosion = Arrays.asList(new ExAttrib[] {ExAttrib.NODROP, ExAttrib.LAVA_V, ExAttrib.NOSOUND, ExAttrib.ALLMOD, ExAttrib.NOHURT}); diff --git a/src/main/java/com/hbm/blocks/fluid/SchrabidicBlock.java b/src/main/java/com/hbm/blocks/fluid/SchrabidicBlock.java index 57e9b7b1a..094d2a4ed 100644 --- a/src/main/java/com/hbm/blocks/fluid/SchrabidicBlock.java +++ b/src/main/java/com/hbm/blocks/fluid/SchrabidicBlock.java @@ -3,7 +3,6 @@ package com.hbm.blocks.fluid; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.BlockHazard.ExtDisplayEffect; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.util.ContaminationUtil; diff --git a/src/main/java/com/hbm/blocks/generic/BlockMotherOfAllOres.java b/src/main/java/com/hbm/blocks/generic/BlockMotherOfAllOres.java index 79227996b..20c35220b 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockMotherOfAllOres.java +++ b/src/main/java/com/hbm/blocks/generic/BlockMotherOfAllOres.java @@ -8,7 +8,6 @@ import java.util.Random; import com.google.common.collect.HashBiMap; import com.hbm.blocks.IBlockMultiPass; -import com.hbm.blocks.ModBlocks; import com.hbm.config.WorldConfig; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/blocks/generic/BlockNetherCoal.java b/src/main/java/com/hbm/blocks/generic/BlockNetherCoal.java index a92ad77f9..0e33d9f9a 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockNetherCoal.java +++ b/src/main/java/com/hbm/blocks/generic/BlockNetherCoal.java @@ -2,7 +2,6 @@ package com.hbm.blocks.generic; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/blocks/generic/BlockOutgas.java b/src/main/java/com/hbm/blocks/generic/BlockOutgas.java index 61b42f7b3..650819005 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOutgas.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOutgas.java @@ -3,7 +3,6 @@ package com.hbm.blocks.generic; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.gas.BlockGasBase; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/blocks/generic/BlockScaffold.java b/src/main/java/com/hbm/blocks/generic/BlockScaffold.java new file mode 100644 index 000000000..60213c2ae --- /dev/null +++ b/src/main/java/com/hbm/blocks/generic/BlockScaffold.java @@ -0,0 +1,72 @@ +package com.hbm.blocks.generic; + +import com.hbm.blocks.BlockMulti; +import com.hbm.blocks.ModBlocks; +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class BlockScaffold extends BlockMulti { + + protected String[] variants = new String[] {"scaffold_steel", "scaffold_red", "scaffold_white", "scaffold_yellow"}; + @SideOnly(Side.CLIENT) protected IIcon[] icons; + + public BlockScaffold() { + super(Material.iron); + } + + public static int renderIDScaffold = RenderingRegistry.getNextAvailableRenderId(); + + @Override + public int getRenderType(){ + return renderIDScaffold; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister reg) { + this.blockIcon = ModBlocks.deco_steel.getIcon(0, 0); + this.icons = new IIcon[variants.length]; + + for(int i = 0; i < variants.length; i++) { + this.icons[i] = reg.registerIcon(RefStrings.MODID + ":" + variants[i]); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return this.icons[this.damageDropped(meta)]; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + int meta = stack.getItemDamage(); + + if(i % 2 == 0) { + world.setBlockMetadataWithNotify(x, y, z, meta, 2); + } else { + world.setBlockMetadataWithNotify(x, y, z, meta + 8, 2); + } + } + + @Override + public int damageDropped(int meta) { + return rectify(meta) & 7; + } + + @Override + public int getSubCount() { + return variants.length; + } +} diff --git a/src/main/java/com/hbm/blocks/generic/DecoBlock.java b/src/main/java/com/hbm/blocks/generic/DecoBlock.java index 58ac63f75..ee8dbf8be 100644 --- a/src/main/java/com/hbm/blocks/generic/DecoBlock.java +++ b/src/main/java/com/hbm/blocks/generic/DecoBlock.java @@ -38,14 +38,11 @@ public class DecoBlock extends BlockContainer { return new TileEntityDecoBlock(); } - public static int renderIDScaffold = RenderingRegistry.getNextAvailableRenderId(); public static int renderIDBeam = RenderingRegistry.getNextAvailableRenderId(); @Override public int getRenderType(){ - if(this == ModBlocks.steel_scaffold) - return renderIDScaffold; - else if(this == ModBlocks.steel_beam) + if(this == ModBlocks.steel_beam) return renderIDBeam; else return -1; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java b/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java index 6064edda7..f7cc8103e 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java @@ -1,9 +1,7 @@ package com.hbm.blocks.machine; -import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; @@ -11,8 +9,6 @@ import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteRod.java b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteRod.java index 900ea3d89..36f65bacf 100644 --- a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteRod.java +++ b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteRod.java @@ -1,19 +1,14 @@ package com.hbm.blocks.machine.pile; -import java.util.ArrayList; - -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import api.hbm.block.IToolable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteSource.java b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteSource.java index b88d13f7f..979ad2471 100644 --- a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteSource.java +++ b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteSource.java @@ -1,7 +1,5 @@ package com.hbm.blocks.machine.pile; -import java.util.ArrayList; - import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; @@ -11,12 +9,9 @@ import api.hbm.block.IToolable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class BlockGraphiteSource extends BlockGraphiteDrilledTE implements IToolable { diff --git a/src/main/java/com/hbm/entity/effect/EntityBlackHole.java b/src/main/java/com/hbm/entity/effect/EntityBlackHole.java index 161daa963..55ed90ea1 100644 --- a/src/main/java/com/hbm/entity/effect/EntityBlackHole.java +++ b/src/main/java/com/hbm/entity/effect/EntityBlackHole.java @@ -3,9 +3,7 @@ package com.hbm.entity.effect; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityRubble; -import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileBurst.java b/src/main/java/com/hbm/entity/missile/EntityMissileBurst.java index f46c77711..b9285eb32 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileBurst.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileBurst.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileBusterStrong.java b/src/main/java/com/hbm/entity/missile/EntityMissileBusterStrong.java index 296764f9f..ac4e903b6 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileBusterStrong.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileBusterStrong.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileCluster.java b/src/main/java/com/hbm/entity/missile/EntityMissileCluster.java index c0b63f1b7..38ac71f9a 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileCluster.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileCluster.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileClusterStrong.java b/src/main/java/com/hbm/entity/missile/EntityMissileClusterStrong.java index fed38c906..81a3cab63 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileClusterStrong.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileClusterStrong.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileDoomsday.java b/src/main/java/com/hbm/entity/missile/EntityMissileDoomsday.java index 8360c3c7e..7b1d42a36 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileDoomsday.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileDoomsday.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.explosion.ExplosionLarge; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileDrill.java b/src/main/java/com/hbm/entity/missile/EntityMissileDrill.java index bc860e2e6..3c0ab3442 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileDrill.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileDrill.java @@ -8,7 +8,6 @@ import com.hbm.explosion.ExplosionNT; import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileEMP.java b/src/main/java/com/hbm/entity/missile/EntityMissileEMP.java index 00dd94a01..bd6ce0281 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileEMP.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileEMP.java @@ -8,7 +8,6 @@ import com.hbm.entity.effect.EntityEMPBlast; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileEMPStrong.java b/src/main/java/com/hbm/entity/missile/EntityMissileEMPStrong.java index 6a4a9dac3..4253cbaa6 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileEMPStrong.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileEMPStrong.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.entity.logic.EntityEMP; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileEndo.java b/src/main/java/com/hbm/entity/missile/EntityMissileEndo.java index 21b10d43c..e1205b606 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileEndo.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileEndo.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionThermo; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileExo.java b/src/main/java/com/hbm/entity/missile/EntityMissileExo.java index fad570547..494bebb06 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileExo.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileExo.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionThermo; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileGeneric.java b/src/main/java/com/hbm/entity/missile/EntityMissileGeneric.java index 34d936656..b1ad0f37b 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileGeneric.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileGeneric.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileIncendiary.java b/src/main/java/com/hbm/entity/missile/EntityMissileIncendiary.java index 3601d4b5f..709e2e1f3 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileIncendiary.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileIncendiary.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java b/src/main/java/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java index a5a5fb765..56e8b86d6 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java @@ -7,7 +7,6 @@ import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileInferno.java b/src/main/java/com/hbm/entity/missile/EntityMissileInferno.java index d2610382d..4109390b0 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileInferno.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileInferno.java @@ -7,7 +7,6 @@ import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileRain.java b/src/main/java/com/hbm/entity/missile/EntityMissileRain.java index 25728f3a5..877fe54c4 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileRain.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileRain.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileShuttle.java b/src/main/java/com/hbm/entity/missile/EntityMissileShuttle.java index 325b1c538..c662a383d 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileShuttle.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileShuttle.java @@ -4,7 +4,6 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionNT; import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.items.ModItems; @@ -12,11 +11,8 @@ import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileStrong.java b/src/main/java/com/hbm/entity/missile/EntityMissileStrong.java index 8521ce6f2..60d2486d2 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileStrong.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileStrong.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileTaint.java b/src/main/java/com/hbm/entity/missile/EntityMissileTaint.java index 32e7e50b4..b536b4410 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileTaint.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileTaint.java @@ -7,7 +7,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.BlockTaint; import com.hbm.items.ModItems; -import api.hbm.entity.IRadarDetectable.RadarTargetType; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/entity/mob/EntityGhost.java b/src/main/java/com/hbm/entity/mob/EntityGhost.java index 658681df8..e2c0f5240 100644 --- a/src/main/java/com/hbm/entity/mob/EntityGhost.java +++ b/src/main/java/com/hbm/entity/mob/EntityGhost.java @@ -3,15 +3,11 @@ package com.hbm.entity.mob; import java.util.List; import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAILookIdle; import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWander; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class EntityGhost extends EntityCreature { diff --git a/src/main/java/com/hbm/entity/projectile/EntityBullet.java b/src/main/java/com/hbm/entity/projectile/EntityBullet.java index acabc493d..e4e4a19cc 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityBullet.java +++ b/src/main/java/com/hbm/entity/projectile/EntityBullet.java @@ -18,7 +18,6 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.potion.Potion; @@ -62,10 +61,6 @@ public class EntityBullet extends Entity implements IProjectile { public double damage; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - private int dmgMin = 0; - private int dmgMax = 1; - private boolean isTau = false; private boolean instakill = false; private boolean rad = false; public boolean antidote = false; diff --git a/src/main/java/com/hbm/handler/guncfg/GunPoweredFactory.java b/src/main/java/com/hbm/handler/guncfg/GunPoweredFactory.java index 1ff48ac83..52514d76b 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunPoweredFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunPoweredFactory.java @@ -2,23 +2,11 @@ package com.hbm.handler.guncfg; import java.util.ArrayList; -import com.hbm.blocks.ModBlocks; -import com.hbm.entity.projectile.EntityBulletBase; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionNT; -import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; -import com.hbm.interfaces.IBulletImpactBehavior; -import com.hbm.items.ModItems; -import com.hbm.packet.AuxParticlePacketNT; -import com.hbm.packet.PacketDispatcher; import com.hbm.render.util.RenderScreenOverlay.Crosshair; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; public class GunPoweredFactory { diff --git a/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java b/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java index 3886309f6..72be9d361 100644 --- a/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java +++ b/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java @@ -4,10 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.extprop.HbmLivingProps; import com.hbm.handler.radiation.ChunkRadiationManager; -import com.hbm.items.ModItems; import com.hbm.items.armor.ArmorFSB; import com.hbm.util.ContaminationUtil; @@ -18,7 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; public class ItemGeigerCounter extends Item { diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index f5b76807e..1f6aa2c91 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -165,6 +165,7 @@ public class ResourceManager { //Mining Drill public static final IModelCustom drill_body = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/drill_main.obj")); public static final IModelCustom drill_bolt = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/drill_bolt.obj")); + public static final IModelCustom mining_drill = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/mining_drill.obj")).asDisplayList(); //Laser Miner public static final IModelCustom mining_laser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/mining_laser.obj")); @@ -502,6 +503,7 @@ public class ResourceManager { //Mining Drill public static final ResourceLocation drill_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mining_drill.png"); public static final ResourceLocation drill_bolt_tex = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGenRotor.png"); + public static final ResourceLocation mining_drill_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/mining_drill.png"); //Laser Miner public static final ResourceLocation mining_laser_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/mining_laser_base.png"); diff --git a/src/main/java/com/hbm/render/block/RenderScaffoldBlock.java b/src/main/java/com/hbm/render/block/RenderScaffoldBlock.java index dee480d29..c3934409d 100644 --- a/src/main/java/com/hbm/render/block/RenderScaffoldBlock.java +++ b/src/main/java/com/hbm/render/block/RenderScaffoldBlock.java @@ -2,7 +2,7 @@ package com.hbm.render.block; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.generic.DecoBlock; +import com.hbm.blocks.generic.BlockScaffold; import com.hbm.main.ResourceManager; import com.hbm.render.util.ObjUtil; @@ -20,60 +20,44 @@ public class RenderScaffoldBlock implements ISimpleBlockRenderingHandler { public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { GL11.glPushMatrix(); - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, 0); + Tessellator tessellator = Tessellator.instance; + IIcon iicon = block.getIcon(0, 0); tessellator.setColorOpaque_F(1, 1, 1); - if (renderer.hasOverrideBlockTexture()) - { - iicon = renderer.overrideBlockTexture; - } - - GL11.glTranslated(0, -0.5, 0); - tessellator.startDrawingQuads(); + if(renderer.hasOverrideBlockTexture()) { + iicon = renderer.overrideBlockTexture; + } + + GL11.glTranslated(0, -0.5, 0); + tessellator.startDrawingQuads(); ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.scaffold, iicon, tessellator, 0, false); tessellator.draw(); - - GL11.glPopMatrix(); + + GL11.glPopMatrix(); } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - /*Tessellator.instance.draw(); - - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - - ModelSteelRoof model = new ModelSteelRoof(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID + ":" + "textures/models/SteelRoof.png")); - model.renderModel(0.0625F); - - GL11.glPopMatrix(); - - Tessellator.instance.startDrawing(0);*/ - - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); - - tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); + Tessellator tessellator = Tessellator.instance; + IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); + + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setColorOpaque_F(1, 1, 1); - if (renderer.hasOverrideBlockTexture()) - { - iicon = renderer.overrideBlockTexture; - } - - float rotation = (float) -Math.PI; - - if(world.getBlockMetadata(x, y, z) < 4) - rotation = -90F / 180F * (float)Math.PI; - - tessellator.addTranslation(x + 0.5F, y, z + 0.5F); + if(renderer.hasOverrideBlockTexture()) { + iicon = renderer.overrideBlockTexture; + } + + float rotation = (float) -Math.PI; + + if((world.getBlockMetadata(x, y, z) & 8) != 0) + rotation = -90F / 180F * (float) Math.PI; + + tessellator.addTranslation(x + 0.5F, y, z + 0.5F); ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.scaffold, iicon, tessellator, rotation, true); - tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); - + tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); + return true; } @@ -84,7 +68,7 @@ public class RenderScaffoldBlock implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return DecoBlock.renderIDScaffold; + return BlockScaffold.renderIDScaffold; } } diff --git a/src/main/java/com/hbm/render/tileentity/RenderExcavator.java b/src/main/java/com/hbm/render/tileentity/RenderExcavator.java index 0049b31b6..a9ff72931 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderExcavator.java +++ b/src/main/java/com/hbm/render/tileentity/RenderExcavator.java @@ -1,12 +1,56 @@ package com.hbm.render.tileentity; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; +import org.lwjgl.opengl.GL11; -public class RenderExcavator extends TileEntitySpecialRenderer { +import com.hbm.blocks.BlockDummyable; +import com.hbm.blocks.ModBlocks; +import com.hbm.main.ResourceManager; +import com.hbm.render.item.ItemRenderBase; +import com.hbm.tileentity.machine.TileEntityMachineExcavator; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.IItemRenderer; + +public class RenderExcavator extends TileEntitySpecialRenderer implements IItemRendererProvider { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float interp) { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_CULL_FACE); + + switch(tile.getBlockMetadata() - BlockDummyable.offset) { + case 3: GL11.glRotatef(0, 0F, 1F, 0F); break; + case 5: GL11.glRotatef(90, 0F, 1F, 0F); break; + case 2: GL11.glRotatef(180, 0F, 1F, 0F); break; + case 4: GL11.glRotatef(270, 0F, 1F, 0F); break; + } + + TileEntityMachineExcavator drill = (TileEntityMachineExcavator) tile; + + bindTexture(ResourceManager.mining_drill_tex); + ResourceManager.mining_drill.renderAll(); + + GL11.glPopMatrix(); + } + @Override + public Item getItemForRenderer() { + return Item.getItemFromBlock(ModBlocks.machine_excavator); + } + + @Override + public IItemRenderer getRenderer() { + return new ItemRenderBase( ) { + public void renderInventory() { + GL11.glTranslated(0, -1.5, 0); + GL11.glScaled(2, 2, 2); + } + public void renderCommon() { + bindTexture(ResourceManager.mining_drill_tex); ResourceManager.mining_drill.renderAll(); + }}; } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index 7fb48a939..be63af569 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -3,7 +3,6 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineITER; import com.hbm.explosion.ExplosionLarge; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java index 691ec8850..c9f1c58cc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java @@ -4,13 +4,19 @@ import com.hbm.tileentity.TileEntityMachineBase; public class TileEntityMachineExcavator extends TileEntityMachineBase { + public boolean enableDrill = false; + public boolean enableCrusher = false; + public boolean enableWalling = false; + public boolean enableVeinMiner = false; + public boolean enableSilkTouch = false; + public TileEntityMachineExcavator() { - super(10); + super(14); } @Override public String getName() { - return null; + return "container.machineExcavator"; } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java index 7b6d675be..49cf57163 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java @@ -1,38 +1,24 @@ package com.hbm.tileentity.machine; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.machine.MachineReactorBreeding; -import com.hbm.blocks.machine.ReactorResearch; import com.hbm.config.MobConfig; -import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.interfaces.IControlReceiver; import com.hbm.inventory.RecipesCommon.ComparableStack; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemPlateFuel; -import com.hbm.lib.Library; -import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.TileEntityMachineBase; -import com.hbm.tileentity.machine.rbmk.RBMKDials; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java index 76cb1b6c6..eedcc3aeb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -26,7 +26,6 @@ import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardSender; -import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/util/SoundUtil.java b/src/main/java/com/hbm/util/SoundUtil.java deleted file mode 100644 index 56f4403ac..000000000 --- a/src/main/java/com/hbm/util/SoundUtil.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hbm.util; - -import java.util.Map; - -import com.google.common.collect.Maps; - -import cpw.mods.fml.relauncher.ReflectionHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SoundCategory; -import net.minecraft.client.settings.GameSettings; -import net.minecraftforge.common.util.EnumHelper; - -/** - * This class is dedicated to the retard who thought making sound categories into enums and setting everything useful to private was a good idea. - * Fuck you. - * @author hbm - * - */ -public class SoundUtil { - - /*public static void addSoundCategory(String name) { - - try { - SoundCategory category = EnumHelper.addEnum(SoundCategory.class, name.toUpperCase(), new Class[] { String.class, int.class }, new Object[] { name, SoundCategory.values().length }); - - Map nameMapping = (Map) ReflectionHelper.findField(SoundCategory.class, "field_147168_j").get(null); - Map idMapping = (Map) ReflectionHelper.findField(SoundCategory.class, "field_147169_k").get(null); - - Map mapSoundLevelsOrig = (Map) ReflectionHelper.findField(GameSettings.class, "mapSoundLevels", "field_151446_aD").get(Minecraft.getMinecraft().gameSettings); - Map mapSoundLevels = Maps.newEnumMap(SoundCategory.class); - - nameMapping.put(category.getCategoryName(), category); - idMapping.put(Integer.valueOf(category.getCategoryId()), category); - - //we have to copy the new map before putting it in the settings because otherwise the EnumMap fucking dies - for(Object o : mapSoundLevelsOrig.keySet()) { - mapSoundLevels.put(o, mapSoundLevelsOrig.get(o)); - } - - mapSoundLevels.put(category, 1F); - - //ReflectionHelper.setPrivateValue(SoundCategory.class, null, nameMapping, "field_147168_j"); - //ReflectionHelper.setPrivateValue(SoundCategory.class, null, idMapping, "field_147169_k"); - ReflectionHelper.setPrivateValue(GameSettings.class, Minecraft.getMinecraft().gameSettings, mapSoundLevels, "mapSoundLevels", "field_151446_aD"); - - } catch(Exception e) { - e.printStackTrace(); - } - }*/ -} diff --git a/src/main/java/com/hbm/world/dungeon/Relay.java b/src/main/java/com/hbm/world/dungeon/Relay.java index 44d15b963..9e8126099 100644 --- a/src/main/java/com/hbm/world/dungeon/Relay.java +++ b/src/main/java/com/hbm/world/dungeon/Relay.java @@ -7,12 +7,10 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.generic.BlockBobble.BobbleType; import com.hbm.blocks.generic.BlockBobble.TileEntityBobble; -import com.hbm.blocks.generic.BlockLoot.TileEntityLoot; import com.hbm.config.GeneralConfig; import com.hbm.items.ModItems; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.storage.TileEntityCrateIron; import com.hbm.util.LootGenerator; diff --git a/src/main/resources/assets/hbm/textures/blocks/scaffold_red.png b/src/main/resources/assets/hbm/textures/blocks/scaffold_red.png new file mode 100644 index 000000000..04ab57cf8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/scaffold_red.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/scaffold_steel.png b/src/main/resources/assets/hbm/textures/blocks/scaffold_steel.png new file mode 100644 index 000000000..8a4107488 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/scaffold_steel.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/scaffold_white.png b/src/main/resources/assets/hbm/textures/blocks/scaffold_white.png new file mode 100644 index 000000000..fd1698c65 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/scaffold_white.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/scaffold_yellow.png b/src/main/resources/assets/hbm/textures/blocks/scaffold_yellow.png new file mode 100644 index 000000000..1f152c29a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/scaffold_yellow.png differ