Skip to content

Commit

Permalink
fix uncraftable capsules with apiculture disabled #2183 (#2184)
Browse files Browse the repository at this point in the history
  • Loading branch information
@temp1011 @Nedelosk
temp1011 authored and Nedelosk committed Jul 11, 2018
1 parent 3227060 commit ef96f75
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 42 deletions.
35 changes: 11 additions & 24 deletions src/main/java/forestry/apiculture/ModuleApiculture.java
View file
Expand Up @@ -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;
Expand All @@ -34,29 +42,22 @@
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;
import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
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;
Expand All @@ -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;
Expand Down Expand Up @@ -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", " # ",
Expand Down
47 changes: 30 additions & 17 deletions src/main/java/forestry/core/ModuleCore.java
View file
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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<ItemStack> stoneGear = OreDictionary.getOres(OreDictUtil.GEAR_STONE);
Object gearCenter;
Expand All @@ -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());

Expand Down Expand Up @@ -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)) {
Expand All @@ -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();
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/forestry/core/items/ItemRegistryCore.java
View file
Expand Up @@ -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 */
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit ef96f75

Please sign in to comment.