From 99e01176b7fb78c6fadda8c4ebe5751502b10f7d Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 15 Mar 2022 15:51:30 +0100 Subject: [PATCH] some fixes, infinite bounding box block --- src/main/java/com/hbm/blocks/ModBlocks.java | 6 ++++++ src/main/java/com/hbm/blocks/test/TestBB.java | 18 ++++++++++++++++++ .../java/com/hbm/crafting/ArmorRecipes.java | 6 +++++- .../modifier/HazardModifierFuelRadiation.java | 1 - .../modifier/HazardModifierRBMKRadiation.java | 2 +- .../java/com/hbm/items/armor/ItemModPads.java | 9 +++++++++ .../com/hbm/items/machine/ItemRBMKPellet.java | 4 ---- .../hbm/textures/blocks/test_bb_bork.png | Bin 0 -> 191 bytes .../hbm/textures/blocks/test_bb_inf.png | Bin 0 -> 197 bytes 9 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/test/TestBB.java create mode 100644 src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/test_bb_inf.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 01f371737..b24dc073b 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -52,6 +52,8 @@ public class ModBlocks { public static Block test_conductor; public static Block test_ct; public static Block test_rail; + public static Block test_bb_bork; + public static Block test_bb_inf; public static Block ore_uranium; public static Block ore_uranium_scorched; @@ -1251,6 +1253,8 @@ public class ModBlocks { test_conductor = new TestConductor(Material.iron).setBlockName("test_conductor").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cable_neo"); test_ct = new TestCT(Material.iron).setBlockName("test_ct").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_ct"); test_rail = new TestRail(Material.iron).setBlockName("test_rail").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_rail"); + test_bb_bork = new TestRail(Material.iron).setBlockName("test_bb_bork").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_bb_bork"); + test_bb_inf = new TestBB(Material.iron).setBlockName("test_bb_inf").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_bb_inf"); ore_uranium = new BlockOutgas(Material.rock, true, 5, true).setBlockName("ore_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_uranium"); ore_uranium_scorched = new BlockOutgas(Material.rock, true, 5, true).setBlockName("ore_uranium_scorched").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_uranium_scorched"); @@ -2256,6 +2260,8 @@ public class ModBlocks { GameRegistry.registerBlock(test_conductor, test_conductor.getUnlocalizedName()); GameRegistry.registerBlock(test_ct, test_ct.getUnlocalizedName()); GameRegistry.registerBlock(test_rail, test_rail.getUnlocalizedName()); + GameRegistry.registerBlock(test_bb_bork, test_bb_bork.getUnlocalizedName()); + GameRegistry.registerBlock(test_bb_inf, test_bb_inf.getUnlocalizedName()); //Ores GameRegistry.registerBlock(ore_uranium, ore_uranium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/test/TestBB.java b/src/main/java/com/hbm/blocks/test/TestBB.java new file mode 100644 index 000000000..20d2bfa5c --- /dev/null +++ b/src/main/java/com/hbm/blocks/test/TestBB.java @@ -0,0 +1,18 @@ +package com.hbm.blocks.test; + +import com.hbm.blocks.ModBlocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class TestBB extends Block { + + public TestBB(Material mat) { + super(mat); + + if(this == ModBlocks.test_bb_bork) + this.setBlockBounds(-1000F, -1000F, -1000F, 1001F, 1001F, 1001F); + else + this.setBlockBounds(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY); + } +} diff --git a/src/main/java/com/hbm/crafting/ArmorRecipes.java b/src/main/java/com/hbm/crafting/ArmorRecipes.java index 358de71d4..965b8e066 100644 --- a/src/main/java/com/hbm/crafting/ArmorRecipes.java +++ b/src/main/java/com/hbm/crafting/ArmorRecipes.java @@ -78,7 +78,7 @@ public class ArmorRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.ajro_boots, 1), new Object[] { ModItems.ajr_boots, KEY_RED, KEY_BLACK }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_helmet, 1), new Object[] { "SBS", " C ", " I ", 'S', Items.string, 'B', new ItemStack(Blocks.wool, 1, 15), 'C', ModItems.circuit_targeting_tier4, 'I', STAR.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate, 1), new Object[] { "N N", "MSM", "NCN", 'N', ModItems.plate_armor_lunar, 'M', ModItems.motor_desh, 'S', ModItems.starmetal_plate, 'C', ModItems.circuit_targeting_tier5 }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate_jetpack, 1), new Object[] { "NFN", "TPT", "ICI", 'N', ModItems.plate_armor_lunar, 'F', ModItems.fins_quad_titanium, 'T', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.XENON.ordinal()), 'P', ModItems.bj_plate, 'I', ModItems.mp_thruster_10_xenon, 'C', ModItems.crystal_phosphorus }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate_jetpack, 1), new Object[] { "NFN", "TPT", "ICI", 'N', ModItems.plate_armor_lunar, 'F', ModItems.fins_quad_titanium, 'T', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.XENON.getID()), 'P', ModItems.bj_plate, 'I', ModItems.mp_thruster_10_xenon, 'C', ModItems.crystal_phosphorus }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_legs, 1), new Object[] { "MBM", "NSN", "N N", 'N', ModItems.plate_armor_lunar, 'M', ModItems.motor_desh, 'S', ModItems.starmetal_legs, 'B', ModBlocks.block_starmetal }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_boots, 1), new Object[] { "N N", "BSB", 'N', ModItems.plate_armor_lunar, 'S', ModItems.starmetal_boots, 'B', ModBlocks.block_starmetal }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.hev_helmet, 1), new Object[] { "PPC", "PBP", "IFI", 'P', ModItems.plate_armor_hev, 'C', ModItems.circuit_targeting_tier4, 'B', ModItems.titanium_helmet, 'I', ModItems.plate_polymer, 'F', ModItems.gas_mask_filter }); @@ -97,6 +97,10 @@ public class ArmorRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.rpa_plate, 1), new Object[] { "P P", "MLM", "PKP", 'L', DictFrame.fromOne(ModItems.parts_legendary, EnumLegendaryType.TIER2), 'K', ModItems.plate_kevlar, 'P', ModItems.plate_armor_ajr, 'M', ModItems.motor_desh }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.rpa_legs, 1), new Object[] { "MPM", "KLK", "P P", 'L', DictFrame.fromOne(ModItems.parts_legendary, EnumLegendaryType.TIER2), 'K', ModItems.plate_kevlar, 'P', ModItems.plate_armor_ajr, 'M', ModItems.motor_desh }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.rpa_boots, 1), new Object[] { "KLK", "P P", 'L', DictFrame.fromOne(ModItems.parts_legendary, EnumLegendaryType.TIER2), 'K', ModItems.plate_kevlar, 'P', ModItems.plate_armor_ajr }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.steamsuit_helmet, 1), new Object[] { "DCD", "CXC", " F ", 'D', DESH.ingot(), 'C', CU.plate(), 'X', ModItems.steel_helmet, 'F', ModItems.gas_mask_filter }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.steamsuit_plate, 1), new Object[] { "C C", "DXD", "CFC", 'D', DESH.ingot(), 'C', CU.plate(), 'X', ModItems.steel_plate, 'F', ModItems.tank_steel }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.steamsuit_legs, 1), new Object[] { "CCC", "DXD", "C C", 'D', DESH.ingot(), 'C', CU.plate(), 'X', ModItems.steel_legs }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.steamsuit_legs, 1), new Object[] { "C C", "DXD", 'D', DESH.ingot(), 'C', CU.plate(), 'X', ModItems.steel_boots }); //Euphemium armor CraftingManager.addRecipeAuto(new ItemStack(ModItems.euphemium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.plate_euphemium }); diff --git a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java index 7dfb687f1..c95a1e213 100644 --- a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java +++ b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java @@ -1,6 +1,5 @@ package com.hbm.hazard.modifier; -import com.hbm.hazard.HazardRegistry; import com.hbm.items.machine.ItemFuelRod; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/hbm/hazard/modifier/HazardModifierRBMKRadiation.java b/src/main/java/com/hbm/hazard/modifier/HazardModifierRBMKRadiation.java index e864c5480..fdd3c7bfd 100644 --- a/src/main/java/com/hbm/hazard/modifier/HazardModifierRBMKRadiation.java +++ b/src/main/java/com/hbm/hazard/modifier/HazardModifierRBMKRadiation.java @@ -27,7 +27,7 @@ public class HazardModifierRBMKRadiation extends HazardModifier { } else if(stack.getItem() instanceof ItemRBMKPellet) { - level = level + (target - level) * (ItemRBMKPellet.rectify(stack.getItemDamage()) / 4F); + level = level + (target - level) * ((ItemRBMKPellet.rectify(stack.getItemDamage()) % 5) / 4F); if(ItemRBMKPellet.hasXenon(stack.getItemDamage())) level += HazardRegistry.xe135 * HazardRegistry.nugget; diff --git a/src/main/java/com/hbm/items/armor/ItemModPads.java b/src/main/java/com/hbm/items/armor/ItemModPads.java index c936aa513..9e7d62556 100644 --- a/src/main/java/com/hbm/items/armor/ItemModPads.java +++ b/src/main/java/com/hbm/items/armor/ItemModPads.java @@ -8,7 +8,9 @@ import com.hbm.items.ModItems; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.event.entity.living.LivingHurtEvent; public class ItemModPads extends ItemArmorMod { @@ -40,6 +42,13 @@ public class ItemModPads extends ItemArmorMod { else list.add(EnumChatFormatting.DARK_PURPLE + " " + stack.getDisplayName() + " (-" + Math.round((1F - damageMod) * 100) + "% fall dmg)"); } + + @Override + public void modDamage(LivingHurtEvent event, ItemStack armor) { + + if(event.source == DamageSource.fall) + event.ammount *= damageMod; + } @Override public void modUpdate(EntityLivingBase entity, ItemStack armor) { diff --git a/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java b/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java index 72a77098e..5c416e640 100644 --- a/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java +++ b/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java @@ -9,15 +9,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; -import net.minecraft.world.World; public class ItemRBMKPellet extends ItemNuclearWaste { diff --git a/src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png b/src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png new file mode 100644 index 0000000000000000000000000000000000000000..7286794bcf5cad5f821d266ad1c696219e48b203 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfVjx)vIjc+LZNZOLtv*y9$5WZmc*eQZ%-dNlSIdD7AH6qsU`U#oTLoXEzn{}Oz mHy*F=oqJrQkfs0rPi9sFOEpg2T~~oFVDNPHb6Mw<&;$TaV?_r5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/test_bb_inf.png b/src/main/resources/assets/hbm/textures/blocks/test_bb_inf.png new file mode 100644 index 0000000000000000000000000000000000000000..107de4238b09fc4dd43458b52da9c476f0318e47 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfome)q7){1E^l43Z{ti`b7e&&ow;SMDO;WHMlp4#S->oppe zr|^XwxwY>%Pn)t!^W2QHD|Q_)OBTNV%B=JQdowd%(X$lI34-B@-<6L{xofJmTqE)O sgpvaSk2;y%&Odl!m@0Glarr-nlBxCv>-V@k0J?+0)78&qol`;+0Dl!lVgLXD literal 0 HcmV?d00001