From 81ef5d536fa854d7082d342dd815cbbcb78da1bf Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 6 Apr 2017 01:11:27 +0200 Subject: [PATCH] Add missing changes --- src/main/java/forestry/api/farming/ISimpleFarmLogic.java | 5 +++++ src/main/java/forestry/farming/FarmRegistry.java | 2 +- src/main/java/forestry/farming/logic/FarmLogicCereal.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicEnder.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicGourd.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicInfernal.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicMushroom.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicOrchard.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicReeds.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicSucculent.java | 4 ++-- src/main/java/forestry/farming/logic/FarmLogicVegetable.java | 4 ++-- .../forestry/plugins/compat/PluginImmersiveEngineering.java | 3 ++- 12 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/main/java/forestry/api/farming/ISimpleFarmLogic.java b/src/main/java/forestry/api/farming/ISimpleFarmLogic.java index 10fef9191..71728b3a8 100644 --- a/src/main/java/forestry/api/farming/ISimpleFarmLogic.java +++ b/src/main/java/forestry/api/farming/ISimpleFarmLogic.java @@ -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; diff --git a/src/main/java/forestry/farming/FarmRegistry.java b/src/main/java/forestry/farming/FarmRegistry.java index 28b2d4faa..2379567cd 100644 --- a/src/main/java/forestry/farming/FarmRegistry.java +++ b/src/main/java/forestry/farming/FarmRegistry.java @@ -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 { diff --git a/src/main/java/forestry/farming/logic/FarmLogicCereal.java b/src/main/java/forestry/farming/logic/FarmLogicCereal.java index 4f2828766..fa0192959 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCereal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCereal.java @@ -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 diff --git a/src/main/java/forestry/farming/logic/FarmLogicEnder.java b/src/main/java/forestry/farming/logic/FarmLogicEnder.java index 9ee78ce81..eb082e021 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicEnder.java +++ b/src/main/java/forestry/farming/logic/FarmLogicEnder.java @@ -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 diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 6fd5dadb6..444756809 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -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 farmables = Farmables.farmables.get("farmGourd"); + Collection farmables = FarmRegistry.getInstance().getFarmables("farmGourd"); seeds = farmables.toArray(new IFarmable[farmables.size()]); } diff --git a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java index 548fbf6bf..d8cd6780e 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java @@ -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 diff --git a/src/main/java/forestry/farming/logic/FarmLogicMushroom.java b/src/main/java/forestry/farming/logic/FarmLogicMushroom.java index 39d7043d4..c2aad0803 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicMushroom.java +++ b/src/main/java/forestry/farming/logic/FarmLogicMushroom.java @@ -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); } diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index b6a34a2de..403666627 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -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 traversalBlocks; public FarmLogicOrchard() { - this.farmables = Farmables.farmables.get("farmOrchard"); + this.farmables = FarmRegistry.getInstance().getFarmables("farmOrchard"); ImmutableList.Builder traversalBlocksBuilder = ImmutableList.builder(); // if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.AGRICRAFT) || ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT)) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicReeds.java b/src/main/java/forestry/farming/logic/FarmLogicReeds.java index c1d74983d..9d20c2d77 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicReeds.java +++ b/src/main/java/forestry/farming/logic/FarmLogicReeds.java @@ -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 germlings = Farmables.farmables.get("farmPoales"); + private final Collection germlings = FarmRegistry.getInstance().getFarmables("farmPoales"); @Override public ItemStack getIconItemStack() { diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index bc1fd87c1..c7c9f484a 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -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 germlings = Farmables.farmables.get("farmSucculentes"); + private final Collection germlings = FarmRegistry.getInstance().getFarmables("farmSucculentes"); @Override public ItemStack getIconItemStack() { diff --git a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java index a655f7ba1..a33689bc4 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java +++ b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java @@ -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 diff --git a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java index 97c7c03e6..7b3ce4de8 100644 --- a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java +++ b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java @@ -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());