From ef96f754d847962a4212736878902b7dc043493d Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Wed, 11 Jul 2018 14:34:30 +0100 Subject: [PATCH] fix uncraftable capsules with apiculture disabled #2183 (#2184) --- .../forestry/apiculture/ModuleApiculture.java | 35 +++++--------- src/main/java/forestry/core/ModuleCore.java | 47 ++++++++++++------- .../forestry/core/items/ItemRegistryCore.java | 6 ++- 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/main/java/forestry/apiculture/ModuleApiculture.java b/src/main/java/forestry/apiculture/ModuleApiculture.java index 58649928e7..cb733c81f0 100644 --- a/src/main/java/forestry/apiculture/ModuleApiculture.java +++ b/src/main/java/forestry/apiculture/ModuleApiculture.java @@ -13,6 +13,14 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import javax.annotation.Nullable; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Random; +import java.util.Set; + import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockFlowerPot; import net.minecraft.block.properties.PropertyEnum; @@ -34,6 +42,7 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.IChunkGenerator; import net.minecraft.world.storage.loot.LootTableList; + import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.MinecraftForge; @@ -41,22 +50,14 @@ import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.registries.IForgeRegistry; + import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.VillagerRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.registries.IForgeRegistry; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.Set; - -import javax.annotation.Nullable; import forestry.Forestry; import forestry.api.apiculture.BeeManager; @@ -66,7 +67,6 @@ import forestry.api.apiculture.IBeekeepingMode; import forestry.api.apiculture.hives.HiveManager; import forestry.api.apiculture.hives.IHiveRegistry.HiveType; -import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.api.genetics.IClassification.EnumClassLevel; @@ -574,19 +574,6 @@ public void registerRecipes() { } - // / CAPSULES - int outputCapsuleAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule"); - if (outputCapsuleAmount > 0) { - ItemStack capsule = fluidItems.waxCapsuleEmpty.getItemStack(outputCapsuleAmount); - RecipeUtil.addRecipe("wax_capsule", capsule, "###", '#', coreItems.beeswax); - } - - int outputRefractoryAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.refractory"); - if (outputRefractoryAmount > 0) { - ItemStack capsule = fluidItems.refractoryEmpty.getItemStack(outputRefractoryAmount); - RecipeUtil.addRecipe("refractory_capsule", capsule, "###", '#', coreItems.refractoryWax); - } - // / BITUMINOUS PEAT RecipeUtil.addRecipe("bituminous_peat", coreItems.bituminousPeat.getItemStack(), " # ", "XYX", " # ", diff --git a/src/main/java/forestry/core/ModuleCore.java b/src/main/java/forestry/core/ModuleCore.java index b07c8d235e..447b446f47 100644 --- a/src/main/java/forestry/core/ModuleCore.java +++ b/src/main/java/forestry/core/ModuleCore.java @@ -88,12 +88,12 @@ public class ModuleCore extends BlankForestryModule { private static BlockRegistryCore blocks; public static ItemRegistryCore getItems() { - Preconditions.checkState(items != null); + Preconditions.checkNotNull(items); return items; } public static BlockRegistryCore getBlocks() { - Preconditions.checkState(blocks != null); + Preconditions.checkNotNull(blocks); return blocks; } @@ -260,11 +260,24 @@ public void registerRecipes() { /* STURDY MACHINE */ RecipeUtil.addRecipe("sturdy_casing", items.sturdyCasing, "###", "# #", "###", '#', OreDictUtil.INGOT_BRONZE); - // / EMPTY CANS + // / CONTAINERS int canAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.can"); ItemStack canOutput = fluidItems.canEmpty.getItemStack(canAmount); RecipeUtil.addRecipe("tin_can", canOutput, " # ", "# #", '#', OreDictUtil.INGOT_TIN); + // / CAPSULES + int outputCapsuleAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule"); + if (outputCapsuleAmount > 0) { + ItemStack capsule = fluidItems.waxCapsuleEmpty.getItemStack(outputCapsuleAmount); + RecipeUtil.addRecipe("wax_capsule", capsule, "###", '#', items.beeswax); + } + + int outputRefractoryAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.refractory"); + if (outputRefractoryAmount > 0) { + ItemStack capsule = fluidItems.refractoryEmpty.getItemStack(outputRefractoryAmount); + RecipeUtil.addRecipe("refractory_capsule", capsule, "###", '#', items.refractoryWax); + } + // / GEARS List stoneGear = OreDictionary.getOres(OreDictUtil.GEAR_STONE); Object gearCenter; @@ -288,7 +301,7 @@ public void registerRecipes() { // / WRENCH RecipeUtil.addRecipe("wrench", items.wrench, "# #", " # ", " # ", '#', OreDictUtil.INGOT_BRONZE); - + // / WEB RecipeUtil.addRecipe("silk_wisp_to_web", new ItemStack(Blocks.WEB, 4), "# #", " # ", "# #", '#', items.craftingMaterial.getSilkWisp()); @@ -433,22 +446,22 @@ public void registerRecipes() { RecipeUtil.addShapelessRecipe("block_to_bronze", ingotBronze, OreDictUtil.BLOCK_BRONZE); } - if(!ModuleHelper.isEnabled(ForestryModuleUids.CHARCOAL)){ + if (!ModuleHelper.isEnabled(ForestryModuleUids.CHARCOAL)) { RecipeUtil.addSmelting(new ItemStack(items.ash, 2), new ItemStack(Items.COAL, 1, 1), 0.15F); } RecipeUtil.addRecipe("ash_brick", blocks.ashBrick, - "A#A", - "# #", - "A#A", - '#', Items.BRICK, - 'A', OreDictUtil.DUST_ASH); + "A#A", + "# #", + "A#A", + '#', Items.BRICK, + 'A', OreDictUtil.DUST_ASH); RecipeUtil.addRecipe("ash_stairs", blocks.ashStairs, - true, - "# ", - "## ", - "###", - '#', Items.BRICK); + true, + "# ", + "## ", + "###", + '#', Items.BRICK); // alternate recipes if (!ModuleHelper.isEnabled(ForestryModuleUids.APICULTURE)) { @@ -467,14 +480,14 @@ public IPacketRegistry getPacketRegistry() { public boolean processIMCMessage(IMCMessage message) { if (message.key.equals("blacklist-ores-dimension")) { int[] dims = message.getNBTValue().getIntArray("dimensions"); - for(int dim : dims) { + for (int dim : dims) { Config.blacklistOreDim(dim); } return true; } return false; } - + @Override public IPickupHandler getPickupHandler() { return new PickupHandlerCore(); diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index 2884fa8a76..f2a32ed3ed 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -18,6 +18,8 @@ import forestry.core.circuits.ItemCircuitBoard; import forestry.core.genetics.ItemResearchNote; import forestry.core.utils.OreDictUtil; +import forestry.modules.ForestryModuleUids; +import forestry.modules.ModuleHelper; public class ItemRegistryCore extends ItemRegistry { /* Fertilizer */ @@ -189,7 +191,9 @@ public int getItemBurnTime(ItemStack itemStack) { // / BEE RESOURCES beeswax = registerItem(new ItemForestry(), "beeswax"); - beeswax.setCreativeTab(Tabs.tabApiculture); + if(ModuleHelper.isEnabled(ForestryModuleUids.APICULTURE)) { + beeswax.setCreativeTab(Tabs.tabApiculture); + } OreDictionary.registerOre(OreDictUtil.ITEM_BEESWAX, beeswax); refractoryWax = registerItem(new ItemForestry(), "refractory_wax");