diff --git a/src/main/java/forestry/api/circuits/ICircuit.java b/src/main/java/forestry/api/circuits/ICircuit.java index 900ab84ef..f3e74fac8 100644 --- a/src/main/java/forestry/api/circuits/ICircuit.java +++ b/src/main/java/forestry/api/circuits/ICircuit.java @@ -7,11 +7,17 @@ package forestry.api.circuits; import java.util.List; +import net.minecraft.util.text.translation.I18n; + public interface ICircuit { String getUID(); String getUnlocalizedName(); + default String getLocalizedName(){ + return I18n.translateToLocal(getUnlocalizedName()); + } + boolean isCircuitable(Object tile); void onInsertion(int slot, Object tile); diff --git a/src/main/java/forestry/api/farming/Farmables.java b/src/main/java/forestry/api/farming/Farmables.java index 3595d5061..4cce3f8f7 100644 --- a/src/main/java/forestry/api/farming/Farmables.java +++ b/src/main/java/forestry/api/farming/Farmables.java @@ -5,14 +5,16 @@ ******************************************************************************/ package forestry.api.farming; -import java.util.LinkedHashMap; -import java.util.Map; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import java.util.LinkedHashMap; +import java.util.Map; + import net.minecraft.item.ItemStack; +//TODO: Remove this class in 1.13 +@Deprecated public class Farmables { /** * Can be used to add IFarmables to some of the vanilla farm logics. diff --git a/src/main/java/forestry/api/farming/IFarmLogic.java b/src/main/java/forestry/api/farming/IFarmLogic.java index d499034ad..7db1e3df5 100644 --- a/src/main/java/forestry/api/farming/IFarmLogic.java +++ b/src/main/java/forestry/api/farming/IFarmLogic.java @@ -20,6 +20,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; +/** + * The IFarmLogic is used by farm blocks and multi-blocks to cultivate and harvest crops and plants. + * + * Every farm block has only ony one logic a multi-block farm has four, one for every direction. + */ public interface IFarmLogic { /** @@ -29,21 +34,72 @@ public interface IFarmLogic { int getFertilizerConsumption(); /** + * @param hydrationModifier A modifier that depends on the weather and the biome of the farm. + * * @return The amount of water that the {@link IFarmHousing} automatically removes after this logic cultivated * a block or harvested a crop. */ int getWaterConsumption(float hydrationModifier); + /** + * Checks if the given stack is a resource or a soil that this logic uses to grow plants on or to create other + * products like peat. + */ boolean isAcceptedResource(ItemStack itemstack); + /** + * Checks if the given stack is a germling (plantable sapling, seed, etc.) for any {@link IFarmable} of this farm. + */ boolean isAcceptedGermling(ItemStack itemstack); + /** + * Collects all items that are laying on the ground and are in the {@link IFarmHousing#getArea()} of the farm. + * + * @param world The world of the farm. + * @param farmHousing The farm that uses this logic. + * + * @return A collection that contains all items that were collected. + */ NonNullList collect(World world, IFarmHousing farmHousing); + /** + * Tries to cultivate one or more blocks at the given position and with the given extent. + * + * @param world The world of the farm. + * @param farmHousing The farm that uses this logic. + * @param pos The position at that the logic should start to cultivate. + * @param direction The direction of the extension. + * @param extent How many blocks this logic has to cultivate after it cultivated the block at the given position. + * The positions of the next blocks are having a offset in the given direction. + * @return True if the logic has cultivated any block. + */ boolean cultivate(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent); + /** + * Tries to harvest one or more blocks at the given position and with the given extent. + * + * @param world The world of the farm. + * @param pos The position at that the logic should start to harvest. + * @param direction The direction of the extension. + * @param extent How many blocks this logic tries to harvest after it has tried to harvested the block at the given position. + * The positions of the next blocks are having a offset in the given direction. + * @return True if the logic has cultivated any block. + */ Collection harvest(World world, BlockPos pos, FarmDirection direction, int extent); + /** + * Returns the {@link IFarmProperties} that created this logic. + * + * @since Forestry 5.8 + * + * @return Returns the {@link IFarmProperties} that created this logic. Returns a fake instance from + * {@link IFarmRegistry#createFakeInstance(IFarmLogic)} if the logic is older that Forestry 5.8. + * TODO: Remove "default" from this method in 1.13 + */ + default IFarmProperties getProperties(){ + return ForestryAPI.farmRegistry.createFakeInstance(this); + } + /** * @deprecated Since Forestry 5.8 logic instances are created at the constructor of the {@link IFarmProperties} and * have a immutable manual state. TODO Remove this method in 1.13 @@ -53,16 +109,6 @@ public interface IFarmLogic { return this; } - /** - * @since Forestry 5.8 - * - * @return Returns the {@link IFarmProperties} that created this logic. Returns a fake instance from - * {@link IFarmRegistry#createFakeInstance(IFarmLogic)} if the logic is older that Forestry 5.8. - */ - default IFarmProperties getInstance(){ - return ForestryAPI.farmRegistry.createFakeInstance(this); - } - /** * 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)}. @@ -72,8 +118,12 @@ public interface IFarmLogic { // } + default String getUnlocalizedName(){ + return ""; + } + /** - * @return A short localized name for this logic. + * @return Localized short, human-readable identifier used in the farm gui and in tooltips. */ String getName(); diff --git a/src/main/java/forestry/api/farming/package-info.java b/src/main/java/forestry/api/farming/package-info.java index d599fba86..8a04a7f93 100644 --- a/src/main/java/forestry/api/farming/package-info.java +++ b/src/main/java/forestry/api/farming/package-info.java @@ -5,10 +5,11 @@ ******************************************************************************/ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -@API(apiVersion = "2.2.0", owner = "ForestryAPI|core", provides = "ForestryAPI|farming") +@API(apiVersion = "5.8.0", owner = "ForestryAPI|core", provides = "ForestryAPI|farming") package forestry.api.farming; import javax.annotation.ParametersAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; + import net.minecraftforge.fml.common.API; diff --git a/src/main/java/forestry/core/circuits/Circuit.java b/src/main/java/forestry/core/circuits/Circuit.java index 88396319b..f1e008ef9 100755 --- a/src/main/java/forestry/core/circuits/Circuit.java +++ b/src/main/java/forestry/core/circuits/Circuit.java @@ -37,7 +37,7 @@ public abstract class Circuit implements ICircuit { @Override public void addTooltip(List list) { - list.add(Translator.translateToLocal(getUnlocalizedName())); + list.add(getLocalizedName()); int i = 1; while (true) { diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index 049346ef6..ca83e5490 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -53,7 +53,7 @@ public class GuiSolderingIron extends GuiForestry { if (recipe == null) { description = "(" + Translator.translateToLocal("for.gui.noeffect") + ")"; } else { - description = Translator.translateToLocal(recipe.getCircuit().getUnlocalizedName()); + description = recipe.getCircuit().getLocalizedName(); } int row = i * 20; diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 1693ff687..303aba09d 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -106,7 +106,7 @@ public class Config { // Cultivation public static int planterExtend = 4; - public static boolean ringFarms = false; + public static boolean ringFarms = true; public static int ringSize = 4; // Mail diff --git a/src/main/java/forestry/cultivation/gui/GuiPlanter.java b/src/main/java/forestry/cultivation/gui/GuiPlanter.java index eadaf7eaa..4f892bede 100644 --- a/src/main/java/forestry/cultivation/gui/GuiPlanter.java +++ b/src/main/java/forestry/cultivation/gui/GuiPlanter.java @@ -2,6 +2,7 @@ package forestry.cultivation.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import forestry.core.ModuleCore; import forestry.core.config.Constants; @@ -21,9 +22,9 @@ public class GuiPlanter extends GuiForestryTitled { this.xSize = 202; this.ySize = 192; - ItemStack[] resourceStacks = tile.createResourceStacks(); - ItemStack[] germlingStacks = tile.createGermlingStacks(); - ItemStack[] productionStacks = tile.createProductionStacks(); + NonNullList resourceStacks = tile.createResourceStacks(); + NonNullList germlingStacks = tile.createGermlingStacks(); + NonNullList productionStacks = tile.createProductionStacks(); widgetManager.add(new TankWidget(widgetManager, 178, 44, 0).setOverlayOrigin(xSize, 18)); @@ -31,8 +32,8 @@ public class GuiPlanter extends GuiForestryTitled { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { int index = j + i * 2; - if(resourceStacks.length == 4) { - widgetManager.add(new GhostItemStackWidget(widgetManager, 11 + j * 18, 65 + i * 18, resourceStacks[index], inventorySlots.getSlot(36 + InventoryPlanter.SLOT_RESOURCES_1 + index))); + if(resourceStacks.size() == 4) { + widgetManager.add(new GhostItemStackWidget(widgetManager, 11 + j * 18, 65 + i * 18, resourceStacks.get(index), inventorySlots.getSlot(36 + InventoryPlanter.SLOT_RESOURCES_1 + index))); } } } @@ -41,8 +42,8 @@ public class GuiPlanter extends GuiForestryTitled { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { int index = j + i * 2; - if(germlingStacks.length == 4){ - widgetManager.add(new GhostItemStackWidget(widgetManager, 71 + j * 18, 65 + i * 18, germlingStacks[index], inventorySlots.getSlot(36 + InventoryPlanter.SLOT_GERMLINGS_1 + index))); + if(germlingStacks.size() == 4){ + widgetManager.add(new GhostItemStackWidget(widgetManager, 71 + j * 18, 65 + i * 18, germlingStacks.get(index), inventorySlots.getSlot(36 + InventoryPlanter.SLOT_GERMLINGS_1 + index))); } } } @@ -51,8 +52,8 @@ public class GuiPlanter extends GuiForestryTitled { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { int index = j + i * 2; - if(productionStacks.length == 4) { - widgetManager.add(new GhostItemStackWidget(widgetManager, 131 + j * 18, 65 + i * 18, productionStacks[index], inventorySlots.getSlot(36 + InventoryPlanter.SLOT_PRODUCTION_1 + j + i * 2))); + if(productionStacks.size() == 4) { + widgetManager.add(new GhostItemStackWidget(widgetManager, 131 + j * 18, 65 + i * 18, productionStacks.get(index), inventorySlots.getSlot(36 + InventoryPlanter.SLOT_PRODUCTION_1 + j + i * 2))); } } } diff --git a/src/main/java/forestry/cultivation/gui/widgets/GhostItemStackWidget.java b/src/main/java/forestry/cultivation/gui/widgets/GhostItemStackWidget.java index 9902a00bc..f52d910b5 100644 --- a/src/main/java/forestry/cultivation/gui/widgets/GhostItemStackWidget.java +++ b/src/main/java/forestry/cultivation/gui/widgets/GhostItemStackWidget.java @@ -5,6 +5,7 @@ import java.util.Locale; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -16,7 +17,6 @@ import forestry.core.gui.widgets.WidgetManager; import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; import forestry.cultivation.inventory.InventoryPlanter; -import org.lwjgl.opengl.GL11; public class GhostItemStackWidget extends ItemStackWidget { private final Slot slot; @@ -30,9 +30,10 @@ public class GhostItemStackWidget extends ItemStackWidget { if (!slot.getHasStack()) { super.draw(startX, startY); } - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.pushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.enableBlend(); String directionString = getDirectionString(); if (!directionString.isEmpty()){ @@ -40,15 +41,16 @@ public class GhostItemStackWidget extends ItemStackWidget { fontRenderer.drawStringWithShadow(getDirectionString(), xPos + startX + 5, yPos + startY + 4, ColourProperties.INSTANCE.get("gui.screen")); } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F); TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); textureManager.bindTexture(manager.gui.textureFile); manager.gui.drawTexturedModalRect(xPos + startX, yPos + startY, 206, 0, 16, 16); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_LIGHTING); + GlStateManager.disableBlend(); + GlStateManager.enableDepth(); + GlStateManager.enableLighting(); + GlStateManager.popMatrix(); } private String getDirectionString(){ diff --git a/src/main/java/forestry/cultivation/tiles/TileArboretum.java b/src/main/java/forestry/cultivation/tiles/TileArboretum.java index 065673270..549e53340 100644 --- a/src/main/java/forestry/cultivation/tiles/TileArboretum.java +++ b/src/main/java/forestry/cultivation/tiles/TileArboretum.java @@ -3,6 +3,7 @@ package forestry.cultivation.tiles; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class TileArboretum extends TilePlanter { public TileArboretum() { @@ -10,32 +11,32 @@ public class TileArboretum extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[]{ + public NonNullList createGermlingStacks() { + return createList( new ItemStack(Blocks.SAPLING), new ItemStack(Blocks.SAPLING, 1, 2), new ItemStack(Blocks.SAPLING, 1, 2), new ItemStack(Blocks.SAPLING) - }; + ); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[]{ + public NonNullList createResourceStacks() { + return createList( new ItemStack(Blocks.DIRT), new ItemStack(Blocks.DIRT), new ItemStack(Blocks.DIRT), new ItemStack(Blocks.DIRT) - }; + ); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[]{ + public NonNullList createProductionStacks() { + return createList( new ItemStack(Blocks.LOG), new ItemStack(Items.APPLE), new ItemStack(Items.APPLE), new ItemStack(Blocks.LOG) - }; + ); } } diff --git a/src/main/java/forestry/cultivation/tiles/TileBog.java b/src/main/java/forestry/cultivation/tiles/TileBog.java index ebcd6815a..12a654363 100644 --- a/src/main/java/forestry/cultivation/tiles/TileBog.java +++ b/src/main/java/forestry/cultivation/tiles/TileBog.java @@ -1,6 +1,7 @@ package forestry.cultivation.tiles; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import forestry.core.ModuleCore; @@ -10,27 +11,27 @@ public class TileBog extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[0]; + public NonNullList createGermlingStacks() { + return NonNullList.create(); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[]{ + public NonNullList createResourceStacks() { + return createList( new ItemStack(ModuleCore.getBlocks().bogEarth), new ItemStack(ModuleCore.getBlocks().bogEarth), new ItemStack(ModuleCore.getBlocks().bogEarth), new ItemStack(ModuleCore.getBlocks().bogEarth) - }; + ); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[]{ + public NonNullList createProductionStacks() { + return createList( new ItemStack(ModuleCore.getItems().peat), new ItemStack(ModuleCore.getItems().peat), new ItemStack(ModuleCore.getItems().peat), new ItemStack(ModuleCore.getItems().peat) - }; + ); } } diff --git a/src/main/java/forestry/cultivation/tiles/TileFarmCrops.java b/src/main/java/forestry/cultivation/tiles/TileFarmCrops.java index 17a1a865b..6ef256889 100644 --- a/src/main/java/forestry/cultivation/tiles/TileFarmCrops.java +++ b/src/main/java/forestry/cultivation/tiles/TileFarmCrops.java @@ -3,6 +3,7 @@ package forestry.cultivation.tiles; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class TileFarmCrops extends TilePlanter { public TileFarmCrops() { @@ -10,32 +11,32 @@ public class TileFarmCrops extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[]{ + public NonNullList createGermlingStacks() { + return createList( new ItemStack(Items.WHEAT_SEEDS), new ItemStack(Items.POTATO), new ItemStack(Items.CARROT), new ItemStack(Items.BEETROOT_SEEDS) - }; + ); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[]{ + public NonNullList createResourceStacks() { + return createList( new ItemStack(Blocks.DIRT), new ItemStack(Blocks.DIRT), new ItemStack(Blocks.DIRT), new ItemStack(Blocks.DIRT) - }; + ); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[]{ + public NonNullList createProductionStacks() { + return createList( new ItemStack(Items.WHEAT), new ItemStack(Items.POTATO), new ItemStack(Items.CARROT), new ItemStack(Items.BEETROOT) - }; + ); } } diff --git a/src/main/java/forestry/cultivation/tiles/TileFarmEnder.java b/src/main/java/forestry/cultivation/tiles/TileFarmEnder.java index 60b65f636..1d6916586 100644 --- a/src/main/java/forestry/cultivation/tiles/TileFarmEnder.java +++ b/src/main/java/forestry/cultivation/tiles/TileFarmEnder.java @@ -3,6 +3,7 @@ package forestry.cultivation.tiles; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class TileFarmEnder extends TilePlanter { public TileFarmEnder() { @@ -10,32 +11,32 @@ public class TileFarmEnder extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[]{ + public NonNullList createGermlingStacks() { + return createList( new ItemStack(Blocks.CHORUS_FLOWER), new ItemStack(Blocks.CHORUS_FLOWER), new ItemStack(Blocks.CHORUS_FLOWER), new ItemStack(Blocks.CHORUS_FLOWER) - }; + ); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[]{ + public NonNullList createResourceStacks() { + return createList( new ItemStack(Blocks.END_STONE), new ItemStack(Blocks.END_STONE), new ItemStack(Blocks.END_STONE), new ItemStack(Blocks.END_STONE) - }; + ); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[]{ + public NonNullList createProductionStacks() { + return createList( new ItemStack(Blocks.CHORUS_FLOWER), new ItemStack(Items.CHORUS_FRUIT), new ItemStack(Items.CHORUS_FRUIT), new ItemStack(Blocks.CHORUS_FLOWER) - }; + ); } } diff --git a/src/main/java/forestry/cultivation/tiles/TileFarmGourd.java b/src/main/java/forestry/cultivation/tiles/TileFarmGourd.java index 19d63f6bb..e99abd04c 100644 --- a/src/main/java/forestry/cultivation/tiles/TileFarmGourd.java +++ b/src/main/java/forestry/cultivation/tiles/TileFarmGourd.java @@ -2,6 +2,7 @@ package forestry.cultivation.tiles; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class TileFarmGourd extends TilePlanter { public TileFarmGourd() { @@ -9,22 +10,22 @@ public class TileFarmGourd extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[0]; + public NonNullList createGermlingStacks() { + return NonNullList.create(); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[0]; + public NonNullList createResourceStacks() { + return NonNullList.create(); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[]{ + public NonNullList createProductionStacks() { + return createList( new ItemStack(Blocks.MELON_BLOCK), new ItemStack(Blocks.PUMPKIN), new ItemStack(Blocks.PUMPKIN), new ItemStack(Blocks.MELON_BLOCK) - }; + ); } } diff --git a/src/main/java/forestry/cultivation/tiles/TileFarmMushroom.java b/src/main/java/forestry/cultivation/tiles/TileFarmMushroom.java index ecb696869..5ae5f36f7 100644 --- a/src/main/java/forestry/cultivation/tiles/TileFarmMushroom.java +++ b/src/main/java/forestry/cultivation/tiles/TileFarmMushroom.java @@ -2,6 +2,7 @@ package forestry.cultivation.tiles; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class TileFarmMushroom extends TilePlanter { public TileFarmMushroom() { @@ -9,32 +10,32 @@ public class TileFarmMushroom extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[]{ + public NonNullList createGermlingStacks() { + return createList( new ItemStack(Blocks.RED_MUSHROOM), new ItemStack(Blocks.BROWN_MUSHROOM), new ItemStack(Blocks.BROWN_MUSHROOM), new ItemStack(Blocks.RED_MUSHROOM) - }; + ); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[]{ + public NonNullList createResourceStacks() { + return createList( new ItemStack(Blocks.MYCELIUM), new ItemStack(Blocks.DIRT, 1, 2), new ItemStack(Blocks.DIRT, 1, 2), new ItemStack(Blocks.MYCELIUM) - }; + ); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[]{ + public NonNullList createProductionStacks() { + return createList( new ItemStack(Blocks.RED_MUSHROOM), new ItemStack(Blocks.BROWN_MUSHROOM), new ItemStack(Blocks.BROWN_MUSHROOM), new ItemStack(Blocks.RED_MUSHROOM) - }; + ); } } diff --git a/src/main/java/forestry/cultivation/tiles/TileFarmNether.java b/src/main/java/forestry/cultivation/tiles/TileFarmNether.java index be6b651a4..be8c5f29c 100644 --- a/src/main/java/forestry/cultivation/tiles/TileFarmNether.java +++ b/src/main/java/forestry/cultivation/tiles/TileFarmNether.java @@ -3,6 +3,7 @@ package forestry.cultivation.tiles; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class TileFarmNether extends TilePlanter { public TileFarmNether() { @@ -10,32 +11,32 @@ public class TileFarmNether extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[]{ + public NonNullList createGermlingStacks() { + return createList( new ItemStack(Items.NETHER_WART), new ItemStack(Items.NETHER_WART), new ItemStack(Items.NETHER_WART), new ItemStack(Items.NETHER_WART) - }; + ); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[]{ + public NonNullList createResourceStacks() { + return createList( new ItemStack(Blocks.SOUL_SAND), new ItemStack(Blocks.SOUL_SAND), new ItemStack(Blocks.SOUL_SAND), new ItemStack(Blocks.SOUL_SAND) - }; + ); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[]{ + public NonNullList createProductionStacks() { + return createList( new ItemStack(Items.NETHER_WART), new ItemStack(Items.NETHER_WART), new ItemStack(Items.NETHER_WART), new ItemStack(Items.NETHER_WART) - }; + ); } } diff --git a/src/main/java/forestry/cultivation/tiles/TilePlantation.java b/src/main/java/forestry/cultivation/tiles/TilePlantation.java index 3e7b7619c..23fb31822 100644 --- a/src/main/java/forestry/cultivation/tiles/TilePlantation.java +++ b/src/main/java/forestry/cultivation/tiles/TilePlantation.java @@ -1,6 +1,7 @@ package forestry.cultivation.tiles; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class TilePlantation extends TilePlanter { @@ -9,17 +10,17 @@ public class TilePlantation extends TilePlanter { } @Override - public ItemStack[] createGermlingStacks() { - return new ItemStack[0]; + public NonNullList createGermlingStacks() { + return NonNullList.create(); } @Override - public ItemStack[] createResourceStacks() { - return new ItemStack[0]; + public NonNullList createResourceStacks() { + return NonNullList.create(); } @Override - public ItemStack[] createProductionStacks() { - return new ItemStack[0]; + public NonNullList createProductionStacks() { + return NonNullList.create(); } } diff --git a/src/main/java/forestry/cultivation/tiles/TilePlanter.java b/src/main/java/forestry/cultivation/tiles/TilePlanter.java index 2680c0b60..6da34f056 100644 --- a/src/main/java/forestry/cultivation/tiles/TilePlanter.java +++ b/src/main/java/forestry/cultivation/tiles/TilePlanter.java @@ -501,10 +501,14 @@ public abstract class TilePlanter extends TilePowered implements IFarmHousing, I return tankManager; } - public abstract ItemStack[] createGermlingStacks(); + protected NonNullList createList(ItemStack... stacks){ + return NonNullList.from(ItemStack.EMPTY, stacks); + } - public abstract ItemStack[] createResourceStacks(); + public abstract NonNullList createGermlingStacks(); - public abstract ItemStack[] createProductionStacks(); + public abstract NonNullList createResourceStacks(); + + public abstract NonNullList createProductionStacks(); } diff --git a/src/main/java/forestry/farming/FarmRegistry.java b/src/main/java/forestry/farming/FarmRegistry.java index e028d7477..1ccd1245c 100644 --- a/src/main/java/forestry/farming/FarmRegistry.java +++ b/src/main/java/forestry/farming/FarmRegistry.java @@ -145,13 +145,13 @@ public final class FarmRegistry implements IFarmRegistry { for(String entry : fertilizerList){ String[] spited = entry.split(";"); if(spited.length < 2){ - Log.error("Foretsry failed to parse a entry of the fertilizer config."); + Log.error("Forestry failed to parse a entry of the fertilizer config."); continue; } String itemName = spited[0]; ItemStack fertilizerItem = ItemStackUtil.parseItemStackString(itemName, OreDictionary.WILDCARD_VALUE); if(fertilizerItem == null || fertilizerItem.isEmpty()){ - Log.error("Foretsry failed to parse a entry of the fertilizer config, because the item doesn't exists."); + Log.error("Forestry failed to parse a entry of the fertilizer config, because the item doesn't exists."); continue; } String value = spited[1]; diff --git a/src/main/java/forestry/farming/ModuleFarming.java b/src/main/java/forestry/farming/ModuleFarming.java index 66e661017..e913ed20f 100644 --- a/src/main/java/forestry/farming/ModuleFarming.java +++ b/src/main/java/forestry/farming/ModuleFarming.java @@ -246,7 +246,7 @@ public class ModuleFarming extends BlankForestryModule { Circuits.farmCocoaManual = new CircuitFarmLogic("manualCocoa", cocoaFarm, true); Circuits.farmEnderManaged = new CircuitFarmLogic("managedEnder", enderFarm, false); - Circuits.farmEnderManual = new CircuitFarmLogic("manualEnder", enderFarm, false); + Circuits.farmEnderManual = new CircuitFarmLogic("manualEnder", enderFarm, true); enderFarm.registerSoil(new ItemStack(Blocks.END_STONE), Blocks.END_STONE.getDefaultState()); } diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index b27f090c1..fa381ee90 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -33,6 +33,16 @@ public class CircuitFarmLogic extends Circuit { this.logic = logic; } + @Override + public String getUnlocalizedName() { + return logic.getUnlocalizedName(); + } + + @Override + public String getLocalizedName() { + return logic.getName(); + } + /** * @deprecated TODO: Remove this method in 1.13 */ diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index 62a4b4581..0ee747f3b 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -35,6 +35,7 @@ import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmProperties; import forestry.api.farming.IFarmable; import forestry.api.farming.ISoil; +import forestry.core.utils.Translator; import forestry.core.utils.VectUtil; public abstract class FarmLogic implements IFarmLogic { @@ -55,6 +56,12 @@ public abstract class FarmLogic implements IFarmLogic { return properties.getSoils(); } + @Override + public String getName() { + String unformatted = isManual ? "for.farm.grammar.manual" : "for.farm.grammar.managed"; + return Translator.translateToLocalFormatted(unformatted, Translator.translateToLocal(getUnlocalizedName())); + } + @Override public FarmLogic setManual(boolean flag) { return this; diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index 0e363786c..768c061ef 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -52,8 +52,8 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { } @Override - public String getName() { - return "Managed Arboretum"; + public String getUnlocalizedName() { + return "for.farm.arboretum"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index ccb549774..64d5c10ea 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -51,8 +51,8 @@ public class FarmLogicCocoa extends FarmLogic { } @Override - public String getName() { - return "Cocoa Plantation"; + public String getUnlocalizedName() { + return "for.farm.cocoa"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicCrops.java b/src/main/java/forestry/farming/logic/FarmLogicCrops.java index 9160a142e..3e57ab87d 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCrops.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCrops.java @@ -90,12 +90,7 @@ public class FarmLogicCrops extends FarmLogicWatered { } @Override - public String getName() { - if (isManual) { - return "Manual Crop Farm"; - } else { - return "Managed Crop Farm"; - } + public String getUnlocalizedName() { + return "for.farm.crops"; } - } diff --git a/src/main/java/forestry/farming/logic/FarmLogicEnder.java b/src/main/java/forestry/farming/logic/FarmLogicEnder.java index e590c7c15..28968daf4 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicEnder.java +++ b/src/main/java/forestry/farming/logic/FarmLogicEnder.java @@ -37,8 +37,8 @@ public class FarmLogicEnder extends FarmLogicHomogeneous { } @Override - public String getName() { - return "Manual Ender Farm"; + public String getUnlocalizedName() { + return "for.farm.ender"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 3f5638630..6349294c6 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -32,8 +32,8 @@ public class FarmLogicGourd extends FarmLogic { } @Override - public String getName() { - return "Gourd Farm"; + public String getUnlocalizedName() { + return "for.farm.gourd"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java index 6228fd024..186e911be 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java @@ -34,8 +34,8 @@ public class FarmLogicInfernal extends FarmLogicHomogeneous { } @Override - public String getName() { - return "Managed Infernal Farm"; + public String getUnlocalizedName() { + return "for.farm.infernal"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicMushroom.java b/src/main/java/forestry/farming/logic/FarmLogicMushroom.java index 6945b21ec..ee63c5dde 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicMushroom.java +++ b/src/main/java/forestry/farming/logic/FarmLogicMushroom.java @@ -23,14 +23,9 @@ public class FarmLogicMushroom extends FarmLogicArboreal { public FarmLogicMushroom(IFarmProperties properties, boolean isManual) { super(properties, isManual); } - @Override - public String getName() { - if (isManual) { - return "Manual Shroom Farm"; - } else { - return "Managed Shroom Farm"; - } + public String getUnlocalizedName() { + return "for.farm.shroom"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index 6303fbbd6..d81a2585f 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -126,8 +126,8 @@ public class FarmLogicOrchard extends FarmLogic { } @Override - public String getName() { - return "Orchard"; + public String getUnlocalizedName() { + return "for.farm.orchard"; } private Collection getHarvestBlocks(World world, BlockPos position) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index 19565518f..53974db9a 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -37,12 +37,8 @@ public class FarmLogicPeat extends FarmLogicWatered { } @Override - public String getName() { - if (isManual) { - return "Manual Peat Bog"; - } else { - return "Managed Peat Bog"; - } + public String getUnlocalizedName() { + return "for.farm.peat"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicRedOrchid.java b/src/main/java/forestry/farming/logic/FarmLogicRedOrchid.java index 3d83cb94b..1db5bec0c 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicRedOrchid.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRedOrchid.java @@ -29,11 +29,8 @@ public class FarmLogicRedOrchid extends FarmLogicHomogeneous { } @Override - public String getName() { - if (isManual) { - return "Manual Orchid Farm"; - } - return "Managed Orchid Farm"; + public String getUnlocalizedName() { + return "for.farm.orchid"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicReeds.java b/src/main/java/forestry/farming/logic/FarmLogicReeds.java index 4ddd5e6c3..7d87e7ce7 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicReeds.java +++ b/src/main/java/forestry/farming/logic/FarmLogicReeds.java @@ -31,12 +31,8 @@ public class FarmLogicReeds extends FarmLogicSoil { } @Override - public String getName() { - if (isManual) { - return "Manual Reed Farm"; - } else { - return "Managed Reed Farm"; - } + public String getUnlocalizedName() { + return "for.farm.reed"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index 6a220ffd2..efedb5fc9 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -49,8 +49,8 @@ public class FarmLogicRubber extends FarmLogic { } @Override - public String getName() { - return "Rubber Plantation"; + public String getUnlocalizedName() { + return "for.farm.rubber"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index c865ddaf4..a394b98b1 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -33,12 +33,8 @@ public class FarmLogicSucculent extends FarmLogicSoil { } @Override - public String getName() { - if (isManual) { - return "Manual Succulent Farm"; - } else { - return "Managed Succulent Farm"; - } + public String getUnlocalizedName() { + return "for.farm.succulent"; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmProperties.java b/src/main/java/forestry/farming/logic/FarmProperties.java index 71393ed3e..f83d02774 100644 --- a/src/main/java/forestry/farming/logic/FarmProperties.java +++ b/src/main/java/forestry/farming/logic/FarmProperties.java @@ -40,7 +40,10 @@ public final class FarmProperties implements IFarmProperties { @Override public Collection getFarmables() { if (farmables == null) { - farmables = farmablesIdentifiers.stream().map(FarmRegistry.getInstance()::getFarmables).flatMap(Collection::stream).collect(Collectors.toSet()); + farmables = farmablesIdentifiers.stream() + .map(FarmRegistry.getInstance()::getFarmables) + .flatMap(Collection::stream) + .collect(Collectors.toSet()); } return farmables; } @@ -55,6 +58,7 @@ public final class FarmProperties implements IFarmProperties { soils.add(new Soil(resource, soilState, hasMetaData)); } + @Override public boolean isAcceptedSoil(IBlockState ground) { for (ISoil soil : soils) { IBlockState soilState = soil.getSoilState(); diff --git a/src/main/java/forestry/plugins/PluginExtraUtilities.java b/src/main/java/forestry/plugins/PluginExtraUtilities.java index 83405f1d5..78d5f6ac2 100644 --- a/src/main/java/forestry/plugins/PluginExtraUtilities.java +++ b/src/main/java/forestry/plugins/PluginExtraUtilities.java @@ -64,6 +64,7 @@ public class PluginExtraUtilities extends CompatPlugin { orchidFarm.registerSoil(new ItemStack(Blocks.LIT_REDSTONE_ORE), Blocks.LIT_REDSTONE_ORE.getDefaultState()); Circuits.farmOrchidManaged = new CircuitFarmLogic("managedOrchid", orchidFarm, false); + Circuits.farmOrchidManual = new CircuitFarmLogic("manualOrchid", orchidFarm, true); orchidStack = new ItemStack(item); } @@ -83,10 +84,12 @@ public class PluginExtraUtilities extends CompatPlugin { public void registerRecipes() { if(Circuits.farmOrchidManaged != null) { ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"); - if(layoutManaged == null){ + ICircuitLayout layoutManual = ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual"); + if(layoutManaged == null || layoutManual == null){ return; } ChipsetManager.solderManager.addRecipe(layoutManaged, ModuleCore.getItems().tubes.get(EnumElectronTube.ORCHID, 1), Circuits.farmOrchidManaged); + ChipsetManager.solderManager.addRecipe(layoutManual, ModuleCore.getItems().tubes.get(EnumElectronTube.ORCHID, 1), Circuits.farmOrchidManual); } }