From 7e267feec7ca3225339f0923783d5a6c4200735d Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 4 May 2014 16:02:42 +0800 Subject: [PATCH] Refactored farm into the proper package. --- src/main/java/crazypants/enderio/ClientProxy.java | 4 ++-- src/main/java/crazypants/enderio/EnderIO.java | 2 +- .../enderio/{ => machine}/farm/BlockFarmStation.java | 2 +- .../enderio/{ => machine}/farm/FarmStationContainer.java | 2 +- .../crazypants/enderio/{ => machine}/farm/FarmersComune.java | 2 +- .../enderio/{ => machine}/farm/FarmingStationRenderer.java | 2 +- .../crazypants/enderio/{ => machine}/farm/GuiFarmStation.java | 2 +- .../crazypants/enderio/{ => machine}/farm/HarvestResult.java | 2 +- .../crazypants/enderio/{ => machine}/farm/IFarmerJoe.java | 2 +- .../crazypants/enderio/{ => machine}/farm/IHarvestResult.java | 2 +- .../enderio/{ => machine}/farm/NetherWartFarmer.java | 2 +- .../enderio/{ => machine}/farm/PacketFarmAction.java | 2 +- .../crazypants/enderio/{ => machine}/farm/SeedFarmer.java | 2 +- .../crazypants/enderio/{ => machine}/farm/StemFarmer.java | 2 +- .../enderio/{ => machine}/farm/TileFarmStation.java | 2 +- .../crazypants/enderio/{ => machine}/farm/TreeFarmer.java | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename src/main/java/crazypants/enderio/{ => machine}/farm/BlockFarmStation.java (98%) rename src/main/java/crazypants/enderio/{ => machine}/farm/FarmStationContainer.java (97%) rename src/main/java/crazypants/enderio/{ => machine}/farm/FarmersComune.java (98%) rename src/main/java/crazypants/enderio/{ => machine}/farm/FarmingStationRenderer.java (98%) rename src/main/java/crazypants/enderio/{ => machine}/farm/GuiFarmStation.java (95%) rename src/main/java/crazypants/enderio/{ => machine}/farm/HarvestResult.java (95%) rename src/main/java/crazypants/enderio/{ => machine}/farm/IFarmerJoe.java (91%) rename src/main/java/crazypants/enderio/{ => machine}/farm/IHarvestResult.java (84%) rename src/main/java/crazypants/enderio/{ => machine}/farm/NetherWartFarmer.java (95%) rename src/main/java/crazypants/enderio/{ => machine}/farm/PacketFarmAction.java (97%) rename src/main/java/crazypants/enderio/{ => machine}/farm/SeedFarmer.java (99%) rename src/main/java/crazypants/enderio/{ => machine}/farm/StemFarmer.java (98%) rename src/main/java/crazypants/enderio/{ => machine}/farm/TileFarmStation.java (99%) rename src/main/java/crazypants/enderio/{ => machine}/farm/TreeFarmer.java (98%) diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 3168655d..3c795421 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -36,14 +36,14 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.enderio.conduit.render.ItemConduitRenderer; import crazypants.enderio.enderface.EnderIoRenderer; import crazypants.enderio.enderface.TileEnderIO; -import crazypants.enderio.farm.BlockFarmStation; -import crazypants.enderio.farm.FarmingStationRenderer; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; import crazypants.enderio.item.darksteel.PoweredItemRenderer; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineRenderer; +import crazypants.enderio.machine.farm.BlockFarmStation; +import crazypants.enderio.machine.farm.FarmingStationRenderer; import crazypants.enderio.machine.generator.BlockCombustionGenerator; import crazypants.enderio.machine.generator.CombustionGeneratorRenderer; import crazypants.enderio.machine.generator.TileCombustionGenerator; diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index f6a517e2..cddfd35a 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -33,7 +33,6 @@ import crazypants.enderio.conduit.redstone.ItemRedstoneConduit; import crazypants.enderio.enderface.BlockEnderIO; import crazypants.enderio.enderface.EnderfaceRecipes; import crazypants.enderio.enderface.ItemEnderface; -import crazypants.enderio.farm.BlockFarmStation; import crazypants.enderio.fluid.BlockFluidEio; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.fluid.ItemBucketEio; @@ -48,6 +47,7 @@ import crazypants.enderio.machine.alloy.AlloyRecipeManager; import crazypants.enderio.machine.alloy.BlockAlloySmelter; import crazypants.enderio.machine.crusher.BlockCrusher; import crazypants.enderio.machine.crusher.CrusherRecipeManager; +import crazypants.enderio.machine.farm.BlockFarmStation; import crazypants.enderio.machine.generator.BlockCombustionGenerator; import crazypants.enderio.machine.generator.BlockStirlingGenerator; import crazypants.enderio.machine.hypercube.BlockHyperCube; diff --git a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java similarity index 98% rename from src/main/java/crazypants/enderio/farm/BlockFarmStation.java rename to src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java index a39a7cdc..5a352d8e 100644 --- a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.Random; diff --git a/src/main/java/crazypants/enderio/farm/FarmStationContainer.java b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java similarity index 97% rename from src/main/java/crazypants/enderio/farm/FarmStationContainer.java rename to src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java index 692fe928..0325126a 100644 --- a/src/main/java/crazypants/enderio/farm/FarmStationContainer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.awt.Point; diff --git a/src/main/java/crazypants/enderio/farm/FarmersComune.java b/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java similarity index 98% rename from src/main/java/crazypants/enderio/farm/FarmersComune.java rename to src/main/java/crazypants/enderio/machine/farm/FarmersComune.java index ddf829cf..668d3b3c 100644 --- a/src/main/java/crazypants/enderio/farm/FarmersComune.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java similarity index 98% rename from src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java rename to src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java index 2edd6b2a..c7608e85 100644 --- a/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/crazypants/enderio/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java similarity index 95% rename from src/main/java/crazypants/enderio/farm/GuiFarmStation.java rename to src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index c1968dc8..36c5e95b 100644 --- a/src/main/java/crazypants/enderio/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/crazypants/enderio/farm/HarvestResult.java b/src/main/java/crazypants/enderio/machine/farm/HarvestResult.java similarity index 95% rename from src/main/java/crazypants/enderio/farm/HarvestResult.java rename to src/main/java/crazypants/enderio/machine/farm/HarvestResult.java index 85b399a1..b4a411a8 100644 --- a/src/main/java/crazypants/enderio/farm/HarvestResult.java +++ b/src/main/java/crazypants/enderio/machine/farm/HarvestResult.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/crazypants/enderio/farm/IFarmerJoe.java b/src/main/java/crazypants/enderio/machine/farm/IFarmerJoe.java similarity index 91% rename from src/main/java/crazypants/enderio/farm/IFarmerJoe.java rename to src/main/java/crazypants/enderio/machine/farm/IFarmerJoe.java index 4ac5372a..29eeee88 100644 --- a/src/main/java/crazypants/enderio/farm/IFarmerJoe.java +++ b/src/main/java/crazypants/enderio/machine/farm/IFarmerJoe.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import net.minecraft.block.Block; diff --git a/src/main/java/crazypants/enderio/farm/IHarvestResult.java b/src/main/java/crazypants/enderio/machine/farm/IHarvestResult.java similarity index 84% rename from src/main/java/crazypants/enderio/farm/IHarvestResult.java rename to src/main/java/crazypants/enderio/machine/farm/IHarvestResult.java index 6040abc5..f801e4fe 100644 --- a/src/main/java/crazypants/enderio/farm/IHarvestResult.java +++ b/src/main/java/crazypants/enderio/machine/farm/IHarvestResult.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.List; diff --git a/src/main/java/crazypants/enderio/farm/NetherWartFarmer.java b/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java similarity index 95% rename from src/main/java/crazypants/enderio/farm/NetherWartFarmer.java rename to src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java index e43e3979..29d80716 100644 --- a/src/main/java/crazypants/enderio/farm/NetherWartFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/crazypants/enderio/farm/PacketFarmAction.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java similarity index 97% rename from src/main/java/crazypants/enderio/farm/PacketFarmAction.java rename to src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java index cb15d36c..2db9f53b 100644 --- a/src/main/java/crazypants/enderio/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/crazypants/enderio/farm/SeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java similarity index 99% rename from src/main/java/crazypants/enderio/farm/SeedFarmer.java rename to src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java index dfdca814..1d6d7fcb 100644 --- a/src/main/java/crazypants/enderio/farm/SeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/crazypants/enderio/farm/StemFarmer.java b/src/main/java/crazypants/enderio/machine/farm/StemFarmer.java similarity index 98% rename from src/main/java/crazypants/enderio/farm/StemFarmer.java rename to src/main/java/crazypants/enderio/machine/farm/StemFarmer.java index ddce0f38..5ecb6c8f 100644 --- a/src/main/java/crazypants/enderio/farm/StemFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/StemFarmer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.ArrayList; diff --git a/src/main/java/crazypants/enderio/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java similarity index 99% rename from src/main/java/crazypants/enderio/farm/TileFarmStation.java rename to src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index aa4ea4b9..e9049b0f 100644 --- a/src/main/java/crazypants/enderio/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.List; diff --git a/src/main/java/crazypants/enderio/farm/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java similarity index 98% rename from src/main/java/crazypants/enderio/farm/TreeFarmer.java rename to src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java index 0946111a..6390365f 100644 --- a/src/main/java/crazypants/enderio/farm/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.farm; +package crazypants.enderio.machine.farm; import java.util.ArrayList;