From 352394ad2052eddc1eb2b005d6744b8db8a75fab Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 24 Sep 2021 14:27:40 +0200 Subject: [PATCH] cigarettes, indestructible nuclear waste entities --- .github/ISSUE_TEMPLATE/issue-template.md | 16 --- .../com/hbm/crafting/ConsumableRecipes.java | 1 + .../com/hbm/entity/item/EntitytemWaste.java | 31 ++++ .../java/com/hbm/handler/ToolAbility.java | 6 +- .../nei/AlloyFurnaceRecipeHandler.java | 3 +- .../hbm/handler/nei/AnvilRecipeHandler.java | 6 +- .../handler/nei/AssemblerRecipeHandler.java | 2 +- .../hbm/handler/nei/BoilerRecipeHandler.java | 2 +- .../hbm/handler/nei/BookRecipeHandler.java | 4 +- .../handler/nei/CMBFurnaceRecipeHandler.java | 3 +- .../handler/nei/CentrifugeRecipeHandler.java | 5 +- .../handler/nei/ChemplantRecipeHandler.java | 2 +- .../nei/CrystallizerRecipeHandler.java | 4 +- .../handler/nei/CyclotronRecipeHandler.java | 2 +- .../hbm/handler/nei/FluidRecipeHandler.java | 2 +- .../hbm/handler/nei/FusionRecipeHandler.java | 2 +- .../nei/GasCentrifugeRecipeHandler.java | 2 +- .../hbm/handler/nei/HadronRecipeHandler.java | 4 +- .../hbm/handler/nei/PressRecipeHandler.java | 2 +- .../hbm/handler/nei/ReactorRecipeHandler.java | 5 +- .../handler/nei/RefineryRecipeHandler.java | 4 +- .../hbm/handler/nei/SILEXRecipeHandler.java | 4 +- .../handler/nei/ShredderRecipeHandler.java | 4 +- .../handler/nei/SmithingRecipeHandler.java | 4 +- .../hbm/inventory/FluidContainerRegistry.java | 2 +- .../inventory/container/ContainerAnvil.java | 6 +- .../inventory/container/ContainerBook.java | 2 +- .../java/com/hbm/inventory/gui/GUIAnvil.java | 6 +- .../hbm/inventory/gui/GUIMachineReactor.java | 2 +- .../inventory/gui/GUIScreenSatInterface.java | 2 +- .../gui/GUIScreenTemplateFolder.java | 4 +- .../{ => recipes}/AssemblerRecipes.java | 4 +- .../{ => recipes}/BreederRecipes.java | 3 +- .../{ => recipes}/CentrifugeRecipes.java | 3 +- .../{ => recipes}/CrystallizerRecipes.java | 3 +- .../{ => recipes}/CyclotronRecipes.java | 3 +- .../{ => recipes}/FusionRecipes.java | 2 +- .../{ => recipes}/HadronRecipes.java | 3 +- .../{ => recipes}/MachineRecipes.java | 5 +- .../inventory/{ => recipes}/MagicRecipes.java | 3 +- .../{ => recipes}/RefineryRecipes.java | 2 +- .../inventory/{ => recipes}/SILEXRecipes.java | 3 +- .../{ => recipes}/ShredderRecipes.java | 3 +- .../{ => recipes/anvil}/AnvilRecipes.java | 5 +- .../anvil}/AnvilSmithingCyanideRecipe.java | 3 +- .../anvil}/AnvilSmithingHotRecipe.java | 3 +- .../anvil}/AnvilSmithingRecipe.java | 3 +- .../anvil}/AnvilSmithingRenameRecipe.java | 3 +- .../inventory/recipes/loader/JSONLoader.java | 5 + .../recipes/loader/JSONLoaderAssembler.java | 5 + .../recipes/loader/JSONLoaderBase.java | 133 ++++++++++++++++++ src/main/java/com/hbm/items/ModItems.java | 125 +++++++--------- .../items/machine/ItemAssemblyTemplate.java | 2 +- .../items/machine/ItemChemistryTemplate.java | 2 +- .../com/hbm/items/machine/ItemRBMKPellet.java | 45 +----- .../com/hbm/items/machine/ItemRBMKRod.java | 38 +---- .../com/hbm/items/special/ItemCigarette.java | 69 +++++++++ .../hbm/items/special/ItemNuclearWaste.java | 33 +++++ .../com/hbm/items/special/ItemWasteLong.java | 2 +- src/main/java/com/hbm/main/MainRegistry.java | 11 ++ .../com/hbm/main/ModEventHandlerClient.java | 2 +- .../com/hbm/modules/ItemHazardModule.java | 2 +- .../java/com/hbm/packet/AnvilCraftPacket.java | 4 +- .../hbm/render/item/ItemRenderTemplate.java | 2 +- .../render/tileentity/RenderAssembler.java | 2 +- .../tileentity/machine/TileEntityChungus.java | 2 +- .../machine/TileEntityDiFurnace.java | 2 +- .../tileentity/machine/TileEntityHadron.java | 2 +- .../tileentity/machine/TileEntityITER.java | 6 +- .../machine/TileEntityMachineAssembler.java | 2 +- .../machine/TileEntityMachineBoiler.java | 2 +- .../TileEntityMachineBoilerElectric.java | 2 +- .../machine/TileEntityMachineCentrifuge.java | 2 +- .../machine/TileEntityMachineChemplant.java | 2 +- .../TileEntityMachineCrystallizer.java | 2 +- .../machine/TileEntityMachineCyclotron.java | 2 +- .../machine/TileEntityMachineEPress.java | 2 +- .../TileEntityMachineFractionTower.java | 2 +- .../machine/TileEntityMachineGasCent.java | 4 +- .../TileEntityMachineLargeTurbine.java | 2 +- .../machine/TileEntityMachineMiningLaser.java | 6 +- .../machine/TileEntityMachinePress.java | 2 +- .../machine/TileEntityMachineReactor.java | 4 +- .../machine/TileEntityMachineRefinery.java | 2 +- ...eEntityMachineSchrabidiumTransmutator.java | 2 +- .../machine/TileEntityMachineShredder.java | 2 +- .../machine/TileEntityMachineTurbine.java | 2 +- .../machine/TileEntityNukeFurnace.java | 2 +- .../tileentity/machine/TileEntitySILEX.java | 4 +- src/main/java/com/hbm/util/InventoryUtil.java | 2 +- 90 files changed, 471 insertions(+), 273 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/issue-template.md create mode 100644 src/main/java/com/hbm/entity/item/EntitytemWaste.java rename src/main/java/com/hbm/inventory/{ => recipes}/AssemblerRecipes.java (99%) rename src/main/java/com/hbm/inventory/{ => recipes}/BreederRecipes.java (99%) rename src/main/java/com/hbm/inventory/{ => recipes}/CentrifugeRecipes.java (99%) rename src/main/java/com/hbm/inventory/{ => recipes}/CrystallizerRecipes.java (98%) rename src/main/java/com/hbm/inventory/{ => recipes}/CyclotronRecipes.java (99%) rename src/main/java/com/hbm/inventory/{ => recipes}/FusionRecipes.java (98%) rename src/main/java/com/hbm/inventory/{ => recipes}/HadronRecipes.java (98%) rename src/main/java/com/hbm/inventory/{ => recipes}/MachineRecipes.java (97%) rename src/main/java/com/hbm/inventory/{ => recipes}/MagicRecipes.java (98%) rename src/main/java/com/hbm/inventory/{ => recipes}/RefineryRecipes.java (98%) rename src/main/java/com/hbm/inventory/{ => recipes}/SILEXRecipes.java (99%) rename src/main/java/com/hbm/inventory/{ => recipes}/ShredderRecipes.java (99%) rename src/main/java/com/hbm/inventory/{ => recipes/anvil}/AnvilRecipes.java (99%) rename src/main/java/com/hbm/inventory/{ => recipes/anvil}/AnvilSmithingCyanideRecipe.java (93%) rename src/main/java/com/hbm/inventory/{ => recipes/anvil}/AnvilSmithingHotRecipe.java (94%) rename src/main/java/com/hbm/inventory/{ => recipes/anvil}/AnvilSmithingRecipe.java (95%) rename src/main/java/com/hbm/inventory/{ => recipes/anvil}/AnvilSmithingRenameRecipe.java (94%) create mode 100644 src/main/java/com/hbm/inventory/recipes/loader/JSONLoader.java create mode 100644 src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderAssembler.java create mode 100644 src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderBase.java create mode 100644 src/main/java/com/hbm/items/special/ItemCigarette.java create mode 100644 src/main/java/com/hbm/items/special/ItemNuclearWaste.java diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md deleted file mode 100644 index 2d81f4b2f..000000000 --- a/.github/ISSUE_TEMPLATE/issue-template.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: Issue template -about: Template for mod-related issues -title: '' -labels: '' -assignees: '' - ---- - -### Describe the bug - -Please describe the issue in as much detail as possible. Also mention the version of the mod you're running, if it's not the newest. In the case of a crash, please attach a crash log. - -### Please solve this equation to x - -x²+3x-19=√(9x²)+6 diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index eff0cd1ee..27b698d2a 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -117,6 +117,7 @@ public class ConsumableRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.xanax, 1), new Object[] { ModItems.powder_coal, ModItems.niter, ModItems.powder_bromine }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fmn, 1), new Object[] { ModItems.powder_coal, ModItems.powder_polonium, ModItems.powder_strontium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.five_htp, 1), new Object[] { ModItems.powder_coal, ModItems.powder_euphemium, ModItems.canteen_fab }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cigarette, 16), new Object[] { "ingotAsbestos", ModItems.oil_tar, "nuggetPolonium210" })); //Med bags GameRegistry.addRecipe(new ItemStack(ModItems.med_bag, 1), new Object[] { "LLL", "SIS", "LLL", 'L', Items.leather, 'S', ModItems.syringe_metal_stimpak, 'I', ModItems.syringe_antidote }); diff --git a/src/main/java/com/hbm/entity/item/EntitytemWaste.java b/src/main/java/com/hbm/entity/item/EntitytemWaste.java new file mode 100644 index 000000000..64cf56896 --- /dev/null +++ b/src/main/java/com/hbm/entity/item/EntitytemWaste.java @@ -0,0 +1,31 @@ +package com.hbm.entity.item; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; + +public class EntitytemWaste extends EntityItem { + + public EntitytemWaste(World world) { + super(world); + } + + public EntitytemWaste(World world, double x, double y, double z) { + super(world, x, y, z); + } + + public EntitytemWaste(World world, double x, double y, double z, ItemStack stack) { + super(world, x, y, z, stack); + } + + @Override + public boolean isEntityInvulnerable() { + return true; + } + + @Override + public boolean attackEntityFrom(DamageSource source, float amount) { + return false; + } +} diff --git a/src/main/java/com/hbm/handler/ToolAbility.java b/src/main/java/com/hbm/handler/ToolAbility.java index d206bce8e..f95dcc1fd 100644 --- a/src/main/java/com/hbm/handler/ToolAbility.java +++ b/src/main/java/com/hbm/handler/ToolAbility.java @@ -9,9 +9,9 @@ import java.util.Set; import com.hbm.config.ToolConfig; import com.hbm.explosion.ExplosionNT; import com.hbm.explosion.ExplosionNT.ExAttrib; -import com.hbm.inventory.CentrifugeRecipes; -import com.hbm.inventory.CrystallizerRecipes; -import com.hbm.inventory.ShredderRecipes; +import com.hbm.inventory.recipes.CentrifugeRecipes; +import com.hbm.inventory.recipes.CrystallizerRecipes; +import com.hbm.inventory.recipes.ShredderRecipes; import com.hbm.items.ModItems; import com.hbm.items.tool.IItemAbility; import com.hbm.util.EnchantmentUtil; diff --git a/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java b/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java index 5376ab201..f52b39083 100644 --- a/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java @@ -5,8 +5,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; + import com.hbm.inventory.gui.GUITestDiFurnace; +import com.hbm.inventory.recipes.MachineRecipes; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/src/main/java/com/hbm/handler/nei/AnvilRecipeHandler.java b/src/main/java/com/hbm/handler/nei/AnvilRecipeHandler.java index b8b41cde5..15565bf25 100644 --- a/src/main/java/com/hbm/handler/nei/AnvilRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/AnvilRecipeHandler.java @@ -8,9 +8,9 @@ import java.util.List; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.AnvilRecipes; -import com.hbm.inventory.AnvilRecipes.AnvilConstructionRecipe; -import com.hbm.inventory.AnvilRecipes.AnvilOutput; +import com.hbm.inventory.recipes.anvil.AnvilRecipes; +import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilConstructionRecipe; +import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilOutput; import com.hbm.lib.RefStrings; import codechicken.lib.gui.GuiDraw; diff --git a/src/main/java/com/hbm/handler/nei/AssemblerRecipeHandler.java b/src/main/java/com/hbm/handler/nei/AssemblerRecipeHandler.java index b8ef3b29a..6e3829569 100644 --- a/src/main/java/com/hbm/handler/nei/AssemblerRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/AssemblerRecipeHandler.java @@ -6,9 +6,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.AssemblerRecipes; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.gui.GUIMachineAssembler; +import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; diff --git a/src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java b/src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java index 477735831..5d966c2b8 100644 --- a/src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java @@ -6,9 +6,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineBoiler; import com.hbm.inventory.gui.GUIMachineBoilerElectric; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.PositionedStack; diff --git a/src/main/java/com/hbm/handler/nei/BookRecipeHandler.java b/src/main/java/com/hbm/handler/nei/BookRecipeHandler.java index b2ca4966d..44e6c7ded 100644 --- a/src/main/java/com/hbm/handler/nei/BookRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/BookRecipeHandler.java @@ -4,12 +4,12 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; -import com.hbm.inventory.MagicRecipes; -import com.hbm.inventory.MagicRecipes.MagicRecipe; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.gui.GUIBook; +import com.hbm.inventory.recipes.MagicRecipes; +import com.hbm.inventory.recipes.MagicRecipes.MagicRecipe; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/src/main/java/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java b/src/main/java/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java index b0f44c25a..5390eef46 100644 --- a/src/main/java/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java @@ -5,8 +5,9 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; + import com.hbm.inventory.gui.GUIMachineCMBFactory; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java b/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java index 34c40ef2a..7a58813cd 100644 --- a/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java @@ -6,10 +6,11 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.inventory.CentrifugeRecipes; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.gui.GUIMachineCentrifuge; +import com.hbm.inventory.recipes.CentrifugeRecipes; +import com.hbm.inventory.recipes.MachineRecipes; + import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; diff --git a/src/main/java/com/hbm/handler/nei/ChemplantRecipeHandler.java b/src/main/java/com/hbm/handler/nei/ChemplantRecipeHandler.java index 4d4bdb8f2..92475e8bc 100644 --- a/src/main/java/com/hbm/handler/nei/ChemplantRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/ChemplantRecipeHandler.java @@ -7,8 +7,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineChemplant; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java b/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java index 829521582..dab4c4df6 100644 --- a/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.CrystallizerRecipes; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUICrystallizer; +import com.hbm.inventory.recipes.CrystallizerRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.tileentity.machine.TileEntityMachineCrystallizer; diff --git a/src/main/java/com/hbm/handler/nei/CyclotronRecipeHandler.java b/src/main/java/com/hbm/handler/nei/CyclotronRecipeHandler.java index 10da7763b..b4f9221f2 100644 --- a/src/main/java/com/hbm/handler/nei/CyclotronRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/CyclotronRecipeHandler.java @@ -6,8 +6,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.CyclotronRecipes; import com.hbm.inventory.gui.GUIMachineCyclotron; +import com.hbm.inventory.recipes.CyclotronRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/handler/nei/FluidRecipeHandler.java b/src/main/java/com/hbm/handler/nei/FluidRecipeHandler.java index 624bec4e2..792f4465f 100644 --- a/src/main/java/com/hbm/handler/nei/FluidRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/FluidRecipeHandler.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/handler/nei/FusionRecipeHandler.java b/src/main/java/com/hbm/handler/nei/FusionRecipeHandler.java index 5e70b227d..ff6624e23 100644 --- a/src/main/java/com/hbm/handler/nei/FusionRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/FusionRecipeHandler.java @@ -6,8 +6,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.FusionRecipes; import com.hbm.inventory.gui.GUIITER; +import com.hbm.inventory.recipes.FusionRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java b/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java index 2d8b4493e..1c4de7fc3 100644 --- a/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java @@ -6,8 +6,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineGasCent; +import com.hbm.inventory.recipes.MachineRecipes; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/src/main/java/com/hbm/handler/nei/HadronRecipeHandler.java b/src/main/java/com/hbm/handler/nei/HadronRecipeHandler.java index ef1958991..191860a69 100644 --- a/src/main/java/com/hbm/handler/nei/HadronRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/HadronRecipeHandler.java @@ -7,9 +7,9 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import com.hbm.inventory.HadronRecipes; -import com.hbm.inventory.HadronRecipes.HadronRecipe; import com.hbm.inventory.gui.GUIHadron; +import com.hbm.inventory.recipes.HadronRecipes; +import com.hbm.inventory.recipes.HadronRecipes.HadronRecipe; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/handler/nei/PressRecipeHandler.java b/src/main/java/com/hbm/handler/nei/PressRecipeHandler.java index 2fb5fb0de..cf324abb4 100644 --- a/src/main/java/com/hbm/handler/nei/PressRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/PressRecipeHandler.java @@ -7,9 +7,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineEPress; import com.hbm.inventory.gui.GUIMachinePress; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; diff --git a/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java b/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java index 1fd8a4198..68fad78e8 100644 --- a/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java @@ -6,9 +6,10 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.inventory.BreederRecipes; -import com.hbm.inventory.BreederRecipes.BreederRecipe; import com.hbm.inventory.gui.GUIMachineReactor; +import com.hbm.inventory.recipes.BreederRecipes; +import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe; + import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; diff --git a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java index 6c945b22c..8449a7236 100644 --- a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java @@ -7,9 +7,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.RefineryRecipes; import com.hbm.inventory.gui.GUIMachineRefinery; +import com.hbm.inventory.recipes.MachineRecipes; +import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.PositionedStack; diff --git a/src/main/java/com/hbm/handler/nei/SILEXRecipeHandler.java b/src/main/java/com/hbm/handler/nei/SILEXRecipeHandler.java index 32700a1c4..ae1a44d0e 100644 --- a/src/main/java/com/hbm/handler/nei/SILEXRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/SILEXRecipeHandler.java @@ -7,9 +7,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.SILEXRecipes; -import com.hbm.inventory.SILEXRecipes.SILEXRecipe; import com.hbm.inventory.gui.GUISILEX; +import com.hbm.inventory.recipes.SILEXRecipes; +import com.hbm.inventory.recipes.SILEXRecipes.SILEXRecipe; import com.hbm.lib.RefStrings; import com.hbm.util.WeightedRandomObject; diff --git a/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java b/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java index 71c758f9e..31b5296b0 100644 --- a/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java @@ -7,10 +7,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.RecipesCommon.ComparableStack; -import com.hbm.inventory.ShredderRecipes; import com.hbm.inventory.gui.GUIMachineShredder; +import com.hbm.inventory.recipes.MachineRecipes; +import com.hbm.inventory.recipes.ShredderRecipes; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/handler/nei/SmithingRecipeHandler.java b/src/main/java/com/hbm/handler/nei/SmithingRecipeHandler.java index 5f6bc7ecb..35e698422 100644 --- a/src/main/java/com/hbm/handler/nei/SmithingRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/SmithingRecipeHandler.java @@ -5,9 +5,9 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import com.hbm.inventory.AnvilRecipes; -import com.hbm.inventory.AnvilSmithingRecipe; import com.hbm.inventory.gui.GUIAnvil; +import com.hbm.inventory.recipes.anvil.AnvilRecipes; +import com.hbm.inventory.recipes.anvil.AnvilSmithingRecipe; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java index 9ca66c8c8..a4ba3a4ad 100644 --- a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java +++ b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; public class FluidContainerRegistry { //TODO: somehow incorporate hashmaps into this - static List allContainers = new ArrayList(); + public static List allContainers = new ArrayList(); public static void register() { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), FluidType.WATER, 1000)); diff --git a/src/main/java/com/hbm/inventory/container/ContainerAnvil.java b/src/main/java/com/hbm/inventory/container/ContainerAnvil.java index 4aefb6992..ffafcc61b 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerAnvil.java +++ b/src/main/java/com/hbm/inventory/container/ContainerAnvil.java @@ -1,8 +1,8 @@ package com.hbm.inventory.container; -import com.hbm.inventory.AnvilRecipes; -import com.hbm.inventory.AnvilSmithingRecipe; import com.hbm.inventory.SlotMachineOutput; +import com.hbm.inventory.recipes.anvil.AnvilRecipes; +import com.hbm.inventory.recipes.anvil.AnvilSmithingRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -38,7 +38,7 @@ public class ContainerAnvil extends Container { return; } - for(com.hbm.inventory.AnvilSmithingRecipe rec : AnvilRecipes.getSmithing()) { + for(com.hbm.inventory.recipes.anvil.AnvilSmithingRecipe rec : AnvilRecipes.getSmithing()) { int i = rec.matchesInt(left, right); diff --git a/src/main/java/com/hbm/inventory/container/ContainerBook.java b/src/main/java/com/hbm/inventory/container/ContainerBook.java index dfad4389e..a3959b58a 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerBook.java +++ b/src/main/java/com/hbm/inventory/container/ContainerBook.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.inventory.MagicRecipes; +import com.hbm.inventory.recipes.MagicRecipes; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/inventory/gui/GUIAnvil.java b/src/main/java/com/hbm/inventory/gui/GUIAnvil.java index c62b8c05a..1003ec2a3 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAnvil.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAnvil.java @@ -6,13 +6,13 @@ import java.util.List; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.AnvilRecipes; -import com.hbm.inventory.AnvilRecipes.AnvilConstructionRecipe; -import com.hbm.inventory.AnvilRecipes.AnvilOutput; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.container.ContainerAnvil; +import com.hbm.inventory.recipes.anvil.AnvilRecipes; +import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilConstructionRecipe; +import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilOutput; import com.hbm.lib.RefStrings; import com.hbm.packet.AnvilCraftPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineReactor.java b/src/main/java/com/hbm/inventory/gui/GUIMachineReactor.java index 95aa0445c..653ff03eb 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineReactor.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineReactor.java @@ -2,8 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.BreederRecipes; import com.hbm.inventory.container.ContainerReactor; +import com.hbm.inventory.recipes.BreederRecipes; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineReactor; diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java b/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java index a485878a5..fd4aad4ed 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java @@ -6,7 +6,7 @@ import java.util.List; import org.lwjgl.opengl.GL11; import com.hbm.entity.missile.EntityMissileBaseAdvanced; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.tool.ItemSatInterface; import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index d4925d979..efcaac1bf 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -8,8 +8,8 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.AssemblerRecipes; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.AssemblerRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCassette; import com.hbm.items.machine.ItemChemistryTemplate; diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java similarity index 99% rename from src/main/java/com/hbm/inventory/AssemblerRecipes.java rename to src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 391d5b74f..1012019ce 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.io.File; import java.io.FileReader; @@ -21,6 +21,8 @@ import com.google.gson.stream.JsonWriter; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.OreDictManager; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; diff --git a/src/main/java/com/hbm/inventory/BreederRecipes.java b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java similarity index 99% rename from src/main/java/com/hbm/inventory/BreederRecipes.java rename to src/main/java/com/hbm/inventory/recipes/BreederRecipes.java index fb7daef1a..85d430e2c 100644 --- a/src/main/java/com/hbm/inventory/BreederRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.ArrayList; import java.util.HashMap; @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java similarity index 99% rename from src/main/java/com/hbm/inventory/CentrifugeRecipes.java rename to src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java index efa1cb53e..680a7c14c 100644 --- a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.HashMap; import java.util.List; @@ -7,6 +7,7 @@ import java.util.Map.Entry; import com.hbm.blocks.ModBlocks; import com.hbm.handler.imc.IMCCentrifuge; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; diff --git a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java similarity index 98% rename from src/main/java/com/hbm/inventory/CrystallizerRecipes.java rename to src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java index 071f6a3f8..e6d4369aa 100644 --- a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.HashMap; import java.util.List; @@ -7,6 +7,7 @@ import java.util.Map.Entry; import com.hbm.blocks.ModBlocks; import com.hbm.handler.imc.IMCCrystallizer; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; diff --git a/src/main/java/com/hbm/inventory/CyclotronRecipes.java b/src/main/java/com/hbm/inventory/recipes/CyclotronRecipes.java similarity index 99% rename from src/main/java/com/hbm/inventory/CyclotronRecipes.java rename to src/main/java/com/hbm/inventory/recipes/CyclotronRecipes.java index 281f29d23..b38cff64c 100644 --- a/src/main/java/com/hbm/inventory/CyclotronRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CyclotronRecipes.java @@ -1,10 +1,11 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/inventory/FusionRecipes.java b/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java similarity index 98% rename from src/main/java/com/hbm/inventory/FusionRecipes.java rename to src/main/java/com/hbm/inventory/recipes/FusionRecipes.java index d0f6765b7..d95943f84 100644 --- a/src/main/java/com/hbm/inventory/FusionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.HashMap; diff --git a/src/main/java/com/hbm/inventory/HadronRecipes.java b/src/main/java/com/hbm/inventory/recipes/HadronRecipes.java similarity index 98% rename from src/main/java/com/hbm/inventory/HadronRecipes.java rename to src/main/java/com/hbm/inventory/recipes/HadronRecipes.java index 535cf56c8..9cf492908 100644 --- a/src/main/java/com/hbm/inventory/HadronRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/HadronRecipes.java @@ -1,8 +1,9 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.ArrayList; import java.util.List; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java similarity index 97% rename from src/main/java/com/hbm/inventory/MachineRecipes.java rename to src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index dbf676627..cf84d4ad5 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.ArrayList; import java.util.Arrays; @@ -10,6 +10,9 @@ import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.Spaghetti; +import com.hbm.inventory.FluidContainer; +import com.hbm.inventory.FluidContainerRegistry; +import com.hbm.inventory.FluidStack; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemChemistryTemplate; import com.hbm.items.machine.ItemFluidIcon; diff --git a/src/main/java/com/hbm/inventory/MagicRecipes.java b/src/main/java/com/hbm/inventory/recipes/MagicRecipes.java similarity index 98% rename from src/main/java/com/hbm/inventory/MagicRecipes.java rename to src/main/java/com/hbm/inventory/recipes/MagicRecipes.java index 4ca74cb5e..68d84a1e8 100644 --- a/src/main/java/com/hbm/inventory/MagicRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MagicRecipes.java @@ -1,10 +1,11 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.RecipesCommon.ComparableStack; diff --git a/src/main/java/com/hbm/inventory/RefineryRecipes.java b/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java similarity index 98% rename from src/main/java/com/hbm/inventory/RefineryRecipes.java rename to src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java index b48bf7913..783263738 100644 --- a/src/main/java/com/hbm/inventory/RefineryRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/hbm/inventory/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java similarity index 99% rename from src/main/java/com/hbm/inventory/SILEXRecipes.java rename to src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index 90e0e81a0..05f7d4814 100644 --- a/src/main/java/com/hbm/inventory/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.ArrayList; import java.util.HashMap; @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Map.Entry; import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; import com.hbm.items.special.ItemWasteLong; diff --git a/src/main/java/com/hbm/inventory/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java similarity index 99% rename from src/main/java/com/hbm/inventory/ShredderRecipes.java rename to src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 0714ec6b6..b590c12e5 100644 --- a/src/main/java/com/hbm/inventory/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -1,4 +1,4 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes; import java.util.HashMap; import java.util.List; @@ -6,6 +6,7 @@ import java.util.Map; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.Untested; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; diff --git a/src/main/java/com/hbm/inventory/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java similarity index 99% rename from src/main/java/com/hbm/inventory/AnvilRecipes.java rename to src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 6c3216c67..f88da5e4d 100644 --- a/src/main/java/com/hbm/inventory/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -1,13 +1,16 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes.anvil; import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; +import com.hbm.inventory.OreDictManager; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; +import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.items.ModItems; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/inventory/AnvilSmithingCyanideRecipe.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingCyanideRecipe.java similarity index 93% rename from src/main/java/com/hbm/inventory/AnvilSmithingCyanideRecipe.java rename to src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingCyanideRecipe.java index d0b3918e5..c1ebe933f 100644 --- a/src/main/java/com/hbm/inventory/AnvilSmithingCyanideRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingCyanideRecipe.java @@ -1,5 +1,6 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes.anvil; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/inventory/AnvilSmithingHotRecipe.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingHotRecipe.java similarity index 94% rename from src/main/java/com/hbm/inventory/AnvilSmithingHotRecipe.java rename to src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingHotRecipe.java index 48ee0ed73..31642ef4f 100644 --- a/src/main/java/com/hbm/inventory/AnvilSmithingHotRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingHotRecipe.java @@ -1,8 +1,9 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes.anvil; import java.util.Arrays; import java.util.List; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.items.special.ItemHot; diff --git a/src/main/java/com/hbm/inventory/AnvilSmithingRecipe.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingRecipe.java similarity index 95% rename from src/main/java/com/hbm/inventory/AnvilSmithingRecipe.java rename to src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingRecipe.java index 228568757..3924d34ef 100644 --- a/src/main/java/com/hbm/inventory/AnvilSmithingRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingRecipe.java @@ -1,8 +1,9 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes.anvil; import java.util.List; import com.hbm.config.GeneralConfig; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.AStack; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/AnvilSmithingRenameRecipe.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingRenameRecipe.java similarity index 94% rename from src/main/java/com/hbm/inventory/AnvilSmithingRenameRecipe.java rename to src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingRenameRecipe.java index 1b508825d..3bb25ab6c 100644 --- a/src/main/java/com/hbm/inventory/AnvilSmithingRenameRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilSmithingRenameRecipe.java @@ -1,5 +1,6 @@ -package com.hbm.inventory; +package com.hbm.inventory.recipes.anvil; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import net.minecraft.init.Items; diff --git a/src/main/java/com/hbm/inventory/recipes/loader/JSONLoader.java b/src/main/java/com/hbm/inventory/recipes/loader/JSONLoader.java new file mode 100644 index 000000000..a62d8bb45 --- /dev/null +++ b/src/main/java/com/hbm/inventory/recipes/loader/JSONLoader.java @@ -0,0 +1,5 @@ +package com.hbm.inventory.recipes.loader; + +public class JSONLoader { + +} diff --git a/src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderAssembler.java b/src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderAssembler.java new file mode 100644 index 000000000..2c78aea80 --- /dev/null +++ b/src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderAssembler.java @@ -0,0 +1,5 @@ +package com.hbm.inventory.recipes.loader; + +public class JSONLoaderAssembler { + +} diff --git a/src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderBase.java b/src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderBase.java new file mode 100644 index 000000000..4b6d707ef --- /dev/null +++ b/src/main/java/com/hbm/inventory/recipes/loader/JSONLoaderBase.java @@ -0,0 +1,133 @@ +package com.hbm.inventory.recipes.loader; + +import java.io.IOException; + +import com.google.gson.JsonArray; +import com.google.gson.stream.JsonWriter; +import com.hbm.inventory.RecipesCommon.AStack; +import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.RecipesCommon.OreDictStack; +import com.hbm.main.MainRegistry; + +import net.minecraft.item.Item; +import net.minecraftforge.oredict.OreDictionary; + +public abstract class JSONLoaderBase { + + protected static AStack aStackFromArray(JsonArray array) { + + boolean dict = false; + String item = ""; + int stacksize = 1; + int meta = 0; + + if(array.size() < 2) + return null; + + /* + * EVAL "dict" OR "item" + */ + if(array.get(0).isJsonPrimitive()) { + + if(array.get(0).getAsString().equals("item")) { + dict = false; + } else if(array.get(0).getAsString().equals("dict")) { + dict = true; + } else { + MainRegistry.logger.error("Error reading recipe, stack array does not have 'item' or 'dict' label!"); + return null; + } + + } else { + MainRegistry.logger.error("Error reading recipe, label is not a valid data type!"); + return null; + } + + /* + * EVAL NAME + */ + if(array.get(1).isJsonPrimitive()) { + item = array.get(1).getAsString(); + } else { + MainRegistry.logger.error("Error reading recipe, item string is not a valid data type!"); + return null; + } + + /* + * EVAL STACKSIZE + */ + if(array.size() > 2 && array.get(2).isJsonPrimitive()) { + if(array.get(2).getAsJsonPrimitive().isNumber()) { + stacksize = Math.max(1, array.get(2).getAsJsonPrimitive().getAsNumber().intValue()); + } else { + MainRegistry.logger.error("Error reading recipe, stack size is not a valid data type!"); + return null; + } + } + + /* + * RESOLVE OREDICT + */ + if(dict) { + + if(OreDictionary.doesOreNameExist(item)) { + return new OreDictStack(item, stacksize); + } else { + + MainRegistry.logger.error("Error reading recipe, ore dict name does not exist!"); + return null; + } + + /* + * RESOLVE COMPARABLE + */ + } else { + + /* + * EVAL META + */ + if(array.size() > 3 && array.get(3).isJsonPrimitive()) { + if(array.get(3).getAsJsonPrimitive().isNumber()) { + meta = Math.max(0, array.get(3).getAsJsonPrimitive().getAsNumber().intValue()); + } else { + MainRegistry.logger.error("Error reading recipe, metadata is not a valid data type!"); + return null; + } + } + + Item it = (Item)Item.itemRegistry.getObject(item); + if(it == null) { + MainRegistry.logger.error("Item could not be found!"); + return null; + } + + return new ComparableStack(it, stacksize, meta); + } + } + + protected static void writeAStack(AStack astack, JsonWriter writer) throws IOException { + + writer.beginArray(); + writer.setIndent(""); + + if(astack instanceof ComparableStack) { + ComparableStack comp = (ComparableStack) astack; + + writer.value("item"); //ITEM identifier + writer.value(Item.itemRegistry.getNameForObject(comp.toStack().getItem())); //item name + if(comp.stacksize != 1) writer.value(comp.stacksize); //stack size + if(comp.meta > 0) writer.value(comp.meta); //metadata + } + + if(astack instanceof OreDictStack) { + OreDictStack ore = (OreDictStack) astack; + + writer.value("dict"); //DICT identifier + writer.value(ore.name); //dict name + writer.value(ore.stacksize); //stacksize + } + + writer.endArray(); + writer.setIndent(" "); + } +} diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 82c8d2068..0e6fe9b28 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -831,6 +831,7 @@ public class ModItems { public static Item gun_kit_1; public static Item gun_kit_2; public static Item cbt_device; + public static Item cigarette; public static Item can_empty; public static Item can_smart; @@ -3175,6 +3176,7 @@ public class ModItems { gun_kit_1 = new ItemSyringe().setUnlocalizedName("gun_kit_1").setMaxStackSize(16).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gun_kit_1"); gun_kit_2 = new ItemSyringe().setUnlocalizedName("gun_kit_2").setMaxStackSize(16).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gun_kit_2"); cbt_device = new ItemSyringe().setUnlocalizedName("cbt_device").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":cbt_device"); + cigarette = new ItemCigarette().setUnlocalizedName("cigarette").setFull3D().setMaxStackSize(16).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cigarette"); attachment_mask = new ItemModGasmask().setUnlocalizedName("attachment_mask").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":attachment_mask"); attachment_mask_mono = new ItemModGasmask().setUnlocalizedName("attachment_mask_mono").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":attachment_mask_mono"); @@ -3409,33 +3411,33 @@ public class ModItems { rbmk_lid = new ItemRBMKLid().setUnlocalizedName("rbmk_lid").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid"); rbmk_lid_glass = new ItemRBMKLid().setUnlocalizedName("rbmk_lid_glass").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid_glass"); - rbmk_pellet_ueu = (ItemRBMKPellet) new ItemRBMKPellet("Unenriched Uranium").addRadiation(ItemHazard.u * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_ueu").setTextureName(RefStrings.MODID + ":rbmk_pellet_ueu"); - rbmk_pellet_meu = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Uranium-235").addRadiation(ItemHazard.uf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_meu").setTextureName(RefStrings.MODID + ":rbmk_pellet_meu"); - rbmk_pellet_heu233 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Uranium-233").addRadiation(ItemHazard.u233 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_heu233").setTextureName(RefStrings.MODID + ":rbmk_pellet_heu233"); - rbmk_pellet_heu235 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Uranium-235").addRadiation(ItemHazard.uf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_heu235").setTextureName(RefStrings.MODID + ":rbmk_pellet_heu235"); - rbmk_pellet_thmeu = (ItemRBMKPellet) new ItemRBMKPellet("Thorium with MEU Driver Fuel").addRadiation(ItemHazard.thf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_thmeu").setTextureName(RefStrings.MODID + ":rbmk_pellet_thmeu"); - rbmk_pellet_lep = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Plutonium-239").addRadiation(ItemHazard.puf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_lep").setTextureName(RefStrings.MODID + ":rbmk_pellet_lep"); - rbmk_pellet_mep = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Plutonium-239").addRadiation(ItemHazard.npf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mep").setTextureName(RefStrings.MODID + ":rbmk_pellet_mep"); - rbmk_pellet_hep239 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-239").addRadiation(ItemHazard.pu239 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hep239").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep239"); - rbmk_pellet_hep241 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-241").addRadiation(ItemHazard.pu241 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hep241").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep241"); - rbmk_pellet_lea = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Americium-242").addRadiation(ItemHazard.amf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_lea").setTextureName(RefStrings.MODID + ":rbmk_pellet_lea"); - rbmk_pellet_mea = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Americium-242").addRadiation(ItemHazard.amrg * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mea").setTextureName(RefStrings.MODID + ":rbmk_pellet_mea"); - rbmk_pellet_hea241 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Americium-241").addRadiation(ItemHazard.am241 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hea241").setTextureName(RefStrings.MODID + ":rbmk_pellet_hea241"); - rbmk_pellet_hea242 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Americium-242").addRadiation(ItemHazard.am242 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hea242").setTextureName(RefStrings.MODID + ":rbmk_pellet_hea242"); - rbmk_pellet_men = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Neptunium-237").addRadiation(ItemHazard.npf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_men").setTextureName(RefStrings.MODID + ":rbmk_pellet_men"); - rbmk_pellet_hen = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Neptunium-237").addRadiation(ItemHazard.np237 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hen").setTextureName(RefStrings.MODID + ":rbmk_pellet_hen"); - rbmk_pellet_mox = (ItemRBMKPellet) new ItemRBMKPellet("Mixed LEU & LEP Oxide").addRadiation(ItemHazard.mox * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mox").setTextureName(RefStrings.MODID + ":rbmk_pellet_mox"); - rbmk_pellet_les = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Schrabidium-326").addRadiation(ItemHazard.saf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_les").setTextureName(RefStrings.MODID + ":rbmk_pellet_les"); - rbmk_pellet_mes = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Schrabidium-326").addRadiation(ItemHazard.saf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mes").setTextureName(RefStrings.MODID + ":rbmk_pellet_mes"); - rbmk_pellet_hes = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Schrabidium-326").addRadiation(ItemHazard.saf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hes").setTextureName(RefStrings.MODID + ":rbmk_pellet_hes"); + rbmk_pellet_ueu = (ItemRBMKPellet) new ItemRBMKPellet("Unenriched Uranium").setUnlocalizedName("rbmk_pellet_ueu").setTextureName(RefStrings.MODID + ":rbmk_pellet_ueu"); + rbmk_pellet_meu = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Uranium-235").setUnlocalizedName("rbmk_pellet_meu").setTextureName(RefStrings.MODID + ":rbmk_pellet_meu"); + rbmk_pellet_heu233 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Uranium-233").setUnlocalizedName("rbmk_pellet_heu233").setTextureName(RefStrings.MODID + ":rbmk_pellet_heu233"); + rbmk_pellet_heu235 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Uranium-235").setUnlocalizedName("rbmk_pellet_heu235").setTextureName(RefStrings.MODID + ":rbmk_pellet_heu235"); + rbmk_pellet_thmeu = (ItemRBMKPellet) new ItemRBMKPellet("Thorium with MEU Driver Fuel").setUnlocalizedName("rbmk_pellet_thmeu").setTextureName(RefStrings.MODID + ":rbmk_pellet_thmeu"); + rbmk_pellet_lep = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Plutonium-239").setUnlocalizedName("rbmk_pellet_lep").setTextureName(RefStrings.MODID + ":rbmk_pellet_lep"); + rbmk_pellet_mep = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Plutonium-239").setUnlocalizedName("rbmk_pellet_mep").setTextureName(RefStrings.MODID + ":rbmk_pellet_mep"); + rbmk_pellet_hep239 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-239").setUnlocalizedName("rbmk_pellet_hep239").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep239"); + rbmk_pellet_hep241 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-241").setUnlocalizedName("rbmk_pellet_hep241").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep241"); + rbmk_pellet_lea = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Americium-242").setUnlocalizedName("rbmk_pellet_lea").setTextureName(RefStrings.MODID + ":rbmk_pellet_lea"); + rbmk_pellet_mea = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Americium-242").setUnlocalizedName("rbmk_pellet_mea").setTextureName(RefStrings.MODID + ":rbmk_pellet_mea"); + rbmk_pellet_hea241 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Americium-241").setUnlocalizedName("rbmk_pellet_hea241").setTextureName(RefStrings.MODID + ":rbmk_pellet_hea241"); + rbmk_pellet_hea242 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Americium-242").setUnlocalizedName("rbmk_pellet_hea242").setTextureName(RefStrings.MODID + ":rbmk_pellet_hea242"); + rbmk_pellet_men = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Neptunium-237").setUnlocalizedName("rbmk_pellet_men").setTextureName(RefStrings.MODID + ":rbmk_pellet_men"); + rbmk_pellet_hen = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Neptunium-237").setUnlocalizedName("rbmk_pellet_hen").setTextureName(RefStrings.MODID + ":rbmk_pellet_hen"); + rbmk_pellet_mox = (ItemRBMKPellet) new ItemRBMKPellet("Mixed LEU & LEP Oxide").setUnlocalizedName("rbmk_pellet_mox").setTextureName(RefStrings.MODID + ":rbmk_pellet_mox"); + rbmk_pellet_les = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Schrabidium-326").setUnlocalizedName("rbmk_pellet_les").setTextureName(RefStrings.MODID + ":rbmk_pellet_les"); + rbmk_pellet_mes = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Schrabidium-326").setUnlocalizedName("rbmk_pellet_mes").setTextureName(RefStrings.MODID + ":rbmk_pellet_mes"); + rbmk_pellet_hes = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Schrabidium-326").setUnlocalizedName("rbmk_pellet_hes").setTextureName(RefStrings.MODID + ":rbmk_pellet_hes"); rbmk_pellet_leaus = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Australium (Tasmanite)").setUnlocalizedName("rbmk_pellet_leaus").setTextureName(RefStrings.MODID + ":rbmk_pellet_leaus"); rbmk_pellet_heaus = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Australium (Ayerite)").setUnlocalizedName("rbmk_pellet_heaus").setTextureName(RefStrings.MODID + ":rbmk_pellet_heaus"); - rbmk_pellet_po210be = (ItemRBMKPellet) new ItemRBMKPellet("Polonium-210 & Beryllium Neutron Source").addRadiation(ItemHazard.pobe * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_po210be").setTextureName(RefStrings.MODID + ":rbmk_pellet_po210be"); - rbmk_pellet_ra226be = (ItemRBMKPellet) new ItemRBMKPellet("Radium-226 & Beryllium Neutron Source").addRadiation(ItemHazard.rabe * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_ra226be").setTextureName(RefStrings.MODID + ":rbmk_pellet_ra226be"); - rbmk_pellet_pu238be = (ItemRBMKPellet) new ItemRBMKPellet("Plutonium-238 & Beryllium Neutron Source").addRadiation(ItemHazard.pube * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_pu238be").setTextureName(RefStrings.MODID + ":rbmk_pellet_pu238be"); - rbmk_pellet_balefire_gold = (ItemRBMKPellet) new ItemRBMKPellet("Antihydrogen in a Magnetized Gold-198 Lattice").addRadiation(ItemHazard.au198 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_balefire_gold").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire_gold"); - rbmk_pellet_balefire = (ItemRBMKPellet) new ItemRBMKPellet("Draconic Flames").addRadiation(100000).toItem().setUnlocalizedName("rbmk_pellet_balefire").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire"); - rbmk_pellet_drx = (ItemRBMKPellet) new ItemRBMKPellet(EnumChatFormatting.OBFUSCATED + "can't you hear, can't you hear the thunder?").addRadiation(12500).addDigamma(0.0125F).toItem().setUnlocalizedName("rbmk_pellet_drx").setTextureName(RefStrings.MODID + ":rbmk_pellet_drx"); + rbmk_pellet_po210be = (ItemRBMKPellet) new ItemRBMKPellet("Polonium-210 & Beryllium Neutron Source").setUnlocalizedName("rbmk_pellet_po210be").setTextureName(RefStrings.MODID + ":rbmk_pellet_po210be"); + rbmk_pellet_ra226be = (ItemRBMKPellet) new ItemRBMKPellet("Radium-226 & Beryllium Neutron Source").setUnlocalizedName("rbmk_pellet_ra226be").setTextureName(RefStrings.MODID + ":rbmk_pellet_ra226be"); + rbmk_pellet_pu238be = (ItemRBMKPellet) new ItemRBMKPellet("Plutonium-238 & Beryllium Neutron Source").setUnlocalizedName("rbmk_pellet_pu238be").setTextureName(RefStrings.MODID + ":rbmk_pellet_pu238be"); + rbmk_pellet_balefire_gold = (ItemRBMKPellet) new ItemRBMKPellet("Antihydrogen in a Magnetized Gold-198 Lattice").setUnlocalizedName("rbmk_pellet_balefire_gold").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire_gold"); + rbmk_pellet_balefire = (ItemRBMKPellet) new ItemRBMKPellet("Draconic Flames").setUnlocalizedName("rbmk_pellet_balefire").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire"); + rbmk_pellet_drx = (ItemRBMKPellet) new ItemRBMKPellet(EnumChatFormatting.OBFUSCATED + "can't you hear, can't you hear the thunder?").setUnlocalizedName("rbmk_pellet_drx").setTextureName(RefStrings.MODID + ":rbmk_pellet_drx"); rbmk_fuel_empty = new Item().setUnlocalizedName("rbmk_fuel_empty").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_fuel_empty"); rbmk_fuel_ueu = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_ueu) @@ -3443,14 +3445,12 @@ public class ModItems { .setStats(15) .setFunction(EnumBurnFunc.LOG_TEN) .setMeltingPoint(2865) - .addRadiation(ItemHazard.u * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_ueu").setTextureName(RefStrings.MODID + ":rbmk_fuel_ueu"); rbmk_fuel_meu = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_meu) .setYield(100000000D) .setStats(20) .setFunction(EnumBurnFunc.LOG_TEN) .setMeltingPoint(2865) - .addRadiation(ItemHazard.uf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_meu").setTextureName(RefStrings.MODID + ":rbmk_fuel_meu"); rbmk_fuel_heu233 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_heu233) .setYield(100000000D) @@ -3458,28 +3458,24 @@ public class ModItems { .setFunction(EnumBurnFunc.SQUARE_ROOT) .setHeat(1.25D) .setMeltingPoint(2865) - .addRadiation(ItemHazard.u233 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_heu233").setTextureName(RefStrings.MODID + ":rbmk_fuel_heu233"); rbmk_fuel_heu235 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_heu235) .setYield(100000000D) .setStats(40) .setFunction(EnumBurnFunc.SQUARE_ROOT) .setMeltingPoint(2865) - .addRadiation(ItemHazard.u233 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_heu235").setTextureName(RefStrings.MODID + ":rbmk_fuel_heu235"); rbmk_fuel_thmeu = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_thmeu) .setYield(100000000D) .setStats(12) .setFunction(EnumBurnFunc.PLATEU) .setMeltingPoint(3350) - .addRadiation(ItemHazard.thf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_thmeu").setTextureName(RefStrings.MODID + ":rbmk_fuel_thmeu"); rbmk_fuel_lep = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_lep) .setYield(100000000D) .setStats(35) .setFunction(EnumBurnFunc.LOG_TEN) .setMeltingPoint(2744) - .addRadiation(ItemHazard.puf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_lep").setTextureName(RefStrings.MODID + ":rbmk_fuel_lep"); rbmk_fuel_mep = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_mep) .setYield(100000000D) @@ -3487,7 +3483,6 @@ public class ModItems { .setFunction(EnumBurnFunc.SQUARE_ROOT) .setHeat(1.25D) .setMeltingPoint(2744) - .addRadiation(ItemHazard.purg * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_mep").setTextureName(RefStrings.MODID + ":rbmk_fuel_mep"); rbmk_fuel_hep239 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hep239) .setYield(100000000D) @@ -3495,7 +3490,6 @@ public class ModItems { .setFunction(EnumBurnFunc.LINEAR) .setHeat(1.5D) .setMeltingPoint(2744) - .addRadiation(ItemHazard.pu239 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_hep").setTextureName(RefStrings.MODID + ":rbmk_fuel_hep"); rbmk_fuel_hep241 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hep241) .setYield(100000000D) @@ -3503,7 +3497,6 @@ public class ModItems { .setFunction(EnumBurnFunc.LINEAR) .setHeat(1.75D) .setMeltingPoint(2744) - .addRadiation(ItemHazard.pu241 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_hep241").setTextureName(RefStrings.MODID + ":rbmk_fuel_hep241"); rbmk_fuel_lea = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_lea) .setYield(100000000D) @@ -3511,7 +3504,6 @@ public class ModItems { .setFunction(EnumBurnFunc.SQUARE_ROOT) .setHeat(1.5D) .setMeltingPoint(2386) - .addRadiation(ItemHazard.amf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_lea").setTextureName(RefStrings.MODID + ":rbmk_fuel_lea"); rbmk_fuel_mea = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_mea) .setYield(100000000D) @@ -3519,7 +3511,6 @@ public class ModItems { .setFunction(EnumBurnFunc.ARCH) .setHeat(1.75D) .setMeltingPoint(2386) - .addRadiation(ItemHazard.amrg * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_mea").setTextureName(RefStrings.MODID + ":rbmk_fuel_mea"); rbmk_fuel_hea241 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hea241) .setYield(100000000D) @@ -3528,7 +3519,6 @@ public class ModItems { .setHeat(1.75D) .setMeltingPoint(2386) .setNeutronTypes(NType.FAST, NType.FAST) - .addRadiation(ItemHazard.am241 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_hea241").setTextureName(RefStrings.MODID + ":rbmk_fuel_hea241"); rbmk_fuel_hea242 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hea242) .setYield(100000000D) @@ -3536,7 +3526,6 @@ public class ModItems { .setFunction(EnumBurnFunc.LINEAR) .setHeat(2D) .setMeltingPoint(2386) - .addRadiation(ItemHazard.am242 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_hea242").setTextureName(RefStrings.MODID + ":rbmk_fuel_hea242"); rbmk_fuel_men = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_men) .setYield(100000000D) @@ -3544,7 +3533,6 @@ public class ModItems { .setFunction(EnumBurnFunc.SQUARE_ROOT) .setMeltingPoint(2800) .setNeutronTypes(NType.FAST, NType.FAST) - .addRadiation(ItemHazard.npf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_men").setTextureName(RefStrings.MODID + ":rbmk_fuel_men"); rbmk_fuel_hen = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hen) .setYield(100000000D) @@ -3552,7 +3540,6 @@ public class ModItems { .setFunction(EnumBurnFunc.SQUARE_ROOT) .setMeltingPoint(2800) .setNeutronTypes(NType.FAST, NType.FAST) - .addRadiation(ItemHazard.np237 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_hen").setTextureName(RefStrings.MODID + ":rbmk_fuel_hen"); rbmk_fuel_mox = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_mox) .setYield(100000000D) @@ -3560,7 +3547,6 @@ public class ModItems { .setFunction(EnumBurnFunc.LOG_TEN) .setHeat(1.5D) .setMeltingPoint(2815) - .addRadiation(ItemHazard.mox * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_mox").setTextureName(RefStrings.MODID + ":rbmk_fuel_mox"); rbmk_fuel_les = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_les) .setYield(100000000D) @@ -3568,7 +3554,6 @@ public class ModItems { .setFunction(EnumBurnFunc.SQUARE_ROOT) .setHeat(1.25D) .setMeltingPoint(2500) - .addRadiation(ItemHazard.saf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_les").setTextureName(RefStrings.MODID + ":rbmk_fuel_les"); rbmk_fuel_mes = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_mes) .setYield(100000000D) @@ -3576,7 +3561,6 @@ public class ModItems { .setFunction(EnumBurnFunc.ARCH) .setHeat(1.5D) .setMeltingPoint(2750) - .addRadiation(ItemHazard.saf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_mes").setTextureName(RefStrings.MODID + ":rbmk_fuel_mes"); rbmk_fuel_hes = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hes) .setYield(100000000D) @@ -3584,7 +3568,6 @@ public class ModItems { .setFunction(EnumBurnFunc.LINEAR) .setHeat(1.75D) .setMeltingPoint(3000) - .addRadiation(ItemHazard.saf * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_hes").setTextureName(RefStrings.MODID + ":rbmk_fuel_hes"); rbmk_fuel_leaus = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_leaus) .setYield(100000000D) @@ -3605,7 +3588,6 @@ public class ModItems { .setHeat(0.1D) .setDiffusion(0.05D) .setMeltingPoint(1287) - .addRadiation(ItemHazard.pobe * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_po210be").setTextureName(RefStrings.MODID + ":rbmk_fuel_po210be"); rbmk_fuel_ra226be = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_ra226be) .setYield(100000000D) @@ -3614,7 +3596,6 @@ public class ModItems { .setHeat(0.035D) .setDiffusion(0.5D) .setMeltingPoint(700) - .addRadiation(ItemHazard.rabe * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_ra226be").setTextureName(RefStrings.MODID + ":rbmk_fuel_ra226be"); rbmk_fuel_pu238be = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_pu238be) .setYield(50000000D) @@ -3623,14 +3604,12 @@ public class ModItems { .setHeat(0.1D) .setDiffusion(0.05D) .setMeltingPoint(1287) - .addRadiation(ItemHazard.pube * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_pu238be").setTextureName(RefStrings.MODID + ":rbmk_fuel_pu238be"); rbmk_fuel_balefire_gold = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_balefire_gold) .setYield(100000000D) .setStats(50, 10) .setFunction(EnumBurnFunc.ARCH) .setMeltingPoint(2000) - .addRadiation(ItemHazard.au198 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_balefire_gold").setTextureName(RefStrings.MODID + ":rbmk_fuel_balefire_gold"); rbmk_fuel_balefire = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_balefire) .setYield(100000000D) @@ -3638,7 +3617,6 @@ public class ModItems { .setFunction(EnumBurnFunc.LINEAR) .setHeat(3D) .setMeltingPoint(3652) - .addRadiation(800000F).toItem() .setUnlocalizedName("rbmk_fuel_balefire").setTextureName(RefStrings.MODID + ":rbmk_fuel_balefire"); rbmk_fuel_drx = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_drx) .setYield(1000000D) @@ -3646,31 +3624,31 @@ public class ModItems { .setFunction(EnumBurnFunc.QUADRATIC) .setHeat(0.1D) .setMeltingPoint(100000) - .addDigamma(0.1F).toItem().setUnlocalizedName("rbmk_fuel_drx").setTextureName(RefStrings.MODID + ":rbmk_fuel_drx"); + .setUnlocalizedName("rbmk_fuel_drx").setTextureName(RefStrings.MODID + ":rbmk_fuel_drx"); - trinitite = new ItemHazard().addRadiation(ItemHazard.trn * ItemHazard.ingot).toItem().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); - nuclear_waste_long = new ItemWasteLong().addRadiation(5F).toItem().setUnlocalizedName("nuclear_waste_long").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long"); - nuclear_waste_long_tiny = new ItemWasteLong().addRadiation(0.5F).toItem().setUnlocalizedName("nuclear_waste_long_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_tiny"); - nuclear_waste_short = new ItemWasteShort().addRadiation(30F).addFire(5).toItem().setUnlocalizedName("nuclear_waste_short").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short"); - nuclear_waste_short_tiny = new ItemWasteShort().addRadiation(3F).addFire(5).toItem().setUnlocalizedName("nuclear_waste_short_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short_tiny"); - nuclear_waste_long_depleted = new ItemWasteLong().addRadiation(0.5F).toItem().setUnlocalizedName("nuclear_waste_long_depleted").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_depleted"); - nuclear_waste_long_depleted_tiny = new ItemWasteLong().addRadiation(0.05F).toItem().setUnlocalizedName("nuclear_waste_long_depleted_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_depleted_tiny"); - nuclear_waste_short_depleted = new ItemWasteShort().addRadiation(3F).toItem().setUnlocalizedName("nuclear_waste_short_depleted").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short_depleted"); - nuclear_waste_short_depleted_tiny = new ItemWasteShort().addRadiation(0.3F).toItem().setUnlocalizedName("nuclear_waste_short_depleted_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short_depleted_tiny"); - nuclear_waste = new ItemHazard(15F).setUnlocalizedName("nuclear_waste").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste"); - nuclear_waste_tiny = new ItemHazard(2F).setUnlocalizedName("nuclear_waste_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_tiny"); - nuclear_waste_vitrified = new ItemHazard(7.5F).setUnlocalizedName("nuclear_waste_vitrified").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_vitrified"); - nuclear_waste_vitrified_tiny = new ItemHazard(1F).setUnlocalizedName("nuclear_waste_vitrified_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_vitrified_tiny"); - waste_uranium = new ItemHazard(15F).setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); - waste_thorium = new ItemHazard(10F).setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); - waste_plutonium = new ItemHazard(15F).setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium"); - waste_mox = new ItemHazard(15F).setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox"); - waste_schrabidium = new ItemHazard(40F, false, true).setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); - waste_uranium_hot = new ItemHazard(15F, true).setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot"); - waste_thorium_hot = new ItemHazard(10F, true).setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot"); - waste_plutonium_hot = new ItemHazard(15F, true).setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot"); - waste_mox_hot = new ItemHazard(15F, true).setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot"); - waste_schrabidium_hot = new ItemHazard(40F, true, true).setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot"); + trinitite = new ItemNuclearWaste().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); + nuclear_waste_long = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long"); + nuclear_waste_long_tiny = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_tiny"); + nuclear_waste_short = new ItemWasteShort().setUnlocalizedName("nuclear_waste_short").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short"); + nuclear_waste_short_tiny = new ItemWasteShort().setUnlocalizedName("nuclear_waste_short_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short_tiny"); + nuclear_waste_long_depleted = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long_depleted").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_depleted"); + nuclear_waste_long_depleted_tiny = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long_depleted_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_depleted_tiny"); + nuclear_waste_short_depleted = new ItemWasteShort().setUnlocalizedName("nuclear_waste_short_depleted").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short_depleted"); + nuclear_waste_short_depleted_tiny = new ItemWasteShort().setUnlocalizedName("nuclear_waste_short_depleted_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short_depleted_tiny"); + nuclear_waste = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste"); + nuclear_waste_tiny = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_tiny"); + nuclear_waste_vitrified = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste_vitrified").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_vitrified"); + nuclear_waste_vitrified_tiny = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste_vitrified_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_vitrified_tiny"); + waste_uranium = new ItemNuclearWaste().setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); + waste_thorium = new ItemNuclearWaste().setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); + waste_plutonium = new ItemNuclearWaste().setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium"); + waste_mox = new ItemNuclearWaste().setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox"); + waste_schrabidium = new ItemNuclearWaste().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); + waste_uranium_hot = new ItemNuclearWaste().setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot"); + waste_thorium_hot = new ItemNuclearWaste().setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot"); + waste_plutonium_hot = new ItemNuclearWaste().setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot"); + waste_mox_hot = new ItemNuclearWaste().setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot"); + waste_schrabidium_hot = new ItemNuclearWaste().setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot"); scrap = new Item().setUnlocalizedName("scrap").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap"); containment_box = new ItemLeadBox().setUnlocalizedName("containment_box").setCreativeTab(null).setTextureName(RefStrings.MODID + ":containment_box"); rod_thorium_fuel_depleted = new ItemHazard(10F, true).setUnlocalizedName("rod_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel_depleted"); @@ -7365,6 +7343,7 @@ public class ModItems { //Chaos GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); GameRegistry.registerItem(cbt_device, cbt_device.getUnlocalizedName()); + GameRegistry.registerItem(cigarette, cigarette.getUnlocalizedName()); //Armor mods GameRegistry.registerItem(attachment_mask, attachment_mask.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java b/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java index 246519e7a..e1e97e33f 100644 --- a/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java +++ b/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import com.hbm.inventory.AssemblerRecipes; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; +import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java index d86d021cb..cd6ec8c0f 100644 --- a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java +++ b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java @@ -4,7 +4,7 @@ import java.util.List; import com.hbm.interfaces.Spaghetti; import com.hbm.inventory.FluidStack; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java b/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java index d37498994..dd3715d6d 100644 --- a/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java +++ b/src/main/java/com/hbm/items/machine/ItemRBMKPellet.java @@ -2,9 +2,8 @@ package com.hbm.items.machine; import java.util.List; -import com.hbm.interfaces.IItemHazard; +import com.hbm.items.special.ItemNuclearWaste; import com.hbm.main.MainRegistry; -import com.hbm.modules.ItemHazardModule; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,17 +19,15 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class ItemRBMKPellet extends Item implements IItemHazard { +public class ItemRBMKPellet extends ItemNuclearWaste { public String fullName = ""; - ItemHazardModule module; public ItemRBMKPellet(String fullName) { this.fullName = fullName; this.setHasSubtypes(true); this.setMaxDamage(0); this.setCreativeTab(MainRegistry.controlTab); - this.module = new ItemHazardModule(); } @Override @@ -91,9 +88,6 @@ public class ItemRBMKPellet extends Item implements IItemHazard { if(hasXenon(meta)) list.add(EnumChatFormatting.DARK_PURPLE + "High Xenon Poison"); - - updateModule(stack); - this.module.addInformation(stack, player, list, bool); } @Override @@ -116,39 +110,4 @@ public class ItemRBMKPellet extends Item implements IItemHazard { private int rectify(int meta) { return Math.abs(meta) % 10; } - - @Override - public ItemHazardModule getModule() { - return this.module; - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { - - if(entity instanceof EntityLivingBase) { - updateModule(stack); - this.module.applyEffects((EntityLivingBase) entity, stack.stackSize, i, b); - } - } - - @Override - public boolean onEntityItemUpdate(EntityItem item) { - - super.onEntityItemUpdate(item); - updateModule(item.getEntityItem()); - return this.module.onEntityItemUpdate(item); - } - - private void updateModule(ItemStack stack) { - - int index = stack.getItemDamage() % 5; - float mod = (index * index) / 5F; - - if(stack.getItemDamage() >= 5) { - mod *= 10F; - mod += 1F; - } - - this.module.setMod(1F + mod); - } } diff --git a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java index fd293503c..bb8cabb35 100644 --- a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java +++ b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java @@ -2,10 +2,8 @@ package com.hbm.items.machine; import java.util.List; -import com.hbm.interfaces.IItemHazard; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import com.hbm.modules.ItemHazardModule; import com.hbm.tileentity.machine.rbmk.IRBMKFluxReceiver.NType; import com.hbm.tileentity.machine.rbmk.RBMKDials; import com.hbm.util.I18nUtil; @@ -20,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -public class ItemRBMKRod extends Item implements IItemHazard { +public class ItemRBMKRod extends Item { public ItemRBMKPellet pellet; public String fullName = ""; //full name of the fuel rod @@ -62,8 +60,6 @@ public class ItemRBMKRod extends Item implements IItemHazard { } public ItemRBMKRod(String fullName) { - this.module = new ItemHazardModule(); - this.fullName = fullName; this.setContainerItem(ModItems.rbmk_fuel_empty); @@ -361,38 +357,6 @@ public class ItemRBMKRod extends Item implements IItemHazard { list.add(EnumChatFormatting.DARK_RED + "Melting point: " + meltingPoint + "°C");*/ super.addInformation(stack, player, list, bool); - updateModule(stack); - this.module.addInformation(stack, player, list, bool); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { - - if(entity instanceof EntityLivingBase) { - updateModule(stack); - this.module.applyEffects((EntityLivingBase) entity, stack.stackSize, i, b); - } - } - - @Override - public boolean onEntityItemUpdate(EntityItem item) { - - super.onEntityItemUpdate(item); - updateModule(item.getEntityItem()); - return this.module.onEntityItemUpdate(item); - } - - ItemHazardModule module; - - @Override - public ItemHazardModule getModule() { - return this.module; - } - - private void updateModule(ItemStack stack) { - - float mod = (float)(1 + (1 - this.getEnrichment(stack)) * 24 + this.getPoisonLevel(stack) * 100); - this.module.setMod(mod); } /* __ __ ____ ________ diff --git a/src/main/java/com/hbm/items/special/ItemCigarette.java b/src/main/java/com/hbm/items/special/ItemCigarette.java new file mode 100644 index 000000000..042d49a7c --- /dev/null +++ b/src/main/java/com/hbm/items/special/ItemCigarette.java @@ -0,0 +1,69 @@ +package com.hbm.items.special; + +import java.util.List; + +import com.hbm.extprop.HbmLivingProps; +import com.hbm.packet.AuxParticlePacketNT; +import com.hbm.packet.PacketDispatcher; + +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.event.entity.player.ArrowNockEvent; + +public class ItemCigarette extends Item { + + @Override + public EnumAction getItemUseAction(ItemStack stack) { + return EnumAction.bow; + } + + @Override + public int getMaxItemUseDuration(ItemStack stack) { + return 30; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + return stack; + } + + @Override + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + stack.stackSize--; + + if(!world.isRemote) { + HbmLivingProps.incrementBlackLung(player, 2000); + HbmLivingProps.incrementAsbestos(player, 2000); + HbmLivingProps.incrementRadiation(player, 100F); + + world.playSoundEffect(player.posX, player.posY, player.posZ, "hbm:player.cough", 1.0F, 1.0F); + + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setString("type", "vomit"); + nbt.setString("mode", "smoke"); + nbt.setInteger("count", 30); + nbt.setInteger("entity", player.getEntityId()); + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(nbt, 0, 0, 0), new TargetPoint(player.dimension, player.posX, player.posY, player.posZ, 25)); + } + + return stack; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + list.add(EnumChatFormatting.RED + "✓ Asbestos filter"); + list.add(EnumChatFormatting.RED + "✓ High in tar"); + list.add(EnumChatFormatting.RED + "✓ Tobacco contains 100% Polonium-210"); + list.add(EnumChatFormatting.RED + "✓ Yum"); + } +} diff --git a/src/main/java/com/hbm/items/special/ItemNuclearWaste.java b/src/main/java/com/hbm/items/special/ItemNuclearWaste.java new file mode 100644 index 000000000..aa114abe3 --- /dev/null +++ b/src/main/java/com/hbm/items/special/ItemNuclearWaste.java @@ -0,0 +1,33 @@ +package com.hbm.items.special; + +import com.hbm.entity.item.EntitytemWaste; + +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class ItemNuclearWaste extends Item { + + @Override + public boolean hasCustomEntity(ItemStack stack) { + return true; + } + + @Override + public int getEntityLifespan(ItemStack itemStack, World world) { + return Integer.MAX_VALUE; + } + + @Override + public Entity createEntity(World world, Entity entityItem, ItemStack itemstack) { + + EntitytemWaste entity = new EntitytemWaste(world, entityItem.posX, entityItem.posY, entityItem.posZ, itemstack); + entity.motionX = entityItem.motionX; + entity.motionY = entityItem.motionY; + entity.motionZ = entityItem.motionZ; + entity.delayBeforeCanPickup = 10; + + return entity; + } +} diff --git a/src/main/java/com/hbm/items/special/ItemWasteLong.java b/src/main/java/com/hbm/items/special/ItemWasteLong.java index ca27c3cbc..62228a859 100644 --- a/src/main/java/com/hbm/items/special/ItemWasteLong.java +++ b/src/main/java/com/hbm/items/special/ItemWasteLong.java @@ -12,7 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -public class ItemWasteLong extends ItemHazard { +public class ItemWasteLong extends ItemNuclearWaste { public ItemWasteLong() { super(); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index a077cb375..59b038aa3 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -69,6 +69,17 @@ import com.hbm.handler.imc.IMCHandler; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.hazard.HazardRegistry; import com.hbm.inventory.*; +import com.hbm.inventory.recipes.AssemblerRecipes; +import com.hbm.inventory.recipes.BreederRecipes; +import com.hbm.inventory.recipes.CentrifugeRecipes; +import com.hbm.inventory.recipes.CrystallizerRecipes; +import com.hbm.inventory.recipes.CyclotronRecipes; +import com.hbm.inventory.recipes.HadronRecipes; +import com.hbm.inventory.recipes.MagicRecipes; +import com.hbm.inventory.recipes.RefineryRecipes; +import com.hbm.inventory.recipes.SILEXRecipes; +import com.hbm.inventory.recipes.ShredderRecipes; +import com.hbm.inventory.recipes.anvil.AnvilRecipes; import com.hbm.items.ModItems; import com.hbm.lib.HbmWorld; import com.hbm.lib.Library; diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 8f9cc2da3..12a62a8bc 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -18,9 +18,9 @@ import com.hbm.hazard.HazardSystem; import com.hbm.interfaces.IHoldableWeapon; import com.hbm.interfaces.IItemHUD; import com.hbm.interfaces.Spaghetti; -import com.hbm.inventory.BreederRecipes; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.gui.GUIArmorTable; +import com.hbm.inventory.recipes.BreederRecipes; import com.hbm.items.ModItems; import com.hbm.items.armor.ArmorFSB; import com.hbm.items.armor.ArmorFSBPowered; diff --git a/src/main/java/com/hbm/modules/ItemHazardModule.java b/src/main/java/com/hbm/modules/ItemHazardModule.java index 3d0b6a7a9..0ae52c95b 100644 --- a/src/main/java/com/hbm/modules/ItemHazardModule.java +++ b/src/main/java/com/hbm/modules/ItemHazardModule.java @@ -4,7 +4,7 @@ import java.util.List; import com.hbm.config.GeneralConfig; import com.hbm.extprop.HbmLivingProps; -import com.hbm.inventory.BreederRecipes; +import com.hbm.inventory.recipes.BreederRecipes; import com.hbm.items.ModItems; import com.hbm.util.ArmorRegistry; import com.hbm.util.ArmorUtil; diff --git a/src/main/java/com/hbm/packet/AnvilCraftPacket.java b/src/main/java/com/hbm/packet/AnvilCraftPacket.java index 0899fc93d..228a2bf15 100644 --- a/src/main/java/com/hbm/packet/AnvilCraftPacket.java +++ b/src/main/java/com/hbm/packet/AnvilCraftPacket.java @@ -1,9 +1,9 @@ package com.hbm.packet; import com.hbm.blocks.ModBlocks; -import com.hbm.inventory.AnvilRecipes; -import com.hbm.inventory.AnvilRecipes.AnvilConstructionRecipe; import com.hbm.inventory.container.ContainerAnvil; +import com.hbm.inventory.recipes.anvil.AnvilRecipes; +import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilConstructionRecipe; import com.hbm.main.MainRegistry; import com.hbm.util.InventoryUtil; diff --git a/src/main/java/com/hbm/render/item/ItemRenderTemplate.java b/src/main/java/com/hbm/render/item/ItemRenderTemplate.java index 1705ec224..fbe0bc42d 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderTemplate.java +++ b/src/main/java/com/hbm/render/item/ItemRenderTemplate.java @@ -3,7 +3,7 @@ package com.hbm.render.item; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.AssemblerRecipes; +import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.items.ModItems; import com.hbm.render.util.RenderItemStack; diff --git a/src/main/java/com/hbm/render/tileentity/RenderAssembler.java b/src/main/java/com/hbm/render/tileentity/RenderAssembler.java index 76656793b..940bf6431 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderAssembler.java +++ b/src/main/java/com/hbm/render/tileentity/RenderAssembler.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.AssemblerRecipes; +import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.render.util.RenderDecoItem; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java index 64717761f..221adbfa8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java @@ -11,7 +11,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.NBTPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java index a0ad126a9..a535fdb73 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java @@ -1,7 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineDiFurnace; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java index 029f58236..b1b824498 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java @@ -9,7 +9,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.BlockHadronCoil; import com.hbm.blocks.machine.BlockHadronPlating; import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.HadronRecipes; +import com.hbm.inventory.recipes.HadronRecipes; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index bb81b857f..cda77068f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -9,10 +9,10 @@ import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; -import com.hbm.inventory.BreederRecipes; -import com.hbm.inventory.BreederRecipes.BreederRecipe; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.FusionRecipes; +import com.hbm.inventory.recipes.BreederRecipes; +import com.hbm.inventory.recipes.FusionRecipes; +import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe; import com.hbm.items.ModItems; import com.hbm.items.special.ItemFusionShield; import com.hbm.lib.Library; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java index 8445db3ff..c087c0d07 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java @@ -6,8 +6,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.AssemblerRecipes; import com.hbm.inventory.RecipesCommon.AStack; +import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.inventory.UpgradeManager; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemAssemblyTemplate; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java index 0acdea551..2507c2852 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java @@ -10,7 +10,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java index 1b98ce209..6a5841e88 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java @@ -11,7 +11,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java index 820672fca..678a212e1 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java @@ -1,7 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.CentrifugeRecipes; +import com.hbm.inventory.recipes.CentrifugeRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index c9de64952..61d874b0c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -11,8 +11,8 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidStack; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemChemistryTemplate; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java index 62c00ec75..f48b28f1e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java @@ -6,8 +6,8 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; -import com.hbm.inventory.CrystallizerRecipes; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.recipes.CrystallizerRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.lib.Library; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java index 8408dfa8b..03c451cbe 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java @@ -14,8 +14,8 @@ import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; -import com.hbm.inventory.CyclotronRecipes; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.recipes.CyclotronRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.lib.Library; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java index 909ee4c21..aaa304a35 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java @@ -1,7 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.machine.ItemStamp; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFractionTower.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFractionTower.java index 7ab69d6b7..13aadcf81 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFractionTower.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFractionTower.java @@ -7,7 +7,7 @@ import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.RefineryRecipes; +import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.lib.Library; import com.hbm.util.Tuple.Quartet; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index e20d61255..b4745b099 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -9,8 +9,8 @@ import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.MachineRecipes.GasCentOutput; +import com.hbm.inventory.recipes.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes.GasCentOutput; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java index cdbb0d649..da2b1c878 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java @@ -11,7 +11,7 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java index 8c570f115..566b4451b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java @@ -10,11 +10,11 @@ import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; -import com.hbm.inventory.CentrifugeRecipes; -import com.hbm.inventory.CrystallizerRecipes; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.ShredderRecipes; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.recipes.CentrifugeRecipes; +import com.hbm.inventory.recipes.CrystallizerRecipes; +import com.hbm.inventory.recipes.ShredderRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java index 90cc7abfe..0c620041b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java @@ -1,6 +1,6 @@ package com.hbm.tileentity.machine; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.machine.ItemStamp; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEPressPacket; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java index c09c2b5f2..20321ce6e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java @@ -1,7 +1,7 @@ package com.hbm.tileentity.machine; -import com.hbm.inventory.BreederRecipes; -import com.hbm.inventory.BreederRecipes.BreederRecipe; +import com.hbm.inventory.recipes.BreederRecipes; +import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe; import com.hbm.tileentity.TileEntityMachineBase; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRefinery.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRefinery.java index a97b4eae0..a126d03f8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRefinery.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRefinery.java @@ -10,7 +10,7 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.RefineryRecipes; +import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java index aad2cf037..2478196e0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java @@ -2,7 +2,7 @@ package com.hbm.tileentity.machine; import com.hbm.config.VersatileConfig; import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCapacitor; import com.hbm.lib.Library; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java index ac9263c7d..801624eec 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -2,7 +2,7 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.Untested; -import com.hbm.inventory.ShredderRecipes; +import com.hbm.inventory.recipes.ShredderRecipes; import com.hbm.items.machine.ItemBlades; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index 698a6d8bb..660580ab3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -10,7 +10,7 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; +import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java index 41130f205..18ac09520 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java @@ -1,7 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineNukeFurnace; -import com.hbm.inventory.BreederRecipes; +import com.hbm.inventory.recipes.BreederRecipes; import com.hbm.items.ModItems; import com.hbm.items.special.ItemCustomLore; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java index 323d32576..4d6ffd824 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java @@ -8,8 +8,8 @@ import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; import com.hbm.inventory.RecipesCommon.ComparableStack; -import com.hbm.inventory.SILEXRecipes; -import com.hbm.inventory.SILEXRecipes.SILEXRecipe; +import com.hbm.inventory.recipes.SILEXRecipes; +import com.hbm.inventory.recipes.SILEXRecipes.SILEXRecipe; import com.hbm.items.ModItems; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.InventoryUtil; diff --git a/src/main/java/com/hbm/util/InventoryUtil.java b/src/main/java/com/hbm/util/InventoryUtil.java index c245e81f6..ea1a741de 100644 --- a/src/main/java/com/hbm/util/InventoryUtil.java +++ b/src/main/java/com/hbm/util/InventoryUtil.java @@ -3,8 +3,8 @@ package com.hbm.util; import java.util.ArrayList; import java.util.List; -import com.hbm.inventory.AnvilRecipes.AnvilOutput; import com.hbm.inventory.RecipesCommon.AStack; +import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilOutput; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory;