diff --git a/build.gradle b/build.gradle index 00ec4c8a84..474197bf63 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.9.6' +version = '1.9.7' group = 'com.hbm' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'NTM-Extended-1.12.2' diff --git a/gradle.properties b/gradle.properties index e1d41f0adb..aa4f984357 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ org.gradle.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true version_mc=1.12.2 -version=1.9.6 +version=1.9.7 version_jei=4.16.1.302 version_crafttweaker=4.1.14.521 diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 941bddd15f..c17a9377d0 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -454,6 +454,7 @@ public SoundEvent getBreakSound() { public static final Block ore_nether_schrabidium = new BlockOre(Material.ROCK, "ore_nether_schrabidium", 3).addRadiation(ItemHazard.ore * ItemHazard.sa326).addBlinding().toBlock().setHardness(15.0F).setResistance(600.0F).setCreativeTab(MainRegistry.resourceTab); public static final Block stone_depth_nether = new BlockDepth("stone_depth_nether").setCreativeTab(MainRegistry.resourceTab); public static final Block ore_depth_nether_neodymium = new BlockDepthOre("ore_depth_nether_neodymium").setCreativeTab(MainRegistry.resourceTab); + public static final Block ore_depth_nether_nitan = new BlockDepthOre("ore_depth_nether_nitan").setCreativeTab(MainRegistry.resourceTab); public static final Block block_meteor = new BlockOre(Material.ROCK, "block_meteor", 3).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); public static final Block block_meteor_cobble = new BlockOre(Material.ROCK, "block_meteor_cobble", 2).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); @@ -659,7 +660,15 @@ public SoundEvent getBreakSound() { public static final Block sellafield_2 = new BlockHazard(Material.ROCK, SoundType.STONE, "sellafield_2").addRadiation(20.0F).toBlock().setHardness(5.0F).setResistance(6F).setCreativeTab(MainRegistry.resourceTab); public static final Block sellafield_3 = new BlockHazard(Material.ROCK, SoundType.STONE, "sellafield_3").addRadiation(40.0F).addFire(2).toBlock().setHardness(5.0F).setResistance(7F).setCreativeTab(MainRegistry.resourceTab); public static final Block sellafield_4 = new BlockHazard(Material.ROCK, SoundType.STONE, "sellafield_4").addRadiation(80.0F).addFire(10).toBlock().setHardness(5.0F).setResistance(8F).setCreativeTab(MainRegistry.resourceTab); - public static final Block sellafield_core = new BlockHazard(Material.ROCK, SoundType.STONE, "sellafield_core").addRadiation(4000.0F).addFire(15).toBlock().setHardness(10.0F).setResistance(9F).setCreativeTab(MainRegistry.resourceTab); + public static final Block sellafield_core = new BlockHazard(Material.ROCK, SoundType.STONE, "sellafield_core").addRadiation(2000.0F).addFire(15).toBlock().setHardness(10.0F).setResistance(9F).setCreativeTab(MainRegistry.resourceTab); + + public static final Block baleonitite_slaked = new BlockHazard(Material.ROCK, SoundType.STONE, "baleonitite_slaked").addRadiation(25F).toBlock().setHardness(5.0F).setResistance(6F).setCreativeTab(MainRegistry.resourceTab); + public static final Block baleonitite_0 = new BlockHazard(Material.ROCK, SoundType.STONE, "baleonitite_0").addRadiation(50.0F).toBlock().setHardness(5.0F).setResistance(6F).setCreativeTab(MainRegistry.resourceTab); + public static final Block baleonitite_1 = new BlockHazard(Material.ROCK, SoundType.STONE, "baleonitite_1").addRadiation(100.0F).toBlock().setHardness(5.0F).setResistance(6F).setCreativeTab(MainRegistry.resourceTab); + public static final Block baleonitite_2 = new BlockHazard(Material.ROCK, SoundType.STONE, "baleonitite_2").addRadiation(200.0F).toBlock().setHardness(5.0F).setResistance(6F).setCreativeTab(MainRegistry.resourceTab); + public static final Block baleonitite_3 = new BlockHazard(Material.ROCK, SoundType.STONE, "baleonitite_3").addRadiation(400.0F).addFire(2).toBlock().setHardness(5.0F).setResistance(7F).setCreativeTab(MainRegistry.resourceTab); + public static final Block baleonitite_4 = new BlockHazard(Material.ROCK, SoundType.STONE, "baleonitite_4").addRadiation(800.0F).addFire(10).toBlock().setHardness(5.0F).setResistance(8F).setCreativeTab(MainRegistry.resourceTab); + public static final Block baleonitite_core = new BlockHazard(Material.ROCK, SoundType.STONE, "baleonitite_core").addRadiation(4000.0F).addFire(15).toBlock().setHardness(10.0F).setResistance(9F).setCreativeTab(MainRegistry.resourceTab); public static final Block geysir_water = new BlockGeysir(Material.ROCK, "geysir_water").setSoundType(SoundType.STONE).setHardness(5.0F).setCreativeTab(MainRegistry.resourceTab); public static final Block geysir_chlorine = new BlockGeysir(Material.ROCK, "geysir_chlorine").setSoundType(SoundType.STONE).setHardness(5.0F).setCreativeTab(MainRegistry.resourceTab); diff --git a/src/main/java/com/hbm/blocks/generic/BlockClean.java b/src/main/java/com/hbm/blocks/generic/BlockClean.java index 1995eb2749..8c42b107a5 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockClean.java +++ b/src/main/java/com/hbm/blocks/generic/BlockClean.java @@ -3,10 +3,13 @@ import java.util.List; import com.hbm.blocks.BlockBase; +import com.hbm.blocks.ModBlocks; import com.hbm.util.I18nUtil; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.util.math.BlockPos; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -22,4 +25,12 @@ public void addInformation(ItemStack stack, World player, List tooltip, tooltip.add(" §b"+I18nUtil.resolveKey("trait.cleanroom.desc")); super.addInformation(stack, player, tooltip, advanced); } + + public static void getUsed(Block b, BlockPos pos, World world){ + if(b == ModBlocks.tile_lab && world.rand.nextInt(2000) == 0){ + world.setBlockState(pos, ModBlocks.tile_lab_cracked.getDefaultState()); + } else if(b == ModBlocks.tile_lab_cracked && world.rand.nextInt(10000) == 0){ + world.setBlockState(pos, ModBlocks.tile_lab_broken.getDefaultState()); + } + } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockDepth.java b/src/main/java/com/hbm/blocks/generic/BlockDepth.java index 1b973fe197..a316039721 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockDepth.java +++ b/src/main/java/com/hbm/blocks/generic/BlockDepth.java @@ -19,6 +19,7 @@ public BlockDepth(String s){ super(Material.ROCK); this.setUnlocalizedName(s); this.setRegistryName(s); + this.setHarvestLevel("pickaxe", 3); this.setBlockUnbreakable(); this.setResistance(10.0F); diff --git a/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java b/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java index 5f59c35a0b..63430101d1 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java @@ -34,6 +34,9 @@ public Item getItemDropped(IBlockState state, Random rand, int fortune){ if(this == ModBlocks.ore_depth_nether_neodymium) { return ModItems.fragment_neodymium; } + if(this == ModBlocks.ore_depth_nether_nitan) { + return ModItems.powder_nitan_mix; + } return super.getItemDropped(state, rand, fortune); } @@ -50,6 +53,9 @@ public int quantityDropped(Random rand) { if(this == ModBlocks.ore_depth_nether_neodymium) { return 2 + rand.nextInt(2); } + if(this == ModBlocks.ore_depth_nether_nitan) { + return 1; + } return super.quantityDropped(rand); } diff --git a/src/main/java/com/hbm/blocks/generic/BlockHazard.java b/src/main/java/com/hbm/blocks/generic/BlockHazard.java index 84c54b4f79..5921dfae34 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockHazard.java +++ b/src/main/java/com/hbm/blocks/generic/BlockHazard.java @@ -226,51 +226,98 @@ public void onEntityWalk(World worldIn, BlockPos pos, Entity entity) { if (entity instanceof EntityLivingBase && this == ModBlocks.frozen_dirt) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 2 * 60 * 20, 2)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.block_trinitite) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 30 * 20, 2)); + return; } + if (entity instanceof EntityLivingBase && this == ModBlocks.sellafield_0) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 30 * 20, 0)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.sellafield_1) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 25 * 20, 1)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.sellafield_2) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 20 * 20, 3)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.sellafield_3) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 15 * 20, 7)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.sellafield_4) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 10 * 20, 15)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.sellafield_core) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 5 * 20, 79)); + return; + } + + if (entity instanceof EntityLivingBase && this == ModBlocks.baleonitite_0) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 30 * 20, 1)); + return; + } + if (entity instanceof EntityLivingBase && this == ModBlocks.baleonitite_1) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 25 * 20, 2)); + return; + } + if (entity instanceof EntityLivingBase && this == ModBlocks.baleonitite_2) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 20 * 20, 7)); + return; + } + if (entity instanceof EntityLivingBase && this == ModBlocks.baleonitite_3) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 15 * 20, 15)); + return; + } + if (entity instanceof EntityLivingBase && this == ModBlocks.baleonitite_4) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 10 * 20, 31)); + return; + } + if (entity instanceof EntityLivingBase && this == ModBlocks.baleonitite_core) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 5 * 20, 159)); + return; } + if (entity instanceof EntityLivingBase && this == ModBlocks.block_waste) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 30 * 20, 49)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.brick_jungle_ooze) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.radiation, 15 * 20, 9)); + return; } if (entity instanceof EntityLivingBase && this == ModBlocks.brick_jungle_mystic) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(HbmPotion.taint, 15 * 20, 2)); + return; } - if(this == ModBlocks.block_meteor_molten || this == ModBlocks.block_au198) + if(this == ModBlocks.block_meteor_molten || this == ModBlocks.block_au198){ entity.setFire(5); - if(this == ModBlocks.brick_jungle_lava) + return; + } + if(this == ModBlocks.brick_jungle_lava){ entity.setFire(10); + } } @Override diff --git a/src/main/java/com/hbm/blocks/generic/BlockOre.java b/src/main/java/com/hbm/blocks/generic/BlockOre.java index 99caef1014..eebe7da730 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOre.java @@ -90,7 +90,7 @@ public Item getItemDropped(IBlockState state, Random rand, int fortune) { case 3: return ModItems.fragment_lanthanium; case 4: return ModItems.fragment_neodymium; case 5: return ModItems.fragment_niobium; - case 6: if(rand.nextInt(3) == 0) return ModItems.fragment_actinium; + case 6: return ModItems.fragment_actinium; } } if(this == ModBlocks.block_meteor) diff --git a/src/main/java/com/hbm/config/BedrockOreJsonConfig.java b/src/main/java/com/hbm/config/BedrockOreJsonConfig.java index 2aef52ef5c..256b3a9907 100644 --- a/src/main/java/com/hbm/config/BedrockOreJsonConfig.java +++ b/src/main/java/com/hbm/config/BedrockOreJsonConfig.java @@ -44,8 +44,8 @@ public static boolean isOreAllowed(int dimID, String ore){ } public static void setDefaults() { - addEntry(0, 30, Arrays.asList("orePlutonium", "oreQuartz", "oreInfernalCoal", "oreRedPhosphorus", "oreSchrabidium"), false); - addEntry(-1, 60, Arrays.asList("orePlutonium", "oreQuartz", "oreInfernalCoal", "oreRedPhosphorus", "oreSchrabidium"), true); + addEntry(0, 30, Arrays.asList("orePlutonium", "oreQuartz", "oreInfernalCoal", "oreRedPhosphorus", "oreSchrabidium", "oreNeodymium", "oreNitanium"), false); + addEntry(-1, 60, Arrays.asList("orePlutonium", "oreQuartz", "oreInfernalCoal", "oreRedPhosphorus", "oreSchrabidium", "oreNeodymium", "oreNitanium"), true); } public static void addEntry(int dimID, int rarity, List ores, Boolean isWhiteList){ diff --git a/src/main/java/com/hbm/config/MachineConfig.java b/src/main/java/com/hbm/config/MachineConfig.java index f499a35d79..dbe887e04f 100644 --- a/src/main/java/com/hbm/config/MachineConfig.java +++ b/src/main/java/com/hbm/config/MachineConfig.java @@ -39,6 +39,7 @@ public class MachineConfig { public static int gasPerBedrockDepositBlockMinFrackingTower = 10; public static int gasPerBedrockDepositBlockMaxExtraFrackingTower = 50; + public static int uuMixerFluidRatio = 100; public static boolean uuMixerFluidListIsWhitelist = false; public static HashSet blacklistedMixerFluids; @@ -89,7 +90,8 @@ public static void loadFromConfig(Configuration config) { gasPerBedrockDepositBlockMinFrackingTower = CommonConfig.createConfigInt(config, CATEGORY_MACHINE, generateConfigName(22, "gasPerBedrockDepositBlockMinFrackingTower"), "Controls how much natrual gas at minimum is extracted per bedrock deposit block for Fracking towers", 10); gasPerBedrockDepositBlockMaxExtraFrackingTower = CommonConfig.createConfigInt(config, CATEGORY_MACHINE, generateConfigName(23, "gasPerBedrockDepositBlockMaxExtraFrackingTower"), "Controls how much extra natrual gas can be extracted per bedrock deposit block for Fracking towers", 50); - uuMixerFluidListIsWhitelist = CommonConfig.createConfigBool(config, CATEGORY_MACHINE, generateConfigName(24, "uuMixerFluidListIsWhitelist"), "If true then the follwing list of fluids is a whitelist. Otherwise it is a Blacklist", false); - blacklistedMixerFluids = CommonConfig.createConfigHashSet(config, CATEGORY_MACHINE, generateConfigName(25, "blacklistedUUMixerFluids"), "List of fluids that can not be made by UU Mixer. - (String)", "String", new String[]{ "liquid_osmiridium" }); + uuMixerFluidRatio = CommonConfig.createConfigInt(config, CATEGORY_MACHINE, generateConfigName(24, "uuMixerFluidRatio"), "How much mB of UU-Matter is used per mB of output fluid", 100); + uuMixerFluidListIsWhitelist = CommonConfig.createConfigBool(config, CATEGORY_MACHINE, generateConfigName(25, "uuMixerFluidListIsWhitelist"), "If true then the follwing list of fluids is a whitelist. Otherwise it is a Blacklist", false); + blacklistedMixerFluids = CommonConfig.createConfigHashSet(config, CATEGORY_MACHINE, generateConfigName(26, "blacklistedUUMixerFluids"), "List of fluids that can not be made by UU Mixer. - (String)", "String", new String[]{ "liquid_osmiridium" }); } } diff --git a/src/main/java/com/hbm/entity/mob/EntityGlowingOne.java b/src/main/java/com/hbm/entity/mob/EntityGlowingOne.java index d6a277a39e..c9ba0fd526 100644 --- a/src/main/java/com/hbm/entity/mob/EntityGlowingOne.java +++ b/src/main/java/com/hbm/entity/mob/EntityGlowingOne.java @@ -2,18 +2,19 @@ import java.util.List; +import com.hbm.items.ModItems; +import com.hbm.lib.RefStrings; import com.hbm.interfaces.IRadiationImmune; -import com.hbm.lib.HBMSoundHandler; import com.hbm.util.ContaminationUtil; import com.hbm.render.amlfrom1710.Vec3; -import net.minecraft.entity.EntityAgeable; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.item.Item; import net.minecraft.util.DamageSource; -import net.minecraft.util.SoundEvent; import net.minecraft.world.World; public class EntityGlowingOne extends EntityZombie implements IRadiationImmune { @@ -97,4 +98,15 @@ protected boolean shouldBurnInDay(){ protected boolean isValidLightLevel(){ return false; } + + @Override + public boolean attackEntityAsMob(Entity x){ + return true; + } + + @Override + protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) { + super.dropLoot(wasRecentlyHit, lootingModifier, source); + this.dropItem(ModItems.cap_rad, Math.max(1, lootingModifier)); + } } diff --git a/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java b/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java index e6cd14908f..983fb7fb50 100644 --- a/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java +++ b/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java @@ -237,7 +237,7 @@ protected SoundEvent getDeathSound(){ public void onDeath(DamageSource p_70645_1_){ super.onDeath(p_70645_1_); - List players = world.getEntitiesWithinAABB(EntityPlayer.class, this.getEntityBoundingBox().grow(50, 50, 50)); + List players = world.getEntitiesWithinAABB(EntityPlayer.class, this.getEntityBoundingBox().grow(10, 10, 10)); for(EntityPlayer player : players) { AdvancementManager.grantAchievement(player, AdvancementManager.bossCreeper); diff --git a/src/main/java/com/hbm/explosion/ExplosionBalefire.java b/src/main/java/com/hbm/explosion/ExplosionBalefire.java index 22f026fcdf..18ae62b92b 100644 --- a/src/main/java/com/hbm/explosion/ExplosionBalefire.java +++ b/src/main/java/com/hbm/explosion/ExplosionBalefire.java @@ -129,17 +129,17 @@ private void breakColumn(int x, int z) if(b == ModBlocks.block_schrabidium_cluster) worldObj.setBlockState(new BlockPos(pX, y, pZ), ModBlocks.block_euphemium_cluster.getStateFromMeta(b.getMetaFromState(worldObj.getBlockState(new BlockPos(pX, y, pZ)))), 3); } - int startDepth = (int)(6 - 6 * dist / radius); + int startDepth = (int)(6 * dist / radius); for(int i = 0; i <= startDepth; i++) { if(worldObj.getBlockState(new BlockPos(pX, depth-i, pZ)).getBlock() == Blocks.STONE){ switch(startDepth-i){ - case 6: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.sellafield_core.getDefaultState()); break; - case 5: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.sellafield_4.getDefaultState()); break; - case 4: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.sellafield_3.getDefaultState()); break; - case 3: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.sellafield_2.getDefaultState()); break; - case 2: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.sellafield_1.getDefaultState()); break; - case 1: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.sellafield_0.getDefaultState()); break; - case 0: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.sellafield_slaked.getDefaultState()); break; + case 6: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.baleonitite_core.getDefaultState()); break; + case 5: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.baleonitite_4.getDefaultState()); break; + case 4: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.baleonitite_3.getDefaultState()); break; + case 3: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.baleonitite_2.getDefaultState()); break; + case 2: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.baleonitite_1.getDefaultState()); break; + case 1: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.baleonitite_0.getDefaultState()); break; + case 0: worldObj.setBlockState(new BlockPos(pX, depth-i, pZ), ModBlocks.baleonitite_slaked.getDefaultState()); break; } } } diff --git a/src/main/java/com/hbm/explosion/ExplosionChaos.java b/src/main/java/com/hbm/explosion/ExplosionChaos.java index ddbf0bf857..1aa8c687f0 100644 --- a/src/main/java/com/hbm/explosion/ExplosionChaos.java +++ b/src/main/java/com/hbm/explosion/ExplosionChaos.java @@ -722,7 +722,7 @@ public static void plasma(World world, int x, int y, int z, int radius) { if(ZZ < r22 + world.rand.nextInt(r22 / 2)) { pos.setPos(X, Y, Z); Block block =world.getBlockState(pos).getBlock(); - if(block.getExplosionResistance(null) > 999) continue; + if(block.getExplosionResistance(null) > 0.1F) continue; if(block != Blocks.BEDROCK && world.getBlockState(pos).getBlock() != ModBlocks.statue_elb && world.getBlockState(pos).getBlock() != ModBlocks.statue_elb_g && world.getBlockState(pos).getBlock() != ModBlocks.statue_elb_w diff --git a/src/main/java/com/hbm/handler/HazmatRegistry.java b/src/main/java/com/hbm/handler/HazmatRegistry.java index 5bbf741a01..031e283495 100644 --- a/src/main/java/com/hbm/handler/HazmatRegistry.java +++ b/src/main/java/com/hbm/handler/HazmatRegistry.java @@ -2,6 +2,8 @@ import java.util.HashMap; import java.util.Map; +import java.math.BigDecimal; +import java.math.RoundingMode; import com.hbm.items.ModItems; import com.hbm.items.armor.ItemModCladding; @@ -71,7 +73,10 @@ public static float getResistance(EntityLivingBase player) { res += 0.1F * (1+radx.getAmplifier()); return res; + } + public static double fixRounding(double value){ + return BigDecimal.valueOf(value).setScale(4, RoundingMode.HALF_UP).doubleValue(); } public static void registerHazmats() { @@ -85,7 +90,7 @@ public static void registerHazmats() { double boots = 0.1D; double iron = 0.0225D; // 5% - double gold = 0.0225D; // 5% + double gold = 0.03D; // 5% double steel = 0.045D; // 10% double titanium = 0.045D; // 10% double alloy = 0.07D; // 15% @@ -111,86 +116,86 @@ public static void registerHazmats() { double schrab = 1D; // 90.0% double euph = 10D; // 99.99999999% - HazmatRegistry.registerHazmat(ModItems.hazmat_helmet, hazYellow * helmet); - HazmatRegistry.registerHazmat(ModItems.hazmat_plate, hazYellow * chest); - HazmatRegistry.registerHazmat(ModItems.hazmat_legs, hazYellow * legs); - HazmatRegistry.registerHazmat(ModItems.hazmat_boots, hazYellow * boots); - - HazmatRegistry.registerHazmat(ModItems.hazmat_helmet_red, hazRed * helmet); - HazmatRegistry.registerHazmat(ModItems.hazmat_plate_red, hazRed * chest); - HazmatRegistry.registerHazmat(ModItems.hazmat_legs_red, hazRed * legs); - HazmatRegistry.registerHazmat(ModItems.hazmat_boots_red, hazRed * boots); - - HazmatRegistry.registerHazmat(ModItems.hazmat_helmet_grey, hazGray * helmet); - HazmatRegistry.registerHazmat(ModItems.hazmat_plate_grey, hazGray * chest); - HazmatRegistry.registerHazmat(ModItems.hazmat_legs_grey, hazGray * legs); - HazmatRegistry.registerHazmat(ModItems.hazmat_boots_grey, hazGray * boots); - - HazmatRegistry.registerHazmat(ModItems.liquidator_helmet, liquidator * helmet); - HazmatRegistry.registerHazmat(ModItems.liquidator_plate, liquidator * chest); - HazmatRegistry.registerHazmat(ModItems.liquidator_legs, liquidator * legs); - HazmatRegistry.registerHazmat(ModItems.liquidator_boots, liquidator * boots); - - HazmatRegistry.registerHazmat(ModItems.t45_helmet, t45 * helmet); - HazmatRegistry.registerHazmat(ModItems.t45_plate, t45 * chest); - HazmatRegistry.registerHazmat(ModItems.t45_legs, t45 * legs); - HazmatRegistry.registerHazmat(ModItems.t45_boots, t45 * boots); - - HazmatRegistry.registerHazmat(ModItems.ajr_helmet, ajr * helmet); - HazmatRegistry.registerHazmat(ModItems.ajr_plate, ajr * chest); - HazmatRegistry.registerHazmat(ModItems.ajr_legs, ajr * legs); - HazmatRegistry.registerHazmat(ModItems.ajr_boots, ajr * boots); - - HazmatRegistry.registerHazmat(ModItems.ajro_helmet, ajr * helmet); - HazmatRegistry.registerHazmat(ModItems.ajro_plate, ajr * chest); - HazmatRegistry.registerHazmat(ModItems.ajro_legs, ajr * legs); - HazmatRegistry.registerHazmat(ModItems.ajro_boots, ajr * boots); - - HazmatRegistry.registerHazmat(ModItems.rpa_helmet, rpa * helmet); - HazmatRegistry.registerHazmat(ModItems.rpa_plate, rpa * chest); - HazmatRegistry.registerHazmat(ModItems.rpa_legs, rpa * legs); - HazmatRegistry.registerHazmat(ModItems.rpa_boots, rpa * boots); - - HazmatRegistry.registerHazmat(ModItems.bj_helmet, bj * helmet); - HazmatRegistry.registerHazmat(ModItems.bj_plate, bj * chest); - HazmatRegistry.registerHazmat(ModItems.bj_plate_jetpack, bj * chest); - HazmatRegistry.registerHazmat(ModItems.bj_legs, bj * legs); - HazmatRegistry.registerHazmat(ModItems.bj_boots, bj * boots); - - HazmatRegistry.registerHazmat(ModItems.hev_helmet, hev * helmet); - HazmatRegistry.registerHazmat(ModItems.hev_plate, hev * chest); - HazmatRegistry.registerHazmat(ModItems.hev_legs, hev * legs); - HazmatRegistry.registerHazmat(ModItems.hev_boots, hev * boots); + HazmatRegistry.registerHazmat(ModItems.hazmat_helmet, fixRounding(hazYellow * helmet)); + HazmatRegistry.registerHazmat(ModItems.hazmat_plate, fixRounding(hazYellow * chest)); + HazmatRegistry.registerHazmat(ModItems.hazmat_legs, fixRounding(hazYellow * legs)); + HazmatRegistry.registerHazmat(ModItems.hazmat_boots, fixRounding(hazYellow * boots)); + + HazmatRegistry.registerHazmat(ModItems.hazmat_helmet_red, fixRounding(hazRed * helmet)); + HazmatRegistry.registerHazmat(ModItems.hazmat_plate_red, fixRounding(hazRed * chest)); + HazmatRegistry.registerHazmat(ModItems.hazmat_legs_red, fixRounding(hazRed * legs)); + HazmatRegistry.registerHazmat(ModItems.hazmat_boots_red, fixRounding(hazRed * boots)); + + HazmatRegistry.registerHazmat(ModItems.hazmat_helmet_grey, fixRounding(hazGray * helmet)); + HazmatRegistry.registerHazmat(ModItems.hazmat_plate_grey, fixRounding(hazGray * chest)); + HazmatRegistry.registerHazmat(ModItems.hazmat_legs_grey, fixRounding(hazGray * legs)); + HazmatRegistry.registerHazmat(ModItems.hazmat_boots_grey, fixRounding(hazGray * boots)); + + HazmatRegistry.registerHazmat(ModItems.liquidator_helmet, fixRounding(liquidator * helmet)); + HazmatRegistry.registerHazmat(ModItems.liquidator_plate, fixRounding(liquidator * chest)); + HazmatRegistry.registerHazmat(ModItems.liquidator_legs, fixRounding(liquidator * legs)); + HazmatRegistry.registerHazmat(ModItems.liquidator_boots, fixRounding(liquidator * boots)); + + HazmatRegistry.registerHazmat(ModItems.t45_helmet, fixRounding(t45 * helmet)); + HazmatRegistry.registerHazmat(ModItems.t45_plate, fixRounding(t45 * chest)); + HazmatRegistry.registerHazmat(ModItems.t45_legs, fixRounding(t45 * legs)); + HazmatRegistry.registerHazmat(ModItems.t45_boots, fixRounding(t45 * boots)); + + HazmatRegistry.registerHazmat(ModItems.ajr_helmet, fixRounding(ajr * helmet)); + HazmatRegistry.registerHazmat(ModItems.ajr_plate, fixRounding(ajr * chest)); + HazmatRegistry.registerHazmat(ModItems.ajr_legs, fixRounding(ajr * legs)); + HazmatRegistry.registerHazmat(ModItems.ajr_boots, fixRounding(ajr * boots)); + + HazmatRegistry.registerHazmat(ModItems.ajro_helmet, fixRounding(ajr * helmet)); + HazmatRegistry.registerHazmat(ModItems.ajro_plate, fixRounding(ajr * chest)); + HazmatRegistry.registerHazmat(ModItems.ajro_legs, fixRounding(ajr * legs)); + HazmatRegistry.registerHazmat(ModItems.ajro_boots, fixRounding(ajr * boots)); + + HazmatRegistry.registerHazmat(ModItems.rpa_helmet, fixRounding(rpa * helmet)); + HazmatRegistry.registerHazmat(ModItems.rpa_plate, fixRounding(rpa * chest)); + HazmatRegistry.registerHazmat(ModItems.rpa_legs, fixRounding(rpa * legs)); + HazmatRegistry.registerHazmat(ModItems.rpa_boots, fixRounding(rpa * boots)); + + HazmatRegistry.registerHazmat(ModItems.bj_helmet, fixRounding(bj * helmet)); + HazmatRegistry.registerHazmat(ModItems.bj_plate, fixRounding(bj * chest)); + HazmatRegistry.registerHazmat(ModItems.bj_plate_jetpack, fixRounding(bj * chest)); + HazmatRegistry.registerHazmat(ModItems.bj_legs, fixRounding(bj * legs)); + HazmatRegistry.registerHazmat(ModItems.bj_boots, fixRounding(bj * boots)); + + HazmatRegistry.registerHazmat(ModItems.hev_helmet, fixRounding(hev * helmet)); + HazmatRegistry.registerHazmat(ModItems.hev_plate, fixRounding(hev * chest)); + HazmatRegistry.registerHazmat(ModItems.hev_legs, fixRounding(hev * legs)); + HazmatRegistry.registerHazmat(ModItems.hev_boots, fixRounding(hev * boots)); - HazmatRegistry.registerHazmat(ModItems.fau_helmet, fau * helmet); - HazmatRegistry.registerHazmat(ModItems.fau_plate, fau * chest); - HazmatRegistry.registerHazmat(ModItems.fau_legs, fau * legs); - HazmatRegistry.registerHazmat(ModItems.fau_boots, fau * boots); - - HazmatRegistry.registerHazmat(ModItems.dns_helmet, dns * helmet); - HazmatRegistry.registerHazmat(ModItems.dns_plate, dns * chest); - HazmatRegistry.registerHazmat(ModItems.dns_legs, dns * legs); - HazmatRegistry.registerHazmat(ModItems.dns_boots, dns * boots); - - HazmatRegistry.registerHazmat(ModItems.paa_helmet, paa * helmet); - HazmatRegistry.registerHazmat(ModItems.paa_plate, paa * chest); - HazmatRegistry.registerHazmat(ModItems.paa_legs, paa * legs); - HazmatRegistry.registerHazmat(ModItems.paa_boots, paa * boots); - - HazmatRegistry.registerHazmat(ModItems.hazmat_paa_helmet, paa * helmet); - HazmatRegistry.registerHazmat(ModItems.hazmat_paa_plate, paa * chest); - HazmatRegistry.registerHazmat(ModItems.hazmat_paa_legs, paa * legs); - HazmatRegistry.registerHazmat(ModItems.hazmat_paa_boots, paa * boots); - - HazmatRegistry.registerHazmat(ModItems.security_helmet, security * helmet); - HazmatRegistry.registerHazmat(ModItems.security_plate, security * chest); - HazmatRegistry.registerHazmat(ModItems.security_legs, security * legs); - HazmatRegistry.registerHazmat(ModItems.security_boots, security * boots); - - HazmatRegistry.registerHazmat(ModItems.starmetal_helmet, star * helmet); - HazmatRegistry.registerHazmat(ModItems.starmetal_plate, star * chest); - HazmatRegistry.registerHazmat(ModItems.starmetal_legs, star * legs); - HazmatRegistry.registerHazmat(ModItems.starmetal_boots, star * boots); + HazmatRegistry.registerHazmat(ModItems.fau_helmet, fixRounding(fau * helmet)); + HazmatRegistry.registerHazmat(ModItems.fau_plate, fixRounding(fau * chest)); + HazmatRegistry.registerHazmat(ModItems.fau_legs, fixRounding(fau * legs)); + HazmatRegistry.registerHazmat(ModItems.fau_boots, fixRounding(fau * boots)); + + HazmatRegistry.registerHazmat(ModItems.dns_helmet, fixRounding(dns * helmet)); + HazmatRegistry.registerHazmat(ModItems.dns_plate, fixRounding(dns * chest)); + HazmatRegistry.registerHazmat(ModItems.dns_legs, fixRounding(dns * legs)); + HazmatRegistry.registerHazmat(ModItems.dns_boots, fixRounding(dns * boots)); + + HazmatRegistry.registerHazmat(ModItems.paa_helmet, fixRounding(paa * helmet)); + HazmatRegistry.registerHazmat(ModItems.paa_plate, fixRounding(paa * chest)); + HazmatRegistry.registerHazmat(ModItems.paa_legs, fixRounding(paa * legs)); + HazmatRegistry.registerHazmat(ModItems.paa_boots, fixRounding(paa * boots)); + + HazmatRegistry.registerHazmat(ModItems.hazmat_paa_helmet, fixRounding(paa * helmet)); + HazmatRegistry.registerHazmat(ModItems.hazmat_paa_plate, fixRounding(paa * chest)); + HazmatRegistry.registerHazmat(ModItems.hazmat_paa_legs, fixRounding(paa * legs)); + HazmatRegistry.registerHazmat(ModItems.hazmat_paa_boots, fixRounding(paa * boots)); + + HazmatRegistry.registerHazmat(ModItems.security_helmet, fixRounding(security * helmet)); + HazmatRegistry.registerHazmat(ModItems.security_plate, fixRounding(security * chest)); + HazmatRegistry.registerHazmat(ModItems.security_legs, fixRounding(security * legs)); + HazmatRegistry.registerHazmat(ModItems.security_boots, fixRounding(security * boots)); + + HazmatRegistry.registerHazmat(ModItems.starmetal_helmet, fixRounding(star * helmet)); + HazmatRegistry.registerHazmat(ModItems.starmetal_plate, fixRounding(star * chest)); + HazmatRegistry.registerHazmat(ModItems.starmetal_legs, fixRounding(star * legs)); + HazmatRegistry.registerHazmat(ModItems.starmetal_boots, fixRounding(star * boots)); HazmatRegistry.registerHazmat(ModItems.jackt, 0.1); HazmatRegistry.registerHazmat(ModItems.jackt2, 0.1); @@ -198,49 +203,49 @@ public static void registerHazmats() { HazmatRegistry.registerHazmat(ModItems.gas_mask, 0.07); HazmatRegistry.registerHazmat(ModItems.gas_mask_m65, 0.095); - HazmatRegistry.registerHazmat(ModItems.steel_helmet, steel * helmet); - HazmatRegistry.registerHazmat(ModItems.steel_plate, steel * chest); - HazmatRegistry.registerHazmat(ModItems.steel_legs, steel * legs); - HazmatRegistry.registerHazmat(ModItems.steel_boots, steel * boots); - - HazmatRegistry.registerHazmat(ModItems.titanium_helmet, titanium * helmet); - HazmatRegistry.registerHazmat(ModItems.titanium_plate, titanium * chest); - HazmatRegistry.registerHazmat(ModItems.titanium_legs, titanium * legs); - HazmatRegistry.registerHazmat(ModItems.titanium_boots, titanium * boots); - - HazmatRegistry.registerHazmat(ModItems.cobalt_helmet, cobalt * helmet); - HazmatRegistry.registerHazmat(ModItems.cobalt_plate, cobalt * chest); - HazmatRegistry.registerHazmat(ModItems.cobalt_legs, cobalt * legs); - HazmatRegistry.registerHazmat(ModItems.cobalt_boots, cobalt * boots); - - HazmatRegistry.registerHazmat(Items.IRON_HELMET, iron * helmet); - HazmatRegistry.registerHazmat(Items.IRON_CHESTPLATE, iron * chest); - HazmatRegistry.registerHazmat(Items.IRON_LEGGINGS, iron * legs); - HazmatRegistry.registerHazmat(Items.IRON_BOOTS, iron * boots); - - HazmatRegistry.registerHazmat(Items.GOLDEN_HELMET, gold * helmet); - HazmatRegistry.registerHazmat(Items.GOLDEN_CHESTPLATE, gold * chest); - HazmatRegistry.registerHazmat(Items.GOLDEN_LEGGINGS, gold * legs); - HazmatRegistry.registerHazmat(Items.GOLDEN_BOOTS, gold * boots); - - HazmatRegistry.registerHazmat(ModItems.alloy_helmet, alloy * helmet); - HazmatRegistry.registerHazmat(ModItems.alloy_plate, alloy * chest); - HazmatRegistry.registerHazmat(ModItems.alloy_legs, alloy * legs); - HazmatRegistry.registerHazmat(ModItems.alloy_boots, alloy * boots); - - HazmatRegistry.registerHazmat(ModItems.cmb_helmet, cmb * helmet); - HazmatRegistry.registerHazmat(ModItems.cmb_plate, cmb * chest); - HazmatRegistry.registerHazmat(ModItems.cmb_legs, cmb * legs); - HazmatRegistry.registerHazmat(ModItems.cmb_boots, cmb * boots); - - HazmatRegistry.registerHazmat(ModItems.schrabidium_helmet, schrab * helmet); - HazmatRegistry.registerHazmat(ModItems.schrabidium_plate, schrab * chest); - HazmatRegistry.registerHazmat(ModItems.schrabidium_legs, schrab * legs); - HazmatRegistry.registerHazmat(ModItems.schrabidium_boots, schrab * boots); - - HazmatRegistry.registerHazmat(ModItems.euphemium_helmet, euph * helmet); - HazmatRegistry.registerHazmat(ModItems.euphemium_plate, euph * chest); - HazmatRegistry.registerHazmat(ModItems.euphemium_legs, euph * legs); - HazmatRegistry.registerHazmat(ModItems.euphemium_boots, euph * boots); + HazmatRegistry.registerHazmat(ModItems.steel_helmet, fixRounding(steel * helmet)); + HazmatRegistry.registerHazmat(ModItems.steel_plate, fixRounding(steel * chest)); + HazmatRegistry.registerHazmat(ModItems.steel_legs, fixRounding(steel * legs)); + HazmatRegistry.registerHazmat(ModItems.steel_boots, fixRounding(steel * boots)); + + HazmatRegistry.registerHazmat(ModItems.titanium_helmet, fixRounding(titanium * helmet)); + HazmatRegistry.registerHazmat(ModItems.titanium_plate, fixRounding(titanium * chest)); + HazmatRegistry.registerHazmat(ModItems.titanium_legs, fixRounding(titanium * legs)); + HazmatRegistry.registerHazmat(ModItems.titanium_boots, fixRounding(titanium * boots)); + + HazmatRegistry.registerHazmat(ModItems.cobalt_helmet, fixRounding(cobalt * helmet)); + HazmatRegistry.registerHazmat(ModItems.cobalt_plate, fixRounding(cobalt * chest)); + HazmatRegistry.registerHazmat(ModItems.cobalt_legs, fixRounding(cobalt * legs)); + HazmatRegistry.registerHazmat(ModItems.cobalt_boots, fixRounding(cobalt * boots)); + + HazmatRegistry.registerHazmat(Items.IRON_HELMET, fixRounding(iron * helmet)); + HazmatRegistry.registerHazmat(Items.IRON_CHESTPLATE, fixRounding(iron * chest)); + HazmatRegistry.registerHazmat(Items.IRON_LEGGINGS, fixRounding(iron * legs)); + HazmatRegistry.registerHazmat(Items.IRON_BOOTS, fixRounding(iron * boots)); + + HazmatRegistry.registerHazmat(Items.GOLDEN_HELMET, fixRounding(gold * helmet)); + HazmatRegistry.registerHazmat(Items.GOLDEN_CHESTPLATE, fixRounding(gold * chest)); + HazmatRegistry.registerHazmat(Items.GOLDEN_LEGGINGS, fixRounding(gold * legs)); + HazmatRegistry.registerHazmat(Items.GOLDEN_BOOTS, fixRounding(gold * boots)); + + HazmatRegistry.registerHazmat(ModItems.alloy_helmet, fixRounding(alloy * helmet)); + HazmatRegistry.registerHazmat(ModItems.alloy_plate, fixRounding(alloy * chest)); + HazmatRegistry.registerHazmat(ModItems.alloy_legs, fixRounding(alloy * legs)); + HazmatRegistry.registerHazmat(ModItems.alloy_boots, fixRounding(alloy * boots)); + + HazmatRegistry.registerHazmat(ModItems.cmb_helmet, fixRounding(cmb * helmet)); + HazmatRegistry.registerHazmat(ModItems.cmb_plate, fixRounding(cmb * chest)); + HazmatRegistry.registerHazmat(ModItems.cmb_legs, fixRounding(cmb * legs)); + HazmatRegistry.registerHazmat(ModItems.cmb_boots, fixRounding(cmb * boots)); + + HazmatRegistry.registerHazmat(ModItems.schrabidium_helmet, fixRounding(schrab * helmet)); + HazmatRegistry.registerHazmat(ModItems.schrabidium_plate, fixRounding(schrab * chest)); + HazmatRegistry.registerHazmat(ModItems.schrabidium_legs, fixRounding(schrab * legs)); + HazmatRegistry.registerHazmat(ModItems.schrabidium_boots, fixRounding(schrab * boots)); + + HazmatRegistry.registerHazmat(ModItems.euphemium_helmet, fixRounding(euph * helmet)); + HazmatRegistry.registerHazmat(ModItems.euphemium_plate, fixRounding(euph * chest)); + HazmatRegistry.registerHazmat(ModItems.euphemium_legs, fixRounding(euph * legs)); + HazmatRegistry.registerHazmat(ModItems.euphemium_boots, fixRounding(euph * boots)); } } diff --git a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/CentrifugeRecipes.java index 52bba85f45..8f5bae0b58 100644 --- a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/CentrifugeRecipes.java @@ -283,13 +283,13 @@ public static void register() { recipes.put(new ComparableStack(ModItems.ore_bedrock_perfect, 1, oreMeta), new ItemStack[] { new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta), - new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta), - new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta) }); + new ItemStack(Blocks.GRAVEL, 1), + new ItemStack(Blocks.GRAVEL, 1) }); recipes.put(new ComparableStack(ModItems.ore_bedrock_enriched, 1, oreMeta), new ItemStack[] { ItemBedrockOre.getOut(oreMeta, 1), ItemBedrockOre.getOut(oreMeta, 1), ItemBedrockOre.getOut(oreMeta, 1), - new ItemStack(Blocks.GRAVEL, 1) }); + ItemBedrockOre.getOut(oreMeta, 1) }); } } diff --git a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/CrystallizerRecipes.java index 850d5ddad4..1940f1c809 100644 --- a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java +++ b/src/main/java/com/hbm/inventory/CrystallizerRecipes.java @@ -60,7 +60,7 @@ public static void register() { addRecipe(SA326.ore(), new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_schrabidium)); addRecipe(LI.ore(), new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_lithium)); addRecipe(STAR.ore(), new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_starmetal)); - addRecipe("oreRareEarth", new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_rare)); + addRecipe(RAREEARTH.ore(), new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_rare)); addRecipe(CO.ore(), new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_cobalt)); addRecipe(CINNABAR.ore(), new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_cinnebar)); addRecipe(ASBESTOS.ore(), new FluidStack(ModForgeFluids.sulfuric_acid, 500), new ItemStack(ModItems.crystal_asbestos)); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 337f460bce..11726d8b4e 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -135,6 +135,8 @@ public class OreDictManager { /* * STABLE */ + public static final DictFrame RAREEARTH = new DictFrame("RareEarth"); + public static final DictFrame NITANIUM = new DictFrame("Nitanium"); /** TITANIUM */ public static final DictFrame TI = new DictFrame("Titanium"); /** COPPER */ @@ -321,6 +323,8 @@ public static void registerOres() { KNO .dust(niter) .block(block_niter) .crystal(crystal_niter) .ore(ore_niter); F .dust(fluorite) .block(block_fluorite) .crystal(crystal_fluorite) .ore(ore_fluorite, basalt_fluorite); INFERNAL .gem(coal_infernal) .ore(ore_nether_coal); + RAREEARTH .dust(powder_desh_mix) .ore(ore_rare, ore_gneiss_rare); + NITANIUM .dust(powder_nitan_mix) .ore(ore_depth_nether_nitan); //Compounds MINGRADE .ingot(ingot_red_copper) .dust(powder_red_copper) .block(block_red_copper); @@ -444,8 +448,6 @@ public static void registerOres() { } OreDictionary.registerOre(getReflector(), neutron_reflector); - OreDictionary.registerOre("oreRareEarth", ore_rare); - OreDictionary.registerOre("oreRareEarth", ore_gneiss_rare); OreDictionary.registerOre("logWood", pink_log); OreDictionary.registerOre("logWoodPink", pink_log); diff --git a/src/main/java/com/hbm/inventory/ShredderRecipes.java b/src/main/java/com/hbm/inventory/ShredderRecipes.java index e41a3a9c2c..4b692d465d 100644 --- a/src/main/java/com/hbm/inventory/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/ShredderRecipes.java @@ -284,6 +284,7 @@ public static void registerOverrides() { ShredderRecipes.setRecipe(ModItems.turret_rocket_ammo, new ItemStack(Items.GUNPOWDER, 4)); ShredderRecipes.setRecipe(ModItems.turret_cwis_ammo, new ItemStack(Items.GUNPOWDER, 4)); ShredderRecipes.setRecipe(ModItems.turret_tau_ammo, new ItemStack(ModItems.powder_uranium, 4)); + ShredderRecipes.setRecipe(ModBlocks.ore_nether_coal, new ItemStack(ModItems.coal_infernal, 2)); for(int i = 0; i < 16; i++) { ShredderRecipes.setRecipe(new ItemStack(Blocks.STAINED_HARDENED_CLAY, 1, i), new ItemStack(Items.CLAY_BALL, 4)); @@ -291,20 +292,16 @@ public static void registerOverrides() { } for(Integer oreMeta : BedrockOreRegistry.oreIndexes.keySet()) { - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_centrifuged, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_cleaned, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_separated, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_deepcleaned, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_purified, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_nitrated, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_nitrocrystalline, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_seared, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_exquisite, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); - ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_perfect, 1, oreMeta), new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta)); int type = ItemBedrockOre.getOutType(oreMeta); - if(type == 0 || type == 1) + if(type == 0 || type == 1){ + ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, 2)); + ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_cleaned, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, 2)); + ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_deepcleaned, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, 2)); + ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_nitrated, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, 2)); + ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_seared, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, 2)); + ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_perfect, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, 2)); ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, 2)); + } } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretBase.java b/src/main/java/com/hbm/inventory/gui/GUITurretBase.java index 68bf79e8d4..aa0ad207fa 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretBase.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretBase.java @@ -1,6 +1,7 @@ package com.hbm.inventory.gui; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import org.lwjgl.input.Keyboard; @@ -8,6 +9,7 @@ import com.hbm.inventory.container.ContainerTurretBase; import com.hbm.lib.RefStrings; +import com.hbm.util.I18nUtil; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; @@ -18,6 +20,7 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; @@ -55,44 +58,96 @@ public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 45, 16, 52, turret.power, turret.getMaxPower()); + + String on = "§a" + I18nUtil.resolveKey("turret.on"); + String off = "§c" + I18nUtil.resolveKey("turret.off"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 8, guiTop + 29, 10, 10, mouseX, mouseY, I18nUtil.resolveKeyArray("turret.players", turret.targetPlayers ? on : off)); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 22, guiTop + 29, 10, 10, mouseX, mouseY, I18nUtil.resolveKeyArray("turret.animals", turret.targetAnimals ? on : off)); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 36, guiTop + 29, 10, 10, mouseX, mouseY, I18nUtil.resolveKeyArray("turret.mobs", turret.targetMobs ? on : off)); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 50, guiTop + 29, 10, 10, mouseX, mouseY, I18nUtil.resolveKeyArray("turret.machines", turret.targetMachines ? on : off)); + + drawAmmo(mouseX, mouseY); + super.renderHoveredToolTip(mouseX, mouseY); } + public void drawAmmo(int mouseX, int mouseY){ + if(this.guiLeft + 79 <= mouseX && guiLeft + 79 + 54 > mouseX && guiTop + 61 < mouseY && guiTop + 61 + 54 >= mouseY) { + + boolean draw = true; + for(int i = 1; i < 10; i++) { + if(this.isMouseOverSlot(this.inventorySlots.getSlot(i), mouseX, mouseY) && this.inventorySlots.getSlot(i).getHasStack()) { + draw = false; + break; + } + } + + if(draw) { + List list = new ArrayList(turret.getAmmoTypesForDisplay()); + List lines = new ArrayList(); + ItemStack selected = list.get(0); + int highLight = 0; + if(list.size() > 1) { + int cycle = (int) ((System.currentTimeMillis() % (1000 * list.size())) / 1000); + selected = ((ItemStack) list.get(cycle)).copy(); + highLight = cycle; + list.set(cycle, selected); + } + + if(list.size() < 10) { + lines.add(list.toArray()); + } else if(list.size() < 24) { + lines.add(list.subList(0, list.size() / 2).toArray()); + lines.add(list.subList(list.size() / 2, list.size()).toArray()); + } else { + int bound0 = (int) Math.ceil(list.size() / 3D); + int bound1 = (int) Math.ceil(list.size() / 3D * 2D); + lines.add(list.subList(0, bound0).toArray()); + lines.add(list.subList(bound0, bound1).toArray()); + lines.add(list.subList(bound1, list.size()).toArray()); + } + + lines.add(new Object[] {I18nUtil.resolveKey(selected.getDisplayName())}); + this.drawStackText(lines, mouseX, mouseY, this.fontRenderer, highLight); + } + } + } + protected void mouseClicked(int x, int y, int i) throws IOException { super.mouseClicked(x, y, i); boolean flag = x >= this.field.x && x < this.field.x + this.field.width && y >= this.field.y && y < this.field.y + this.field.height; this.field.setFocused(flag); - if(guiLeft + 115 <= x && guiLeft + 115 + 18 > x && guiTop + 26 < y && guiTop + 26 + 18 >= y) { + if(guiLeft + 115 <= x && guiLeft + 115 + 18 > x && guiTop + 25 < y && guiTop + 25 + 18 >= y) { mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(turret.getPos().getX(), turret.getPos().getY(), turret.getPos().getZ(), 0, 0)); return; } - if(guiLeft + 8 <= x && guiLeft + 8 + 10 > x && guiTop + 30 < y && guiTop + 30 + 10 >= y) { + if(guiLeft + 8 <= x && guiLeft + 8 + 10 > x && guiTop + 29 < y && guiTop + 29 + 10 >= y) { mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(turret.getPos().getX(), turret.getPos().getY(), turret.getPos().getZ(), 0, 1)); return; } - if(guiLeft + 22 <= x && guiLeft + 22 + 10 > x && guiTop + 30 < y && guiTop + 30 + 10 >= y) { + if(guiLeft + 22 <= x && guiLeft + 22 + 10 > x && guiTop + 29 < y && guiTop + 29 + 10 >= y) { mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(turret.getPos().getX(), turret.getPos().getY(), turret.getPos().getZ(), 0, 2)); return; } - if(guiLeft + 36 <= x && guiLeft + 36 + 10 > x && guiTop + 30 < y && guiTop + 30 + 10 >= y) { + if(guiLeft + 36 <= x && guiLeft + 36 + 10 > x && guiTop + 29 < y && guiTop + 29 + 10 >= y) { mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(turret.getPos().getX(), turret.getPos().getY(), turret.getPos().getZ(), 0, 3)); return; } - if(guiLeft + 50 <= x && guiLeft + 50 + 10 > x && guiTop + 30 < y && guiTop + 30 + 10 >= y) { + if(guiLeft + 50 <= x && guiLeft + 50 + 10 > x && guiTop + 29 < y && guiTop + 29 + 10 >= y) { mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(turret.getPos().getX(), turret.getPos().getY(), turret.getPos().getZ(), 0, 4)); @@ -146,13 +201,17 @@ protected void mouseClicked(int x, int y, int i) throws IOException { return; } } + + public int getTurretFontColor(){ + return 0x808080; + } @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.turret.hasCustomInventoryName() ? this.turret.getInventoryName() : I18n.format(this.turret.getInventoryName()); - this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6, 0x808080); - this.fontRenderer.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 0x808080); + this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6, getTurretFontColor()); + this.fontRenderer.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, getTurretFontColor()); List names = turret.getWhitelist(); diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretChekhov.java b/src/main/java/com/hbm/inventory/gui/GUITurretChekhov.java index f39e19f44e..83cecf42e3 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretChekhov.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretChekhov.java @@ -9,4 +9,9 @@ public class GUITurretChekhov extends GUITurretBase { public GUITurretChekhov(InventoryPlayer invPlayer, TileEntityTurretBaseNT tedf) { super(invPlayer, tedf); } + + @Override + public int getTurretFontColor(){ + return 0x373737; + } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretFriendly.java b/src/main/java/com/hbm/inventory/gui/GUITurretFriendly.java index 4e71fa48b8..1a4ab13544 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretFriendly.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretFriendly.java @@ -17,4 +17,9 @@ public GUITurretFriendly(InventoryPlayer invPlayer, TileEntityTurretBaseNT tedf) protected ResourceLocation getTexture() { return texture; } + + @Override + public int getTurretFontColor(){ + return 0x373737; + } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java b/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java index 965997901c..cd99f48da1 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java @@ -35,4 +35,8 @@ protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int mX, int mY protected ResourceLocation getTexture() { return texture; } + + @Override + public void drawAmmo(int mouseX, int mouseY){ + } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretHoward.java b/src/main/java/com/hbm/inventory/gui/GUITurretHoward.java index 31f36d0657..18868b8a66 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretHoward.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretHoward.java @@ -17,4 +17,9 @@ public GUITurretHoward(InventoryPlayer invPlayer, TileEntityTurretBaseNT tedf) { protected ResourceLocation getTexture() { return texture; } + + @Override + public int getTurretFontColor(){ + return 0x04141C; + } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretJeremy.java b/src/main/java/com/hbm/inventory/gui/GUITurretJeremy.java index 12a0f920c3..d3bf66b2bb 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretJeremy.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretJeremy.java @@ -17,4 +17,9 @@ public GUITurretJeremy(InventoryPlayer invPlayer, TileEntityTurretBaseNT tedf) { protected ResourceLocation getTexture() { return texture; } + + @Override + public int getTurretFontColor(){ + return 0x373737; + } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretMaxwell.java b/src/main/java/com/hbm/inventory/gui/GUITurretMaxwell.java index 20bde3a54c..e601870c06 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretMaxwell.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretMaxwell.java @@ -17,4 +17,13 @@ public GUITurretMaxwell(InventoryPlayer invPlayer, TileEntityTurretBaseNT tedf) protected ResourceLocation getTexture() { return texture; } + + @Override + public void drawAmmo(int mouseX, int mouseY){ + } + + @Override + public int getTurretFontColor(){ + return 0x0C0C0C; + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretRichard.java b/src/main/java/com/hbm/inventory/gui/GUITurretRichard.java index a284dd5f27..b763bc009c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretRichard.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretRichard.java @@ -17,4 +17,9 @@ public GUITurretRichard(InventoryPlayer invPlayer, TileEntityTurretBaseNT tedf) protected ResourceLocation getTexture() { return texture; } + + @Override + public int getTurretFontColor(){ + return 0x433B33; + } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretTauon.java b/src/main/java/com/hbm/inventory/gui/GUITurretTauon.java index fadf9bd519..c125368319 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretTauon.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretTauon.java @@ -17,4 +17,9 @@ public GUITurretTauon(InventoryPlayer invPlayer, TileEntityTurretBaseNT tedf) { protected ResourceLocation getTexture() { return texture; } + + @Override + public int getTurretFontColor(){ + return 0x121514; + } } diff --git a/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java b/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java index 3f12353801..d8d8f50fbe 100644 --- a/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java +++ b/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java @@ -1,15 +1,22 @@ package com.hbm.inventory.gui; +import java.util.Iterator; import java.util.Arrays; import java.util.List; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; public abstract class GuiInfoContainer extends GuiContainer { @@ -93,4 +100,122 @@ public void drawInfoPanel(int x, int y, int width, int height, int type) { } } + protected void drawStackText(List lines, int x, int y, FontRenderer font, int highLightIndex) { + + if(!lines.isEmpty()) { + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + + int height = 0; + int longestline = 0; + Iterator iterator = lines.iterator(); + + while(iterator.hasNext()) { + Object[] line = (Object[]) iterator.next(); + int lineWidth = 0; + + boolean hasStack = false; + + for(Object o : line) { + + if(o instanceof String) { + lineWidth += font.getStringWidth((String) o); + } else { + lineWidth += 18; + hasStack = true; + } + } + + if(hasStack) { + height += 18; + } else { + height += 10; + } + + if(lineWidth > longestline) { + longestline = lineWidth; + } + } + + int minX = x + 12; + int minY = y - 12; + + if(minX + longestline > this.width) { + minX -= 28 + longestline; + } + + if(minY + height + 6 > this.height) { + minY = this.height - height - 6; + } + + this.zLevel = 400.0F; + itemRender.zLevel = 400.0F; + //int j1 = -267386864; + int colorBg = 0xF0100010; + this.drawGradientRect(minX - 3, minY - 4, minX + longestline + 3, minY - 3, colorBg, colorBg); + this.drawGradientRect(minX - 3, minY + height + 3, minX + longestline + 3, minY + height + 4, colorBg, colorBg); + this.drawGradientRect(minX - 3, minY - 3, minX + longestline + 3, minY + height + 3, colorBg, colorBg); + this.drawGradientRect(minX - 4, minY - 3, minX - 3, minY + height + 3, colorBg, colorBg); + this.drawGradientRect(minX + longestline + 3, minY - 3, minX + longestline + 4, minY + height + 3, colorBg, colorBg); + //int k1 = 1347420415; + int color0 = 0x505000FF; + //int l1 = (k1 & 16711422) >> 1 | k1 & -16777216; + int color1 = (color0 & 0xFEFEFE) >> 1 | color0 & 0xFF000000; + this.drawGradientRect(minX - 3, minY - 3 + 1, minX - 3 + 1, minY + height + 3 - 1, color0, color1); + this.drawGradientRect(minX + longestline + 2, minY - 3 + 1, minX + longestline + 3, minY + height + 3 - 1, color0, color1); + this.drawGradientRect(minX - 3, minY - 3, minX + longestline + 3, minY - 3 + 1, color0, color0); + this.drawGradientRect(minX - 3, minY + height + 2, minX + longestline + 3, minY + height + 3, color1, color1); + + int totalLen = 0; + for(int index = 0; index < lines.size(); index++) { + + Object[] line = (Object[]) lines.get(index); + int indent = 0; + boolean hasStack = false; + + for(Object o : line) { + if(!(o instanceof String)) { + hasStack = true; + } + } + + for(int i = 0; i < line.length; i++) { + Object o = line[i]; + if(o instanceof String) { + font.drawStringWithShadow((String) o, minX + indent, minY + (hasStack ? 4 : 0), -1); + indent += font.getStringWidth((String) o) + 2; + } else { + ItemStack stack = (ItemStack) o; + GL11.glColor3f(1F, 1F, 1F); + + if(totalLen + i == highLightIndex) { + this.drawGradientRect(minX + indent - 1, minY - 1, minX + indent + 17, minY + 17, 0xffff0000, 0xffff0000); + this.drawGradientRect(minX + indent, minY, minX + indent + 16, minY + 16, 0xff808080, 0xff808080); + } + GL11.glEnable(GL11.GL_DEPTH_TEST); + itemRender.renderItemAndEffectIntoGUI(stack, minX + indent, minY); + itemRender.renderItemOverlayIntoGUI(this.fontRenderer, stack, minX + indent, minY, ""); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL11.GL_DEPTH_TEST); + indent += 18; + } + } + + if(index == 0) { + minY += 2; + } + totalLen += line.length; + minY += hasStack ? 18 : 10; + } + + this.zLevel = 0.0F; + itemRender.zLevel = 0.0F; + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + RenderHelper.enableStandardItemLighting(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + } + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/items/special/ItemContaminating.java b/src/main/java/com/hbm/items/special/ItemContaminating.java index fc5ca1b677..cbf555a7b5 100644 --- a/src/main/java/com/hbm/items/special/ItemContaminating.java +++ b/src/main/java/com/hbm/items/special/ItemContaminating.java @@ -40,7 +40,9 @@ public ItemContaminating(float radiation, boolean fire, boolean blinding, String @Override public boolean onEntityItemUpdate(EntityItem entityItem){ if(entityItem != null && !entityItem.world.isRemote && entityItem.onGround) { - if(isCleanGround(new BlockPos(entityItem.posX, entityItem.posY, entityItem.posZ), entityItem.world)) return false; + if(isCleanGround(new BlockPos(entityItem.posX, entityItem.posY, entityItem.posZ), entityItem.world)){ + return false; + } if(falloutBallRadius > 1){ EntityFalloutUnderGround falloutBall = new EntityFalloutUnderGround(entityItem.world); falloutBall.posX = entityItem.posX; @@ -56,7 +58,12 @@ public boolean onEntityItemUpdate(EntityItem entityItem){ } public static boolean isCleanGround(BlockPos pos, World world){ - return world.getBlockState(pos.down()).getBlock() instanceof BlockClean; + Block b = world.getBlockState(pos.down()).getBlock(); + boolean isClean = b instanceof BlockClean; + if(isClean){ + BlockClean.getUsed(b, pos.down(), world); + } + return isClean; } @Override diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index ff3488f8dd..7d45344cb4 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -113,6 +113,8 @@ public void generateOres(World world, Random rand, int i, int j){ if(dimID == -1){ DepthDeposit.generateConditionNether(world, i, 0, 3, j, 7, 0.6D, ModBlocks.ore_depth_nether_neodymium, rand, 16); DepthDeposit.generateConditionNether(world, i, 125, 3, j, 7, 0.6D, ModBlocks.ore_depth_nether_neodymium, rand, 16); + DepthDeposit.generateConditionNether(world, i, 0, 3, j, 7, 0.6D, ModBlocks.ore_depth_nether_nitan, rand, 16); + DepthDeposit.generateConditionNether(world, i, 125, 3, j, 7, 0.6D, ModBlocks.ore_depth_nether_nitan, rand, 16); //Smoldering Rock for(int k = 0; k < 30; k++){ int x = i + rand.nextInt(16); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 391c1ea657..464e92f375 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -2867,6 +2867,12 @@ public static void addSmelting(){ public static void addBedrockOreSmelting(){ for(Integer oreMeta : BedrockOreRegistry.oreIndexes.keySet()) { + GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, ItemBedrockOre.getOutType(oreMeta) == 2 ? 2 : 1), 2F); + GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock_cleaned, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, ItemBedrockOre.getOutType(oreMeta) == 2 ? 2 : 1), 2F); + GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock_deepcleaned, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, ItemBedrockOre.getOutType(oreMeta) == 2 ? 2 : 1), 2F); + GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock_nitrated, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, ItemBedrockOre.getOutType(oreMeta) == 2 ? 2 : 1), 2F); + GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock_seared, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, ItemBedrockOre.getOutType(oreMeta) == 2 ? 2 : 1), 2F); + GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock_perfect, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, ItemBedrockOre.getOutType(oreMeta) == 2 ? 2 : 1), 2F); GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock_enriched, 1, oreMeta), ItemBedrockOre.getOut(oreMeta, ItemBedrockOre.getOutType(oreMeta) == 2 ? 2 : 1), 2F); } } diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index b64e4144d6..4db90fcf45 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -1780,10 +1780,7 @@ public void preRenderPlayer(RenderPlayerEvent.Pre evt) { @SubscribeEvent public void preRenderLiving(RenderLivingEvent.Pre event) { - //Mouse.isButtonDown(button) - //ForgeRegistries.ENTITIES.getKey(value); - //EntityMaskMan ent; - //EntityRegistry.getEntry(ent.getClass()); + if(specialDeathEffectEntities.contains(event.getEntity())){ event.setCanceled(true); } diff --git a/src/main/java/com/hbm/render/entity/RenderNuclearCreeper.java b/src/main/java/com/hbm/render/entity/RenderNuclearCreeper.java index 18a05ad7b2..9f2eec790b 100644 --- a/src/main/java/com/hbm/render/entity/RenderNuclearCreeper.java +++ b/src/main/java/com/hbm/render/entity/RenderNuclearCreeper.java @@ -12,8 +12,8 @@ import net.minecraft.util.math.MathHelper; public class RenderNuclearCreeper extends RenderLiving { - private static final ResourceLocation creeperTextures = new ResourceLocation(RefStrings.MODID + ":" + "textures/entity/creeper.png"); - /** The creeper model. */ + private static final ResourceLocation creeperTextures = new ResourceLocation(RefStrings.MODID + ":" + "textures/entity/creeper.png"); + /** The creeper model. */ public RenderNuclearCreeper(RenderManager rendermanagerIn) { super(rendermanagerIn, new ModelCreeper(), 0.5F); } diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java b/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java index cbfe53b856..2d69818193 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java @@ -11,8 +11,7 @@ public class RenderTurretJeremy extends RenderTurretBase { @Override - public void render(TileEntityTurretJeremy te, double x, double y, double z, float partialTicks, int destroyStage, float alpha){ - TileEntityTurretJeremy turret = (TileEntityTurretJeremy)te; + public void render(TileEntityTurretJeremy turret, double x, double y, double z, float partialTicks, int destroyStage, float alpha){ Vec3d pos = turret.getHorizontalOffset(); GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOilburner.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOilburner.java index 02c1f5ce4e..53bc3359c7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOilburner.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOilburner.java @@ -53,7 +53,7 @@ public class TileEntityHeaterOilburner extends TileEntityMachineBase implements public int heatEnergy = 0; - public static final int maxHeatEnergy = 100_000; + public static final int maxHeatEnergy = 1_000_000; public TileEntityHeaterOilburner() { super(3); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java index ff59217895..3d620b7a4e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java @@ -55,7 +55,6 @@ public class TileEntityMachineMixer extends TileEntityMachineBase implements ITi public boolean uuMixer = false; public static final int uuConsumption = 1_000_000; public static final long uuMaxPower = 200_000_000; - public static final int uuMattermbPerOutputmb = 100; public FluidTank[] tanks; private final UpgradeManager upgradeManager = new UpgradeManager(); @@ -189,7 +188,7 @@ private void updateTankSizes(){ if(tanks[0].getCapacity() != 2_000_000_000){ tanks[0] = FFUtils.changeTankSize(tanks[0], 2_000_000_000); tanks[1] = FFUtils.changeTankSize(tanks[1], 2_000_000_000); - tanks[2] = FFUtils.changeTankSize(tanks[2], 2_000_000_000/uuMattermbPerOutputmb); + tanks[2] = FFUtils.changeTankSize(tanks[2], 2_000_000_000/MachineConfig.uuMixerFluidRatio); this.markDirty(); } } else { @@ -257,7 +256,7 @@ public boolean canProcess() { //Mixing uu matter? if(uuMixer){ this.processTime = 200; - if(outputFluid != null && tanks[2].getFluidAmount() < tanks[2].getCapacity() && FFUtils.hasEnoughFluid(tanks[0], new FluidStack(ModForgeFluids.uu_matter, uuMattermbPerOutputmb))){ + if(outputFluid != null && tanks[2].getFluidAmount() < tanks[2].getCapacity() && FFUtils.hasEnoughFluid(tanks[0], new FluidStack(ModForgeFluids.uu_matter, MachineConfig.uuMixerFluidRatio))){ return true; } return false; @@ -289,8 +288,8 @@ public boolean canProcess() { protected void process() { if(uuMixer){ - int mbProduction = Math.min(tanks[2].getCapacity()-tanks[2].getFluidAmount(), tanks[0].getFluidAmount()/uuMattermbPerOutputmb); - tanks[0].drain(mbProduction * uuMattermbPerOutputmb, true); + int mbProduction = Math.min(tanks[2].getCapacity()-tanks[2].getFluidAmount(), tanks[0].getFluidAmount()/MachineConfig.uuMixerFluidRatio); + tanks[0].drain(mbProduction * MachineConfig.uuMixerFluidRatio, true); tanks[2].fill(new FluidStack(outputFluid, mbProduction), true); this.markDirty(); return; diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index d65f8140ce..1999141bcf 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -200,20 +200,7 @@ public void update(){ this.power = Library.chargeTEFromItems(inventory, 10, this.power, this.getMaxPower()); - NBTTagCompound data = new NBTTagCompound(); - if(this.tPos != null) { - data.setDouble("tX", this.tPos.x); - data.setDouble("tY", this.tPos.y); - data.setDouble("tZ", this.tPos.z); - } - data.setLong("power", this.power); - data.setBoolean("isOn", this.isOn); - data.setBoolean("targetPlayers", this.targetPlayers); - data.setBoolean("targetAnimals", this.targetAnimals); - data.setBoolean("targetMobs", this.targetMobs); - data.setBoolean("targetMachines", this.targetMachines); - data.setInteger("stattrak", this.stattrak); - this.networkPack(data, 250); + networkPack(); } else { @@ -231,6 +218,23 @@ public void update(){ } } } + + public void networkPack(){ + NBTTagCompound data = new NBTTagCompound(); + if(this.tPos != null) { + data.setDouble("tX", this.tPos.x); + data.setDouble("tY", this.tPos.y); + data.setDouble("tZ", this.tPos.z); + } + data.setLong("power", this.power); + data.setBoolean("isOn", this.isOn); + data.setBoolean("targetPlayers", this.targetPlayers); + data.setBoolean("targetAnimals", this.targetAnimals); + data.setBoolean("targetMobs", this.targetMobs); + data.setBoolean("targetMachines", this.targetMachines); + data.setInteger("stattrak", this.stattrak); + this.networkPack(data, 250); + } @Override public void networkUnpack(NBTTagCompound nbt){ @@ -729,6 +733,28 @@ public Vec3d getEntityPos(Entity e) { */ protected abstract List getAmmoList(); + @SideOnly(Side.CLIENT) + protected List ammoStacks; + + @SideOnly(Side.CLIENT) + public List getAmmoTypesForDisplay() { + + if(ammoStacks != null) + return ammoStacks; + + ammoStacks = new ArrayList(); + + for(Integer i : getAmmoList()) { + BulletConfiguration config = BulletConfigSyncingUtil.pullConfig(i); + + if(config != null && config.ammo != null) { + ammoStacks.add(new ItemStack(config.ammo)); + } + } + + return ammoStacks; + } + @Override public int[] getAccessibleSlotsFromSide(EnumFacing e){ return new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java index f9fa24ca8e..7641b02460 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java @@ -31,6 +31,9 @@ public class TileEntityTurretChekhov extends TileEntityTurretBaseNT { configs.add(BulletConfigSyncingUtil.BMG50_STAR); configs.add(BulletConfigSyncingUtil.BMG50_PHOSPHORUS); configs.add(BulletConfigSyncingUtil.BMG50_SLEEK); + configs.add(BulletConfigSyncingUtil.BMG50_FLECHETTE_NORMAL); + configs.add(BulletConfigSyncingUtil.BMG50_FLECHETTE_AM); + configs.add(BulletConfigSyncingUtil.BMG50_FLECHETTE_PO); configs.add(BulletConfigSyncingUtil.CHL_BMG50); } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java index 8c61152856..9a8df25d65 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java @@ -62,8 +62,8 @@ public double getDecetorRange(){ return 80D; } - int timer; - int reload; + public int timer; + public int reload; @Override public void update(){ @@ -101,7 +101,7 @@ public void updateFiringTick(){ data.setString("mode", "largeexplode"); data.setFloat("size", 0F); data.setByte("count", (byte)5); - PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, pos.xCoord + vec.xCoord, pos.yCoord + vec.zCoord, pos.zCoord + vec.zCoord), new TargetPoint(world.provider.getDimension(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 50)); + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, pos.xCoord + vec.xCoord, pos.yCoord + vec.yCoord, pos.zCoord + vec.zCoord), new TargetPoint(world.provider.getDimension(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 50)); } } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java index 2d45023021..847879f5a4 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java @@ -65,12 +65,12 @@ public double getDecetorRange() { @Override public long getMaxPower() { - return 10000000; + return 100_000_000; } @Override public long getConsumption() { - return 10000 - this.blueLevel * 300; + return 1_000_000 - this.blueLevel * 6000 + this.redLevel * 6000 + this.blackLevel * 60000 + this.pinkLevel * 12000; } @Override diff --git a/src/main/resources/assets/hbm/blockstates/baleonitite_0.json b/src/main/resources/assets/hbm/blockstates/baleonitite_0.json new file mode 100644 index 0000000000..61d5c2bacf --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/baleonitite_0.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:baleonitite_0" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/blockstates/baleonitite_1.json b/src/main/resources/assets/hbm/blockstates/baleonitite_1.json new file mode 100644 index 0000000000..199dc79381 --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/baleonitite_1.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:baleonitite_1" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/blockstates/baleonitite_2.json b/src/main/resources/assets/hbm/blockstates/baleonitite_2.json new file mode 100644 index 0000000000..1618bdc85e --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/baleonitite_2.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:baleonitite_2" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/blockstates/baleonitite_3.json b/src/main/resources/assets/hbm/blockstates/baleonitite_3.json new file mode 100644 index 0000000000..86e1b6a796 --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/baleonitite_3.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:baleonitite_3" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/blockstates/baleonitite_4.json b/src/main/resources/assets/hbm/blockstates/baleonitite_4.json new file mode 100644 index 0000000000..23bd1efda8 --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/baleonitite_4.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:baleonitite_4" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/blockstates/baleonitite_core.json b/src/main/resources/assets/hbm/blockstates/baleonitite_core.json new file mode 100644 index 0000000000..ba641c15e3 --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/baleonitite_core.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:baleonitite_core" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/blockstates/baleonitite_slaked.json b/src/main/resources/assets/hbm/blockstates/baleonitite_slaked.json new file mode 100644 index 0000000000..abf0ea9523 --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/baleonitite_slaked.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:baleonitite_slaked" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/blockstates/ore_depth_nether_nitan.json b/src/main/resources/assets/hbm/blockstates/ore_depth_nether_nitan.json new file mode 100644 index 0000000000..67c15a9f34 --- /dev/null +++ b/src/main/resources/assets/hbm/blockstates/ore_depth_nether_nitan.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "hbm:ore_depth_nether_nitan" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/lang/en_us.lang b/src/main/resources/assets/hbm/lang/en_us.lang index 38ede764b5..fa01d85da2 100644 --- a/src/main/resources/assets/hbm/lang/en_us.lang +++ b/src/main/resources/assets/hbm/lang/en_us.lang @@ -4,6 +4,14 @@ key.jetpack_hover=Toggle Jetpack Hover Mode key.jetpack_hud=Toggle Jetpack HUD mode key.fsb_flashlight=Toggle FSB Flashlights +turret.animals=Target Passive: %s +turret.machines=Target Machines: %s +turret.mobs=Target Mobs: %s +turret.none=None +turret.off=OFF +turret.on=ON +turret.players=Target Players: %s + item.drillbit_desh.name=Desh Drillbit item.drillbit_desh_diamond.name=Desh Drillbit (Diamond-Tipped) item.drillbit_ferro.name=Ferrouranium Drillbit @@ -3785,6 +3793,14 @@ tile.sellafield_3.name=Blazing Sellafite tile.sellafield_4.name=Infernal Sellafite tile.sellafield_core.name=Sellafite-Corium +tile.baleonitite_slaked.name=Slaked Baleonitite +tile.baleonitite_0.name=Baleonitite +tile.baleonitite_1.name=Hot Baleonitite +tile.baleonitite_2.name=Boiling Baleonitite +tile.baleonitite_3.name=Blazing Baleonitite +tile.baleonitite_4.name=Infernal Baleonitite +tile.baleonitite_core.name=Baleonitite-Corium + item.warhead_generic_small.name=Small Warhead item.warhead_generic_medium.name=Medium Warhead item.warhead_generic_large.name=Large Warhead @@ -4549,6 +4565,7 @@ tile.ore_cobalt.name=Cobalt Ore tile.ore_coltan.name=Coltan Ore tile.ore_depth_cinnebar.name=Depth Cinnabar Ore tile.ore_depth_nether_neodymium.name=Nether Depth Neodymium Ore +tile.ore_depth_nether_nitan.name=Nether Depth Nitanium Ore tile.ore_depth_zirconium.name=Depth Zirconium Ore tile.block_boron.name=Block of Boron tile.block_bismuth.name=Block of Bismuth-209 diff --git a/src/main/resources/assets/hbm/models/block/baleonitite_0.json b/src/main/resources/assets/hbm/models/block/baleonitite_0.json new file mode 100644 index 0000000000..743fb345fe --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/baleonitite_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/baleonitite_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/block/baleonitite_1.json b/src/main/resources/assets/hbm/models/block/baleonitite_1.json new file mode 100644 index 0000000000..ac114633d5 --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/baleonitite_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/baleonitite_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/block/baleonitite_2.json b/src/main/resources/assets/hbm/models/block/baleonitite_2.json new file mode 100644 index 0000000000..485157c6a3 --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/baleonitite_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/baleonitite_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/block/baleonitite_3.json b/src/main/resources/assets/hbm/models/block/baleonitite_3.json new file mode 100644 index 0000000000..6ede0147ab --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/baleonitite_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/baleonitite_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/block/baleonitite_4.json b/src/main/resources/assets/hbm/models/block/baleonitite_4.json new file mode 100644 index 0000000000..fbe1f9e896 --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/baleonitite_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/baleonitite_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/block/baleonitite_core.json b/src/main/resources/assets/hbm/models/block/baleonitite_core.json new file mode 100644 index 0000000000..6a00b28e97 --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/baleonitite_core.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/baleonitite_core" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/block/baleonitite_slaked.json b/src/main/resources/assets/hbm/models/block/baleonitite_slaked.json new file mode 100644 index 0000000000..0073134df7 --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/baleonitite_slaked.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/baleonitite_slaked" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/block/ore_depth_nether_nitan.json b/src/main/resources/assets/hbm/models/block/ore_depth_nether_nitan.json new file mode 100644 index 0000000000..65c4d50d65 --- /dev/null +++ b/src/main/resources/assets/hbm/models/block/ore_depth_nether_nitan.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "hbm:blocks/ore_depth_nether_nitan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/baleonitite_0.json b/src/main/resources/assets/hbm/models/item/baleonitite_0.json new file mode 100644 index 0000000000..e02f4d1b20 --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/baleonitite_0.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/baleonitite_0" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/baleonitite_1.json b/src/main/resources/assets/hbm/models/item/baleonitite_1.json new file mode 100644 index 0000000000..f9eac0b505 --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/baleonitite_1.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/baleonitite_1" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/baleonitite_2.json b/src/main/resources/assets/hbm/models/item/baleonitite_2.json new file mode 100644 index 0000000000..ade0025b3b --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/baleonitite_2.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/baleonitite_2" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/baleonitite_3.json b/src/main/resources/assets/hbm/models/item/baleonitite_3.json new file mode 100644 index 0000000000..2193d0ee51 --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/baleonitite_3.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/baleonitite_3" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/baleonitite_4.json b/src/main/resources/assets/hbm/models/item/baleonitite_4.json new file mode 100644 index 0000000000..10314cd328 --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/baleonitite_4.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/baleonitite_4" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/baleonitite_core.json b/src/main/resources/assets/hbm/models/item/baleonitite_core.json new file mode 100644 index 0000000000..0d8022a146 --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/baleonitite_core.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/baleonitite_core" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/baleonitite_slaked.json b/src/main/resources/assets/hbm/models/item/baleonitite_slaked.json new file mode 100644 index 0000000000..d0820e0e45 --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/baleonitite_slaked.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/baleonitite_slaked" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/models/item/ore_depth_nether_nitan.json b/src/main/resources/assets/hbm/models/item/ore_depth_nether_nitan.json new file mode 100644 index 0000000000..b1ebad401f --- /dev/null +++ b/src/main/resources/assets/hbm/models/item/ore_depth_nether_nitan.json @@ -0,0 +1,3 @@ +{ + "parent": "hbm:block/ore_depth_nether_nitan" +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/textures/blocks/baleonitite_0.png b/src/main/resources/assets/hbm/textures/blocks/baleonitite_0.png new file mode 100644 index 0000000000..351615cf77 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/baleonitite_0.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/baleonitite_1.png b/src/main/resources/assets/hbm/textures/blocks/baleonitite_1.png new file mode 100644 index 0000000000..ce2b5a173c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/baleonitite_1.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/baleonitite_2.png b/src/main/resources/assets/hbm/textures/blocks/baleonitite_2.png new file mode 100644 index 0000000000..bb7399d065 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/baleonitite_2.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/baleonitite_3.png b/src/main/resources/assets/hbm/textures/blocks/baleonitite_3.png new file mode 100644 index 0000000000..169334a7aa Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/baleonitite_3.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/baleonitite_4.png b/src/main/resources/assets/hbm/textures/blocks/baleonitite_4.png new file mode 100644 index 0000000000..3553bf574d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/baleonitite_4.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/baleonitite_core.png b/src/main/resources/assets/hbm/textures/blocks/baleonitite_core.png new file mode 100644 index 0000000000..5b7273cccd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/baleonitite_core.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/baleonitite_slaked.png b/src/main/resources/assets/hbm/textures/blocks/baleonitite_slaked.png new file mode 100644 index 0000000000..8336b13fb7 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/baleonitite_slaked.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/ore_depth_nether_nitan.png b/src/main/resources/assets/hbm/textures/blocks/ore_depth_nether_nitan.png new file mode 100644 index 0000000000..0dea01f861 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/ore_depth_nether_nitan.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_howard.png b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_howard.png index b140a65252..2b2d1733dc 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_howard.png and b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_howard.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_maxwell.png b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_maxwell.png index 8b80f93d79..dc8bd8c58e 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_maxwell.png and b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_maxwell.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_richard.png b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_richard.png index 2de11dfa7f..4404db7eab 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_richard.png and b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_richard.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_tau.png b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_tau.png index 9b891361bc..7e3ab0fd57 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_tau.png and b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_tau.png differ diff --git a/src/main/resources/assets/hbm/textures/items/wrench_flipped.png b/src/main/resources/assets/hbm/textures/items/wrench_flipped.png index e3b142e3ea..32fca47786 100644 Binary files a/src/main/resources/assets/hbm/textures/items/wrench_flipped.png and b/src/main/resources/assets/hbm/textures/items/wrench_flipped.png differ