From 383473ea86dcbee14efb166f5fda20f4bc521f3d Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 16 Sep 2021 16:59:49 +0200 Subject: [PATCH] some small hazmat compat, potatoes to poison shredder recipe --- src/main/java/com/hbm/hazard/HazardRegistry.java | 1 + src/main/java/com/hbm/inventory/ShredderRecipes.java | 2 ++ src/main/java/com/hbm/util/ArmorUtil.java | 11 +++++++++++ src/main/java/com/hbm/util/Compat.java | 11 +++++++++++ 4 files changed, 25 insertions(+) create mode 100644 src/main/java/com/hbm/util/Compat.java diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 13bd1b457..7941322b3 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -10,6 +10,7 @@ public class HazardRegistry { public static void registerItems() { HazardSystem.register("ingotPlutonium", makeData(RADIATION, ItemHazard.pu * ItemHazard.ingot)); + //TODO: move all the itemhazard stuff here } private static HazardData makeData() { return new HazardData(); } diff --git a/src/main/java/com/hbm/inventory/ShredderRecipes.java b/src/main/java/com/hbm/inventory/ShredderRecipes.java index 488a13dbc..0714ec6b6 100644 --- a/src/main/java/com/hbm/inventory/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/ShredderRecipes.java @@ -170,6 +170,8 @@ public class ShredderRecipes { ShredderRecipes.setRecipe(ModBlocks.block_schrabidate, new ItemStack(ModItems.powder_schrabidate, 9)); ShredderRecipes.setRecipe(ModItems.coal_infernal, new ItemStack(ModItems.powder_coal, 3)); ShredderRecipes.setRecipe(Items.reeds, new ItemStack(Items.paper, 3)); + ShredderRecipes.setRecipe(Items.fermented_spider_eye, new ItemStack(ModItems.powder_poison, 3)); + ShredderRecipes.setRecipe(Items.poisonous_potato, new ItemStack(ModItems.powder_poison, 1)); ShredderRecipes.setRecipe(ModItems.ingot_schraranium, new ItemStack(ModItems.nugget_schrabidium, 2)); ShredderRecipes.setRecipe(ModItems.crystal_coal, new ItemStack(ModItems.powder_coal, 3)); diff --git a/src/main/java/com/hbm/util/ArmorUtil.java b/src/main/java/com/hbm/util/ArmorUtil.java index beda84500..edfbdf145 100644 --- a/src/main/java/com/hbm/util/ArmorUtil.java +++ b/src/main/java/com/hbm/util/ArmorUtil.java @@ -59,6 +59,17 @@ public class ArmorUtil { ArmorRegistry.registerHazard(ModItems.dns_helmet, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_CHLORINE, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE, HazardClass.LIGHT, HazardClass.SAND); ArmorRegistry.registerHazard(ModItems.schrabidium_helmet, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_CHLORINE, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE, HazardClass.LIGHT, HazardClass.SAND); ArmorRegistry.registerHazard(ModItems.euphemium_helmet, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_CHLORINE, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE, HazardClass.LIGHT, HazardClass.SAND); + + //Ob ihr wirklich richtig steht, seht ihr wenn das Licht angeht! + registerIfExists("gregtech", "gt.armor.hazmat.universal.head", HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_CHLORINE, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE, HazardClass.LIGHT, HazardClass.SAND); + registerIfExists("gregtech", "gt.armor.hazmat.biochemgas.head", HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_CHLORINE, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE, HazardClass.LIGHT, HazardClass.SAND); + registerIfExists("gregtech", "gt.armor.hazmat.radiation.head", HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_CHLORINE, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE, HazardClass.LIGHT, HazardClass.SAND); + } + + private static void registerIfExists(String domain, String name, HazardClass... classes) { + Item item = Compat.tryLoadItem(domain, name); + if(item != null) + ArmorRegistry.registerHazard(item, classes); } public static boolean checkArmor(EntityLivingBase entity, Item... armor) { diff --git a/src/main/java/com/hbm/util/Compat.java b/src/main/java/com/hbm/util/Compat.java new file mode 100644 index 000000000..4c58f7c34 --- /dev/null +++ b/src/main/java/com/hbm/util/Compat.java @@ -0,0 +1,11 @@ +package com.hbm.util; + +import net.minecraft.item.Item; + +public class Compat { + + public static Item tryLoadItem(String domain, String name) { + String reg = domain + ":" + name; + return (Item) Item.itemRegistry.getObject(reg); + } +}