From e29616a83e53c2984e675f4ff91f4a18172a96db Mon Sep 17 00:00:00 2001 From: Vaern Date: Sat, 4 Jun 2022 14:27:41 -0700 Subject: [PATCH] Changed some stuff for the debris --- .../java/com/hbm/entity/projectile/EntityRBMKDebris.java | 7 ++++--- .../java/com/hbm/entity/projectile/EntityZirnoxDebris.java | 7 ++++--- .../java/com/hbm/inventory/recipes/ShredderRecipes.java | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/entity/projectile/EntityRBMKDebris.java b/src/main/java/com/hbm/entity/projectile/EntityRBMKDebris.java index 5d98e6a42..c92fb2ae6 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityRBMKDebris.java +++ b/src/main/java/com/hbm/entity/projectile/EntityRBMKDebris.java @@ -121,11 +121,12 @@ public class EntityRBMKDebris extends EntityDebrisBase { } } - if(this.getType() == DebrisType.FUEL) { - List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, this.boundingBox.expand(10, 10, 10)); + if(this.getType() == DebrisType.FUEL || this.getType() == DebrisType.GRAPHITE) { + List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, this.boundingBox.expand(2.5, 2.5, 2.5)); + int level = this.getType() == DebrisType.FUEL ? 9 : 4; for(EntityLivingBase e : entities) { - e.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, 60 * 20, 9)); + e.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, 60 * 20, level)); } } diff --git a/src/main/java/com/hbm/entity/projectile/EntityZirnoxDebris.java b/src/main/java/com/hbm/entity/projectile/EntityZirnoxDebris.java index 4e3280db9..155667459 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityZirnoxDebris.java +++ b/src/main/java/com/hbm/entity/projectile/EntityZirnoxDebris.java @@ -116,10 +116,11 @@ public class EntityZirnoxDebris extends EntityDebrisBase { } if(this.getType() == DebrisType.ELEMENT || this.getType() == DebrisType.GRAPHITE) { - List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, this.boundingBox.expand(10, 10, 10)); - + List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, this.boundingBox.expand(2.5, 2.5, 2.5)); + + int level = this.getType() == DebrisType.ELEMENT ? 7 : 4; for(EntityLivingBase e : entities) { - e.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, 60 * 20, 4)); + e.addPotionEffect(new PotionEffect(HbmPotion.radiation.id, 60 * 20, level)); } } diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 08b5278d5..cca5c56b3 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -339,6 +339,7 @@ public class ShredderRecipes { ShredderRecipes.setRecipe(ModItems.debris_exchanger, new ItemStack(ModItems.powder_steel, 3)); ShredderRecipes.setRecipe(ModItems.debris_element, new ItemStack(ModItems.scrap_nuclear, 4)); ShredderRecipes.setRecipe(ModItems.debris_metal, new ItemStack(ModItems.powder_steel_tiny, 3)); + ShredderRecipes.setRecipe(ModItems.debris_graphite, new ItemStack(ModItems.powder_coal, 1)); /* * GC COMPAT