Add missing changes

This commit is contained in:
Nedelosk committed 2017-04-06 01:11:27 +02:00
1 parent f911100c3d
commit 81ef5d536f
12 files changed
+26 -20

No files matched your search

@@ -1,3 +1,8 @@
/*******************************************************************************
* Copyright 2011-2014 SirSengir
*
* This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
******************************************************************************/
package forestry.api.farming;
import net.minecraft.item.ItemStack;
@@ -1,6 +1,7 @@
package forestry.farming;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -26,7 +27,6 @@ import forestry.farming.logic.FarmLogicSimple;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.oredict.OreDictionary;
import scala.actors.threadpool.Arrays;
public final class FarmRegistry implements IFarmRegistry {
@@ -10,14 +10,14 @@
******************************************************************************/
package forestry.farming.logic;
import forestry.api.farming.Farmables;
import forestry.farming.FarmRegistry;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
public class FarmLogicCereal extends FarmLogicCrops {
public FarmLogicCereal() {
super(Farmables.farmables.get("farmWheat"));
super(FarmRegistry.getInstance().getFarmables("farmWheat"));
}
@Override
@@ -14,11 +14,11 @@ import java.util.Collection;
import java.util.Stack;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.Farmables;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.api.farming.IFarmable;
import forestry.core.utils.BlockUtil;
import forestry.farming.FarmRegistry;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -30,7 +30,7 @@ import net.minecraft.world.World;
public class FarmLogicEnder extends FarmLogicHomogeneous {
public FarmLogicEnder() {
super(new ItemStack(Blocks.END_STONE), Blocks.END_STONE.getDefaultState(), Farmables.farmables.get("farmEnder"));
super(new ItemStack(Blocks.END_STONE), Blocks.END_STONE.getDefaultState(), FarmRegistry.getInstance().getFarmables("farmEnder"));
}
@Override
@@ -14,10 +14,10 @@ import java.util.Collection;
import java.util.Stack;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.Farmables;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.api.farming.IFarmable;
import forestry.farming.FarmRegistry;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -30,7 +30,7 @@ public class FarmLogicGourd extends FarmLogic {
private final IFarmable[] seeds;
public FarmLogicGourd() {
Collection<IFarmable> farmables = Farmables.farmables.get("farmGourd");
Collection<IFarmable> farmables = FarmRegistry.getInstance().getFarmables("farmGourd");
seeds = farmables.toArray(new IFarmable[farmables.size()]);
}
@@ -14,11 +14,11 @@ import java.util.Collection;
import java.util.Stack;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.Farmables;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.api.farming.IFarmable;
import forestry.core.utils.BlockUtil;
import forestry.farming.FarmRegistry;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -30,7 +30,7 @@ import net.minecraft.world.World;
public class FarmLogicInfernal extends FarmLogicHomogeneous {
public FarmLogicInfernal() {
super(new ItemStack(Blocks.SOUL_SAND), Blocks.SOUL_SAND.getDefaultState(), Farmables.farmables.get("farmInfernal"));
super(new ItemStack(Blocks.SOUL_SAND), Blocks.SOUL_SAND.getDefaultState(), FarmRegistry.getInstance().getFarmables("farmInfernal"));
}
@Override
@@ -10,8 +10,8 @@
******************************************************************************/
package forestry.farming.logic;
import forestry.api.farming.Farmables;
import forestry.api.farming.IFarmHousing;
import forestry.farming.FarmRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
@@ -20,7 +20,7 @@ import net.minecraft.world.World;
public class FarmLogicMushroom extends FarmLogicArboreal {
public FarmLogicMushroom() {
super(new ItemStack(Blocks.MYCELIUM), Blocks.MYCELIUM.getDefaultState(), Farmables.farmables.get("farmShroom"));
super(new ItemStack(Blocks.MYCELIUM), Blocks.MYCELIUM.getDefaultState(), FarmRegistry.getInstance().getFarmables("farmShroom"));
addSoil(new ItemStack(Blocks.DIRT, 1, 2), Blocks.DIRT.getStateFromMeta(2), true);
}
@@ -21,13 +21,13 @@ import java.util.Stack;
import com.google.common.collect.ImmutableList;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.Farmables;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.api.farming.IFarmable;
import forestry.api.genetics.IFruitBearer;
import forestry.core.PluginCore;
import forestry.core.tiles.TileUtil;
import forestry.farming.FarmRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
@@ -42,7 +42,7 @@ public class FarmLogicOrchard extends FarmLogic {
private final ImmutableList<Block> traversalBlocks;
public FarmLogicOrchard() {
this.farmables = Farmables.farmables.get("farmOrchard");
this.farmables = FarmRegistry.getInstance().getFarmables("farmOrchard");
ImmutableList.Builder<Block> traversalBlocksBuilder = ImmutableList.builder();
// if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.AGRICRAFT) || ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT)) {
@@ -14,11 +14,11 @@ import java.util.Collection;
import java.util.Stack;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.Farmables;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.api.farming.IFarmable;
import forestry.core.utils.ItemStackUtil;
import forestry.farming.FarmRegistry;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -28,7 +28,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class FarmLogicReeds extends FarmLogic {
private final Collection<IFarmable> germlings = Farmables.farmables.get("farmPoales");
private final Collection<IFarmable> germlings = FarmRegistry.getInstance().getFarmables("farmPoales");
@Override
public ItemStack getIconItemStack() {
@@ -14,11 +14,11 @@ import java.util.Collection;
import java.util.Stack;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.Farmables;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.api.farming.IFarmable;
import forestry.core.utils.ItemStackUtil;
import forestry.farming.FarmRegistry;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -28,7 +28,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class FarmLogicSucculent extends FarmLogic {
private final Collection<IFarmable> germlings = Farmables.farmables.get("farmSucculentes");
private final Collection<IFarmable> germlings = FarmRegistry.getInstance().getFarmables("farmSucculentes");
@Override
public ItemStack getIconItemStack() {
@@ -10,14 +10,14 @@
******************************************************************************/
package forestry.farming.logic;
import forestry.api.farming.Farmables;
import forestry.farming.FarmRegistry;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
public class FarmLogicVegetable extends FarmLogicCrops {
public FarmLogicVegetable() {
super(Farmables.farmables.get("farmVegetables"));
super(FarmRegistry.getInstance().getFarmables("farmVegetables"));
}
@Override
@@ -10,6 +10,7 @@ import forestry.api.recipes.RecipeManagers;
import forestry.core.config.Constants;
import forestry.core.fluids.Fluids;
import forestry.core.utils.ModUtil;
import forestry.farming.FarmRegistry;
import forestry.farming.logic.CropDestroy;
import forestry.farming.logic.FarmableBase;
import forestry.plugins.BlankForestryPlugin;
@@ -54,7 +55,7 @@ public class PluginImmersiveEngineering extends BlankForestryPlugin {
IBlockState defaultState = hempCrop.getDefaultState();
IBlockState planted = defaultState.withProperty(age, (Comparable) bottom0.get());
IBlockState mature = defaultState.withProperty(age, (Comparable) top0.get());
Farmables.farmables.get("farmWheat").add(new FarmableBase(hempSeed, planted, mature, false) {
FarmRegistry.getInstance().registerFarmables("farmWheat", new FarmableBase(hempSeed, planted, mature, false) {
@Override
public ICrop getCropAt(World world, BlockPos pos, IBlockState blockState) {
IBlockState stateUp = world.getBlockState(pos.up());