diff --git a/src/main/java/forestry/api/farming/IFarmLogic.java b/src/main/java/forestry/api/farming/IFarmLogic.java index 1e3912fe1..d499034ad 100644 --- a/src/main/java/forestry/api/farming/IFarmLogic.java +++ b/src/main/java/forestry/api/farming/IFarmLogic.java @@ -64,7 +64,7 @@ public interface IFarmLogic { } /** - * Use {@link IFarmRegistry#getFarm(String)} to get the soil container for the farm logic and register the soil + * Use {@link IFarmRegistry#getProperties(String)} to get the {@link IFarmProperties} for the farm logic and register the soil * with {@link IFarmProperties#registerSoil(ItemStack, IBlockState, boolean)}. */ @Deprecated @@ -78,7 +78,6 @@ public interface IFarmLogic { String getName(); /* GUI ONLY */ - /** * @deprecated No longer needed because mc always uses the same map for blocks and items. * TODO remove this method in 1.13 diff --git a/src/main/java/forestry/api/farming/IFarmProperties.java b/src/main/java/forestry/api/farming/IFarmProperties.java index 729544653..25c751f06 100644 --- a/src/main/java/forestry/api/farming/IFarmProperties.java +++ b/src/main/java/forestry/api/farming/IFarmProperties.java @@ -10,23 +10,39 @@ import net.minecraft.item.ItemStack; */ public interface IFarmProperties { + /** + * Can be used to register a {@link IBlockState} as a valid soil. + */ default void registerSoil(ItemStack resource, IBlockState soilState){ registerSoil(resource, soilState, false); } - void registerFarmables(String identifier); - + /** + * Can be used to register a {@link IBlockState} as a valid soil. + */ void registerSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData); + /** + * Adds the {@link IFarmable}s that where registered with the given identifier. + */ + void registerFarmables(String identifier); + + /** + * @return true if the given block state is a valid soil state. + */ boolean isAcceptedSoil(IBlockState blockState); + /** + * @return true if the given stack is the {@link ItemStack} of a soil. + */ boolean isAcceptedResource(ItemStack itemStack); - String getIdentifier(); - Collection getSoils(); Collection getFarmables(); + /** + * Returns the instance of the manual or managed {@link IFarmLogic}. + */ IFarmLogic getLogic(boolean manuel); } diff --git a/src/main/java/forestry/api/farming/IFarmRegistry.java b/src/main/java/forestry/api/farming/IFarmRegistry.java index 4f143e7a0..d580b5133 100644 --- a/src/main/java/forestry/api/farming/IFarmRegistry.java +++ b/src/main/java/forestry/api/farming/IFarmRegistry.java @@ -19,7 +19,7 @@ public interface IFarmRegistry { * @param logic corresponding instance of logic * * @deprecated Since Forestry 5.8. Use {@link #registerLogic(String, BiFunction, String...)} or - * {@link #registerLogic(IFarmProperties)}. + * {@link #registerLogic(String, IFarmProperties)}. */ @Deprecated void registerLogic(String identifier, IFarmLogic logic); @@ -28,7 +28,7 @@ public interface IFarmRegistry { * Registers farming logic in registry * @since Forestry 5.8 */ - IFarmProperties registerLogic(IFarmProperties farmInstance); + IFarmProperties registerLogic(String identifier, IFarmProperties farmInstance); /** * Registers farming logic in registry under given identifier @@ -91,13 +91,9 @@ public interface IFarmRegistry { IFarmLogic createCropLogic(IFarmProperties instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic); /** - * - * @param identifier - * @return - * * @since Forestry 5.8 */ @Nullable - IFarmProperties getFarm(String identifier); + IFarmProperties getProperties(String identifier); } diff --git a/src/main/java/forestry/cultivation/tiles/TilePlanter.java b/src/main/java/forestry/cultivation/tiles/TilePlanter.java index a1ebb54d4..2680c0b60 100644 --- a/src/main/java/forestry/cultivation/tiles/TilePlanter.java +++ b/src/main/java/forestry/cultivation/tiles/TilePlanter.java @@ -88,7 +88,7 @@ public abstract class TilePlanter extends TilePowered implements IFarmHousing, I public void setManual(boolean manual) { isManual = manual; - logic = FarmRegistry.getInstance().getFarm(identifier).getLogic(manual); + logic = FarmRegistry.getInstance().getProperties(identifier).getLogic(manual); } protected TilePlanter(String identifier) { diff --git a/src/main/java/forestry/farming/DummyFarmRegistry.java b/src/main/java/forestry/farming/DummyFarmRegistry.java index 7a53acdbf..faf1f6532 100644 --- a/src/main/java/forestry/farming/DummyFarmRegistry.java +++ b/src/main/java/forestry/farming/DummyFarmRegistry.java @@ -33,8 +33,7 @@ public class DummyFarmRegistry implements IFarmRegistry { } @Override - public IFarmProperties registerLogic(IFarmProperties farmInstance) { - //Dummy-Implementation + public IFarmProperties registerLogic(String identifier, IFarmProperties farmInstance) { return null; } @@ -69,7 +68,7 @@ public class DummyFarmRegistry implements IFarmRegistry { @Nullable @Override - public IFarmProperties getFarm(String identifier) { + public IFarmProperties getProperties(String identifier) { //Dummy-Implementation return null; } diff --git a/src/main/java/forestry/farming/FarmRegistry.java b/src/main/java/forestry/farming/FarmRegistry.java index 6b08a7d30..e028d7477 100644 --- a/src/main/java/forestry/farming/FarmRegistry.java +++ b/src/main/java/forestry/farming/FarmRegistry.java @@ -88,23 +88,23 @@ public final class FarmRegistry implements IFarmRegistry { } @Override - public IFarmProperties registerLogic(IFarmProperties farmInstance) { - farmInstances.put(farmInstance.getIdentifier(), farmInstance); + public IFarmProperties registerLogic(String identifier, IFarmProperties farmInstance) { + farmInstances.put(identifier, farmInstance); return farmInstance; } @Override public IFarmProperties registerLogic(String identifier, BiFunction logicFactory, String... farmablesIdentifiers) { - Set fIdentifiers = new HashSet<>(Arrays.asList(farmablesIdentifiers)); - fIdentifiers.add(identifier); - IFarmProperties instance = new FarmProperties(identifier, logicFactory, fIdentifiers); + Set identifiers = new HashSet<>(Arrays.asList(farmablesIdentifiers)); + identifiers.add(identifier); + IFarmProperties instance = new FarmProperties(logicFactory, identifiers); farmInstances.put(identifier, instance); return instance; } @Override @Nullable - public IFarmProperties getFarm(String identifier) { + public IFarmProperties getProperties(String identifier) { return farmInstances.get(identifier); } diff --git a/src/main/java/forestry/farming/logic/FakeFarmProperties.java b/src/main/java/forestry/farming/logic/FakeFarmProperties.java index 056982fbd..6cf8aa652 100644 --- a/src/main/java/forestry/farming/logic/FakeFarmProperties.java +++ b/src/main/java/forestry/farming/logic/FakeFarmProperties.java @@ -36,11 +36,6 @@ public class FakeFarmProperties implements IFarmProperties { return false; } - @Override - public String getIdentifier() { - return "farmFake"; - } - @Override public Collection getSoils() { return Collections.emptySet(); diff --git a/src/main/java/forestry/farming/logic/FarmProperties.java b/src/main/java/forestry/farming/logic/FarmProperties.java index 0c445faa3..71393ed3e 100644 --- a/src/main/java/forestry/farming/logic/FarmProperties.java +++ b/src/main/java/forestry/farming/logic/FarmProperties.java @@ -22,13 +22,11 @@ public final class FarmProperties implements IFarmProperties { private final Set farmablesIdentifiers; private final IFarmLogic manualLogic; private final IFarmLogic managedLogic; - private final String identifier; @Nullable private Collection farmables; - public FarmProperties(String identifier, BiFunction logicFactory, Set farmablesIdentifiers) { - this.identifier = identifier; + public FarmProperties(BiFunction logicFactory, Set farmablesIdentifiers) { this.farmablesIdentifiers = farmablesIdentifiers; this.manualLogic = logicFactory.apply(this, true); this.managedLogic = logicFactory.apply(this, false); @@ -86,9 +84,4 @@ public final class FarmProperties implements IFarmProperties { public Collection getSoils() { return soils; } - - @Override - public String getIdentifier() { - return identifier; - } } diff --git a/src/main/java/forestry/farming/multiblock/FakeFarmController.java b/src/main/java/forestry/farming/multiblock/FakeFarmController.java index 9090f13a1..34fc79620 100644 --- a/src/main/java/forestry/farming/multiblock/FakeFarmController.java +++ b/src/main/java/forestry/farming/multiblock/FakeFarmController.java @@ -87,7 +87,7 @@ public class FakeFarmController extends FakeMultiblockController implements IFar @Override public IFarmLogic getFarmLogic(FarmDirection direction) { - return FarmRegistry.getInstance().getFarm("farmArboreal").getLogic(false); + return FarmRegistry.getInstance().getProperties("farmArboreal").getLogic(false); } @Override diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 57094a766..9ac70d73a 100755 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -630,7 +630,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public void resetFarmLogic(FarmDirection direction) { - setFarmLogic(direction, FarmRegistry.getInstance().getFarm("farmArboreal").getLogic(false)); + setFarmLogic(direction, FarmRegistry.getInstance().getProperties("farmArboreal").getLogic(false)); } @Override diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java index c8847dbf7..f6bd9fc53 100644 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -266,7 +266,7 @@ public class PluginNatura extends BlankForestryModule { */ @Override public void postInit() { - IFarmProperties farmArboreal = FarmRegistry.getInstance().getFarm("managedArboreal"); + IFarmProperties farmArboreal = FarmRegistry.getInstance().getProperties("managedArboreal"); if(farmArboreal != null) { farmArboreal.registerSoil(new ItemStack(Blocks.NETHERRACK), Blocks.NETHERRACK.getDefaultState(), false); }