diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 9161f96cf..04d345880 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -376,6 +376,7 @@ public class ModBlocks { public static Block sand_lead; public static Block sand_uranium; public static Block sand_polonium; + public static Block sand_gold; public static Block ash_digamma; public static Block glass_boron; public static Block glass_lead; @@ -1489,6 +1490,7 @@ public class ModBlocks { sand_lead = new BlockFalling(Material.sand).setBlockName("sand_lead").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_lead"); sand_uranium = new BlockFalling(Material.sand).setBlockName("sand_uranium").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_uranium"); sand_polonium = new BlockFalling(Material.sand).setBlockName("sand_polonium").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_polonium"); + sand_gold = new BlockGoldSand(Material.sand).setBlockName("sand_gold").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_gold"); glass_boron = new BlockNTMGlass(0, RefStrings.MODID + ":glass_boron", Material.glass).setBlockName("glass_boron").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); glass_lead = new BlockNTMGlass(0, RefStrings.MODID + ":glass_lead", Material.glass).setBlockName("glass_lead").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); glass_uranium = new BlockNTMGlass(1, RefStrings.MODID + ":glass_uranium", Material.glass).setBlockName("glass_uranium").setLightLevel(5F/15F).setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); @@ -2546,6 +2548,7 @@ public class ModBlocks { GameRegistry.registerBlock(sand_lead, sand_lead.getUnlocalizedName()); GameRegistry.registerBlock(sand_uranium, sand_uranium.getUnlocalizedName()); GameRegistry.registerBlock(sand_polonium, sand_polonium.getUnlocalizedName()); + GameRegistry.registerBlock(sand_gold, sand_gold.getUnlocalizedName()); GameRegistry.registerBlock(glass_boron, glass_boron.getUnlocalizedName()); GameRegistry.registerBlock(glass_lead, glass_lead.getUnlocalizedName()); GameRegistry.registerBlock(glass_uranium, glass_uranium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockGoldSand.java b/src/main/java/com/hbm/blocks/generic/BlockGoldSand.java new file mode 100644 index 000000000..44687a3fe --- /dev/null +++ b/src/main/java/com/hbm/blocks/generic/BlockGoldSand.java @@ -0,0 +1,23 @@ +package com.hbm.blocks.generic; + +import net.minecraft.block.BlockFalling; +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; + +public class BlockGoldSand extends BlockFalling { + + public BlockGoldSand(Material mat) { + super(mat); + } + + @Override + public void onEntityWalking(World world, int x, int y, int z, Entity entity) { + + if(entity instanceof EntityLivingBase) { + entity.attackEntityFrom(DamageSource.inFire, 2F); + } + } +} diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index ca76d58a0..87d495b33 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -23,6 +23,8 @@ public class MineralRecipes { add1To9Pair(ModItems.powder_coal, ModItems.powder_coal_tiny); + add1To9Pair(ModBlocks.sand_gold, ModItems.powder_gold); + add1To9Pair(ModBlocks.block_aluminium, ModItems.ingot_aluminium); add1To9Pair(ModBlocks.block_graphite, ModItems.ingot_graphite); add1To9Pair(ModBlocks.block_boron, ModItems.ingot_boron); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 451d4e076..b94851d5f 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -70,6 +70,7 @@ public class OreDictManager { OreDictionary.registerOre("ingotTcAlloy", ModItems.ingot_tcalloy); OreDictionary.registerOre("ingotGold198", ModItems.ingot_au198); OreDictionary.registerOre("ingotColtan", ModItems.fragment_coltan); + OreDictionary.registerOre("ingotTantalum", ModItems.ingot_tantalium); OreDictionary.registerOre("crystalCinnabar", ModItems.cinnebar); @@ -118,6 +119,7 @@ public class OreDictManager { OreDictionary.registerOre("nuggetLanthanium", ModItems.fragment_lanthanium); OreDictionary.registerOre("nuggetActinium", ModItems.fragment_actinium); OreDictionary.registerOre("nuggetBoron", ModItems.fragment_boron); + OreDictionary.registerOre("nuggetTantalum", ModItems.nugget_tantalium); OreDictionary.registerOre("dustIron", ModItems.powder_iron); OreDictionary.registerOre("dustGold", ModItems.powder_gold); @@ -164,6 +166,7 @@ public class OreDictManager { OreDictionary.registerOre("dustTcAlloy", ModItems.powder_tcalloy); OreDictionary.registerOre("dustGol198", ModItems.powder_au198); OreDictionary.registerOre("dustColtan", ModItems.powder_coltan_ore); + OreDictionary.registerOre("dustTantalum", ModItems.powder_tantalium); OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium); OreDictionary.registerOre("dustIodine", ModItems.powder_iodine); @@ -181,6 +184,7 @@ public class OreDictManager { OreDictionary.registerOre("gemCoal", Items.coal); OreDictionary.registerOre("gemLignite", ModItems.lignite); OreDictionary.registerOre("dustFluorite", ModItems.fluorite); + OreDictionary.registerOre("gemTantalum", ModItems.gem_tantalium); OreDictionary.registerOre("plateTitanium", ModItems.plate_titanium); OreDictionary.registerOre("plateAluminum", ModItems.plate_aluminium); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index d9e3b9368..35fcbe669 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -324,6 +324,7 @@ public class ModItems { public static Item gem_volcanic; public static Item powder_lead; + public static Item powder_tantalium; public static Item powder_neptunium; public static Item powder_polonium; public static Item powder_co60; @@ -2693,6 +2694,7 @@ public class ModItems { gem_volcanic = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("gem_volcanic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":gem_volcanic"); powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lead"); + powder_tantalium = new ItemCustomLore().setUnlocalizedName("powder_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_tantalium"); powder_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.powder, true).setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); powder_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.powder, true).setUnlocalizedName("powder_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_polonium"); powder_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.powder).addFire(5).toItem().setUnlocalizedName("powder_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_co60"); @@ -5472,6 +5474,7 @@ public class ModItems { GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); GameRegistry.registerItem(powder_coltan_ore, powder_coltan_ore.getUnlocalizedName()); GameRegistry.registerItem(powder_coltan, powder_coltan.getUnlocalizedName()); + GameRegistry.registerItem(powder_tantalium, powder_tantalium.getUnlocalizedName()); GameRegistry.registerItem(powder_yellowcake, powder_yellowcake.getUnlocalizedName()); GameRegistry.registerItem(powder_beryllium, powder_beryllium.getUnlocalizedName()); GameRegistry.registerItem(powder_dura_steel, powder_dura_steel.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index 656f451e9..d10f611a4 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -410,7 +410,7 @@ public class ItemCustomLore extends Item { list.add("'Lanthanum'"); } - if(this == ModItems.ingot_tantalium || this == ModItems.nugget_tantalium || this == ModItems.gem_tantalium) + if(this == ModItems.ingot_tantalium || this == ModItems.nugget_tantalium || this == ModItems.gem_tantalium || this == ModItems.powder_tantalium) { list.add("'Tantalum'"); } diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 4b3f771b1..81762f855 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -957,6 +957,7 @@ public class CraftingManager { GameRegistry.addSmelting(ModItems.powder_zirconium, new ItemStack(ModItems.ingot_zirconium), 1.0F); GameRegistry.addSmelting(ModItems.powder_tcalloy, new ItemStack(ModItems.ingot_tcalloy), 1.0F); GameRegistry.addSmelting(ModItems.powder_au198, new ItemStack(ModItems.ingot_au198), 1.0F); + GameRegistry.addSmelting(ModItems.powder_tantalium, new ItemStack(ModItems.ingot_tantalium), 1.0F); GameRegistry.addSmelting(ModItems.powder_coal, new ItemStack(ModItems.coke), 1.0F); GameRegistry.addSmelting(ModItems.briquette_lignite, new ItemStack(ModItems.coke), 1.0F); @@ -1005,7 +1006,6 @@ public class CraftingManager { GameRegistry.addSmelting(ModItems.crystal_cobalt, new ItemStack(ModItems.ingot_cobalt, 2), 2.0F); GameRegistry.addSmelting(ModItems.crystal_starmetal, new ItemStack(ModItems.ingot_starmetal, 2), 2.0F); GameRegistry.addSmelting(ModItems.crystal_trixite, new ItemStack(ModItems.ingot_plutonium, 4), 2.0F); - GameRegistry.addSmelting(ModItems.gem_tantalium, new ItemStack(ModItems.ingot_tantalium, 1), 2.0F); GameRegistry.addSmelting(ModItems.circuit_schrabidium, new ItemStack(ModItems.circuit_gold, 1), 1.0F); GameRegistry.addSmelting(ModItems.circuit_gold, new ItemStack(ModItems.circuit_red_copper, 1), 1.0F); diff --git a/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java b/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java index 0ac60abdd..e2deecf55 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java +++ b/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java @@ -11,87 +11,86 @@ import net.minecraft.tileentity.TileEntity; public class RenderSmallReactor extends TileEntitySpecialRenderer { - @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); + @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); GL11.glRotatef(180, 0F, 1F, 0F); - - TileEntityMachineReactorSmall reactor = (TileEntityMachineReactorSmall)tileEntity; - bindTexture(ResourceManager.reactor_small_base_tex); - ResourceManager.reactor_small_base.renderAll(); + TileEntityMachineReactorSmall reactor = (TileEntityMachineReactorSmall) tileEntity; - GL11.glPushMatrix(); - GL11.glTranslated(0.0D, reactor.rods / 100D, 0.0D); + bindTexture(ResourceManager.reactor_small_base_tex); + ResourceManager.reactor_small_base.renderAll(); - bindTexture(ResourceManager.reactor_small_rods_tex); - ResourceManager.reactor_small_rods.renderAll(); + GL11.glPushMatrix(); + GL11.glTranslated(0.0D, reactor.rods / 100D, 0.0D); - GL11.glPopMatrix(); - - if(reactor.coreHeat > 0 && reactor.isSubmerged()) { - - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_LIGHTING); + bindTexture(ResourceManager.reactor_small_rods_tex); + ResourceManager.reactor_small_rods.renderAll(); + + GL11.glPopMatrix(); + + if(reactor.coreHeat > 0 && reactor.isSubmerged()) { + + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_LIGHTING); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glDisable(GL11.GL_ALPHA_TEST); - - Tessellator tess = Tessellator.instance; - - for(double d = 0.285; d < 0.7; d += 0.025) { - - tess.startDrawingQuads(); - tess.setColorRGBA_F(0.4F, 0.9F, 1.0F, 0.15F); - - double top = 1.375; - double bottom = 1.375; - - tess.addVertex(d, bottom - d, -d); - tess.addVertex(d, top + d, -d); - tess.addVertex(d, top + d, d); - tess.addVertex(d, bottom - d, d); - - tess.addVertex(-d, bottom - d, -d); - tess.addVertex(-d, top + d, -d); - tess.addVertex(-d, top + d, d); - tess.addVertex(-d, bottom - d, d); - - tess.addVertex(-d, bottom - d, d); - tess.addVertex(-d, top + d, d); - tess.addVertex(d, top + d, d); - tess.addVertex(d, bottom - d, d); - - tess.addVertex(-d, bottom - d, -d); - tess.addVertex(-d, top + d, -d); - tess.addVertex(d, top + d, -d); - tess.addVertex(d, bottom - d, -d); - - tess.addVertex(-d, top + d, -d); - tess.addVertex(-d, top + d, d); - tess.addVertex(d, top + d, d); - tess.addVertex(d, top + d, -d); - - tess.addVertex(-d, bottom - d, -d); - tess.addVertex(-d, bottom - d, d); - tess.addVertex(d, bottom - d, d); - tess.addVertex(d, bottom - d, -d); - - tess.draw(); - } - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_ALPHA_TEST); - } - - GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glPopMatrix(); - } + Tessellator tess = Tessellator.instance; + + for(double d = 0.285; d < 0.7; d += 0.025) { + + tess.startDrawingQuads(); + tess.setColorRGBA_F(0.4F, 0.9F, 1.0F, 0.15F); + + double top = 1.375; + double bottom = 1.375; + + tess.addVertex(d, bottom - d, -d); + tess.addVertex(d, top + d, -d); + tess.addVertex(d, top + d, d); + tess.addVertex(d, bottom - d, d); + + tess.addVertex(-d, bottom - d, -d); + tess.addVertex(-d, top + d, -d); + tess.addVertex(-d, top + d, d); + tess.addVertex(-d, bottom - d, d); + + tess.addVertex(-d, bottom - d, d); + tess.addVertex(-d, top + d, d); + tess.addVertex(d, top + d, d); + tess.addVertex(d, bottom - d, d); + + tess.addVertex(-d, bottom - d, -d); + tess.addVertex(-d, top + d, -d); + tess.addVertex(d, top + d, -d); + tess.addVertex(d, bottom - d, -d); + + tess.addVertex(-d, top + d, -d); + tess.addVertex(-d, top + d, d); + tess.addVertex(d, top + d, d); + tess.addVertex(d, top + d, -d); + + tess.addVertex(-d, bottom - d, -d); + tess.addVertex(-d, bottom - d, d); + tess.addVertex(d, bottom - d, d); + tess.addVertex(d, bottom - d, -d); + + tess.draw(); + } + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_ALPHA_TEST); + } + + GL11.glEnable(GL11.GL_CULL_FACE); + + GL11.glPopMatrix(); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index d18a4b31c..fcfe01f07 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -821,9 +821,9 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI public boolean isSubmerged() { - return worldObj.getBlock(xCoord + 1, yCoord + 1, zCoord).getMaterial() == Material.water && - worldObj.getBlock(xCoord, yCoord + 1, zCoord + 1).getMaterial() == Material.water && - worldObj.getBlock(xCoord - 1, yCoord + 1, zCoord).getMaterial() == Material.water && + return worldObj.getBlock(xCoord + 1, yCoord + 1, zCoord).getMaterial() == Material.water || + worldObj.getBlock(xCoord, yCoord + 1, zCoord + 1).getMaterial() == Material.water || + worldObj.getBlock(xCoord - 1, yCoord + 1, zCoord).getMaterial() == Material.water || worldObj.getBlock(xCoord, yCoord + 1, zCoord - 1).getMaterial() == Material.water; } } \ No newline at end of file diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index cf265f98d..637283a60 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -2014,6 +2014,7 @@ item.powder_spark_mix.name=Sparkmischung item.powder_steel.name=Stahlstaub item.powder_steel_tiny.name=Kleiner Haufen Stahlstaub item.powder_strontium.name=Strontiumstaub +item.powder_tantalium.name=Tantalstaub item.powder_tcalloy.name=Technetiumstahlstaub item.powder_tennessine.name=Tennessinstaub item.powder_thermite.name=Thermit @@ -3159,6 +3160,7 @@ tile.residue.name=Wolkenrückstände tile.safe.name=Panzerschrank tile.sand_boron.name=Borsand tile.sand_boron_layer.name=Borsanddecke +tile.sand_gold.name=Goldsand tile.sand_lead.name=Bleisand tile.sand_polonium.name=Poloniumsand tile.sand_uranium.name=Uransand diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index c78d70e4b..f93b59852 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2083,6 +2083,7 @@ item.powder_spark_mix.name=Spark Blend item.powder_steel.name=Steel Powder item.powder_steel_tiny.name=Tiny Pile of Steel Powder item.powder_strontium.name=Strontium Powder +item.powder_tantalium.name=Tantalium Powder item.powder_tcalloy.name=Technetium Steel Powder item.powder_tennessine.name=Tennessine Powder item.powder_thermite.name=Thermite @@ -3242,6 +3243,7 @@ tile.residue.name=Cloud Residue tile.safe.name=Safe tile.sand_boron.name=Boron Sand tile.sand_boron_layer.name=Boron Sand Layer +tile.sand_gold.name=Gold Sand tile.sand_lead.name=Lead Sand tile.sand_polonium.name=Polonium Sand tile.sand_uranium.name=Uranium Sand diff --git a/src/main/resources/assets/hbm/textures/blocks/sand_gold.png b/src/main/resources/assets/hbm/textures/blocks/sand_gold.png new file mode 100644 index 000000000..353d5e372 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/sand_gold.png differ diff --git a/src/main/resources/assets/hbm/textures/items/powder_tantalium.png b/src/main/resources/assets/hbm/textures/items/powder_tantalium.png new file mode 100644 index 000000000..d00b3992d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/powder_tantalium.png differ