diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 0417e5050..15bd4c5cf 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -38,14 +38,14 @@ import forestry.api.fuels.GeneratorFuel; import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.core.ForestryCore; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.config.Version; import forestry.core.network.PacketHandler; -import forestry.core.proxy.Proxies; -import forestry.core.utils.FluidMap; -import forestry.core.utils.ItemStackMap; +import forestry.core.utils.Log; import forestry.core.utils.StringUtil; +import forestry.core.utils.datastructures.FluidMap; +import forestry.core.utils.datastructures.ItemStackMap; /** * Forestry Minecraft Mod @@ -53,7 +53,7 @@ import forestry.core.utils.StringUtil; * @author SirSengir */ @Mod( - modid = Defaults.MOD, + modid = Constants.MOD, name = "Forestry", version = Version.VERSION, guiFactory = "forestry.core.config.ForestryGuiConfigFactory", @@ -66,7 +66,7 @@ import forestry.core.utils.StringUtil; + "after:HardcoreEnderExpansion;") public class Forestry { - @Mod.Instance(Defaults.MOD) + @Mod.Instance(Constants.MOD) public static Forestry instance; private File configFolder; @@ -128,7 +128,7 @@ public class Forestry { } /*@EventHandler public void fingerprintWarning(FMLFingerprintViolationEvent event) { - Proxies.log.info("Fingerprint of the mod jar is invalid. The jar file was tampered with."); + Log.info("Fingerprint of the mod jar is invalid. The jar file was tampered with."); FMLInterModComms.sendMessage("Railcraft", "securityViolation", "Fingerprint of jar file did not match."); FMLInterModComms.sendMessage("Thaumcraft", "securityViolation", "Fingerprint of jar file did not match."); FMLInterModComms.sendMessage("IC2", "securityViolation", "Fingerprint of jar file did not match."); @@ -143,21 +143,21 @@ public class Forestry { public void missingMapping(FMLMissingMappingsEvent event) { for (MissingMapping mapping : event.get()) { if (mapping.type == Type.BLOCK) { - Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name)); + Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name)); if (block != null) { mapping.remap(block); - Proxies.log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block)); + Log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block)); } } else { - Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name)); + Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name)); if (block != null) { mapping.remap(Item.getItemFromBlock(block)); - Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block)); + Log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block)); } else { ForestryItem mappedItem = mappedItems.get(mapping.name); if (mappedItem != null) { mapping.remap(mappedItem.item()); - Proxies.log.warning("Remapping item " + mapping.name + " to " + mappedItem.name()); + Log.warning("Remapping item " + mapping.name + " to " + mappedItem.name()); } } } diff --git a/src/main/java/forestry/apiculture/ArmorApiaristHelper.java b/src/main/java/forestry/apiculture/ArmorApiaristHelper.java index 96bc55d16..0a83f1cbf 100644 --- a/src/main/java/forestry/apiculture/ArmorApiaristHelper.java +++ b/src/main/java/forestry/apiculture/ArmorApiaristHelper.java @@ -21,7 +21,7 @@ public class ArmorApiaristHelper implements IArmorApiaristHelper { @Override public boolean isArmorApiarist(ItemStack stack, EntityPlayer player, String cause, boolean doProtect) { - if(stack == null) { + if (stack == null) { return false; } diff --git a/src/main/java/forestry/apiculture/BeeHousingInventory.java b/src/main/java/forestry/apiculture/BeeHousingInventory.java index fd671977b..0ffe54fde 100644 --- a/src/main/java/forestry/apiculture/BeeHousingInventory.java +++ b/src/main/java/forestry/apiculture/BeeHousingInventory.java @@ -15,10 +15,10 @@ import net.minecraft.item.ItemStack; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBeeHousingInventory; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.inventory.InvTools; +import forestry.core.access.IAccessHandler; import forestry.core.inventory.InventoryAdapterRestricted; -import forestry.core.utils.Utils; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.SlotUtil; public class BeeHousingInventory extends InventoryAdapterRestricted implements IBeeHousingInventory { public static final int SLOT_QUEEN = 0; @@ -47,7 +47,7 @@ public class BeeHousingInventory extends InventoryAdapterRestricted implements I if (!super.canExtractItem(slotIndex, itemstack, side)) { return false; } - return Utils.isIndexInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT); } @Override @@ -72,7 +72,7 @@ public class BeeHousingInventory extends InventoryAdapterRestricted implements I @Override public final boolean addProduct(ItemStack product, boolean all) { - return InvTools.tryAddStack(this, product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true); + return InventoryUtil.tryAddStack(this, product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true); } } diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index e8c97338c..0bac0512c 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -36,18 +36,19 @@ import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; import forestry.apiculture.network.PacketBeekeepingLogicActive; -import forestry.core.EnumErrorCode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.errors.EnumErrorCode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; import forestry.plugins.PluginApiculture; public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { - private static final int totalBreedingTime = Defaults.APIARY_BREEDING_TIME; + private static final int totalBreedingTime = Constants.APIARY_BREEDING_TIME; private final IBeeHousing housing; private final IBeeModifier beeModifier; @@ -351,7 +352,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { beeInventory.getQueen().stackSize = 0; beeInventory.setQueen(null); } else { - Proxies.log.warning("Tried to spawn offspring off an unmated queen. Devolving her to a princess."); + Log.warning("Tried to spawn offspring off an unmated queen. Devolving her to a princess."); ItemStack convert = ForestryItem.beePrincessGE.getItemStack(); NBTTagCompound nbttagcompound = new NBTTagCompound(); diff --git a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java index ecaac7826..867a0eb0f 100755 --- a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java @@ -15,8 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; -import forestry.apiculture.gadgets.TileApiary; -import forestry.apiculture.gadgets.TileBeehouse; import forestry.apiculture.genetics.BeeHelper; import forestry.apiculture.gui.ContainerAlveary; import forestry.apiculture.gui.ContainerAlvearyHygroregulator; @@ -40,6 +38,8 @@ import forestry.apiculture.multiblock.TileAlvearyHygroregulator; import forestry.apiculture.multiblock.TileAlvearyPlain; import forestry.apiculture.multiblock.TileAlvearySieve; import forestry.apiculture.multiblock.TileAlvearySwarmer; +import forestry.apiculture.tiles.TileApiary; +import forestry.apiculture.tiles.TileBeeHouse; import forestry.core.GuiHandlerBase; import forestry.core.gui.ContainerAlyzer; import forestry.core.network.GuiId; @@ -82,7 +82,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase { return new GuiBeealyzer(player, new BeealyzerInventory(player, equipped)); case BeehouseGUI: - return new GuiBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeehouse.class)); + return new GuiBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeeHouse.class)); case HabitatLocatorGUI: equipped = player.getCurrentEquippedItem(); @@ -148,7 +148,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase { case BeehouseGUI: synchApiaristTracker(world, player); - return new ContainerBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeehouse.class), false); + return new ContainerBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeeHouse.class), false); case HabitatLocatorGUI: equipped = player.getCurrentEquippedItem(); diff --git a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java index 480fbf128..f5a9a06dd 100755 --- a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java @@ -13,7 +13,7 @@ package forestry.apiculture; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; -import forestry.core.interfaces.ISaveEventHandler; +import forestry.core.ISaveEventHandler; public class SaveEventHandlerApiculture implements ISaveEventHandler { diff --git a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java index a15316c21..b24b50d23 100755 --- a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java @@ -30,10 +30,10 @@ import forestry.api.apiculture.EnumBeeType; import forestry.apiculture.genetics.BeeDefinition; import forestry.apiculture.items.ItemHoneycomb; import forestry.apiculture.worldgen.ComponentVillageBeeHouse; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; public class VillageHandlerApiculture implements IVillageCreationHandler, IVillageTradeHandler { @@ -41,18 +41,18 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla try { MapGenStructureIO.func_143031_a(ComponentVillageBeeHouse.class, "Forestry:BeeHouse"); } catch (Throwable e) { - Proxies.log.severe("Failed to register village beehouse."); + Log.severe("Failed to register village beehouse."); } } @SuppressWarnings("unchecked") @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { - recipeList.add(new MerchantRecipe(ForestryItem.beePrincessGE.getItemStack(1, Defaults.WILDCARD), new ItemStack(Items.emerald, 1))); + recipeList.add(new MerchantRecipe(ForestryItem.beePrincessGE.getItemStack(1, Constants.WILDCARD), new ItemStack(Items.emerald, 1))); recipeList.add(new MerchantRecipe(new ItemStack(Items.wheat, 2), ItemHoneycomb.getRandomComb(1, random, false))); - recipeList.add(new MerchantRecipe(new ItemStack(Blocks.log, 24, Defaults.WILDCARD), ForestryBlock.apiculture.getItemStack(1, Defaults.DEFINITION_APIARY_META))); + recipeList.add(new MerchantRecipe(new ItemStack(Blocks.log, 24, Constants.WILDCARD), ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_APIARY_META))); recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1), ForestryItem.frameProven.getItemStack(6))); - recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), ForestryItem.beePrincessGE.getItemStack(1, Defaults.WILDCARD), BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), ForestryItem.beePrincessGE.getItemStack(1, Constants.WILDCARD), BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE))); } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/forestry/apiculture/gadgets/BlockAlveary.java rename to src/main/java/forestry/apiculture/blocks/BlockAlveary.java index 62d1b2014..1263b163c --- a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.blocks; import java.util.ArrayList; import java.util.List; @@ -36,7 +36,7 @@ import forestry.apiculture.multiblock.TileAlvearyPlain; import forestry.apiculture.multiblock.TileAlvearySieve; import forestry.apiculture.multiblock.TileAlvearyStabiliser; import forestry.apiculture.multiblock.TileAlvearySwarmer; -import forestry.core.gadgets.BlockStructure; +import forestry.core.blocks.BlockStructure; import forestry.core.multiblock.MultiblockRegistry; import forestry.core.render.TextureManager; diff --git a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/apiculture/gadgets/BlockBeehives.java rename to src/main/java/forestry/apiculture/blocks/BlockBeehives.java index 9630b1ead..f47bd10fd --- a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.blocks; import java.util.ArrayList; import java.util.Collections; @@ -32,11 +32,12 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.IHiveDrop; import forestry.api.core.Tabs; import forestry.apiculture.MaterialBeehive; +import forestry.apiculture.tiles.TileSwarm; import forestry.apiculture.worldgen.HiveRegistry; import forestry.core.config.Config; -import forestry.core.inventory.InvTools; import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginApiculture; public class BlockBeehives extends BlockContainer { @@ -68,9 +69,9 @@ public class BlockBeehives extends BlockContainer { if (tile instanceof TileSwarm) { TileSwarm swarm = (TileSwarm) tile; if (swarm.containsBees()) { - for (ItemStack beeStack : InvTools.getStacks(swarm.contained)) { + for (ItemStack beeStack : InventoryUtil.getStacks(swarm.contained)) { if (beeStack != null) { - StackUtils.dropItemStackAsEntity(beeStack, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(beeStack, world, x, y, z); } } } diff --git a/src/main/java/forestry/apiculture/gadgets/BlockCandle.java b/src/main/java/forestry/apiculture/blocks/BlockCandle.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/apiculture/gadgets/BlockCandle.java rename to src/main/java/forestry/apiculture/blocks/BlockCandle.java index 61231456d..0d0306522 --- a/src/main/java/forestry/apiculture/gadgets/BlockCandle.java +++ b/src/main/java/forestry/apiculture/blocks/BlockCandle.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.blocks; import com.google.common.collect.ImmutableMap; @@ -43,9 +43,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import forestry.apiculture.tiles.TileCandle; import forestry.core.ForestryClient; import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; import forestry.core.utils.StringUtil; public class BlockCandle extends BlockTorch { @@ -174,13 +175,13 @@ public class BlockCandle extends BlockTorch { if (!isLit) { if (heldItem == null || !lightingItems.contains(heldItem.getItem())) { toggleLitState = false; - } else if (StackUtils.equals(this, heldItem) && isLit(heldItem)) { + } else if (ItemStackUtil.equals(this, heldItem) && isLit(heldItem)) { toggleLitState = true; } } if (heldItem != null) { - if (StackUtils.equals(this, heldItem)) { + if (ItemStackUtil.equals(this, heldItem)) { if (!isLit(heldItem)) { // Copy the colour of an unlit, coloured candle. if (heldItem.hasTagCompound() && heldItem.getTagCompound().hasKey(colourTagName)) { diff --git a/src/main/java/forestry/apiculture/gadgets/BlockStump.java b/src/main/java/forestry/apiculture/blocks/BlockStump.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/apiculture/gadgets/BlockStump.java rename to src/main/java/forestry/apiculture/blocks/BlockStump.java index 116356b64..a44605965 --- a/src/main/java/forestry/apiculture/gadgets/BlockStump.java +++ b/src/main/java/forestry/apiculture/blocks/BlockStump.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.blocks; import java.util.List; import java.util.Random; @@ -27,10 +27,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import forestry.core.config.Defaults; +import forestry.apiculture.tiles.TileCandle; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; import forestry.core.utils.StringUtil; public class BlockStump extends BlockTorch { @@ -61,8 +62,8 @@ public class BlockStump extends BlockTorch { if (held != null && (held.getItem() == Items.flint_and_steel || held.getItem() == Items.flint || - StackUtils.equals(Blocks.torch, held))) { - world.setBlock(x, y, z, ForestryBlock.candle.block(), world.getBlockMetadata(x, y, z) | 0x08, Defaults.FLAG_BLOCK_SYNCH); + ItemStackUtil.equals(Blocks.torch, held))) { + world.setBlock(x, y, z, ForestryBlock.candle.block(), world.getBlockMetadata(x, y, z) | 0x08, Constants.FLAG_BLOCK_SYNCH); TileCandle tc = new TileCandle(); tc.setColour(0); // default to white world.setTileEntity(x, y, z, tc); diff --git a/src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java rename to src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java index adbd2ba87..4b4472546 --- a/src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java +++ b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.entities; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.EntityAIBase; diff --git a/src/main/java/forestry/apiculture/entities/EntityBee.java b/src/main/java/forestry/apiculture/entities/EntityBee.java index 791078fd9..2dd72a915 100755 --- a/src/main/java/forestry/apiculture/entities/EntityBee.java +++ b/src/main/java/forestry/apiculture/entities/EntityBee.java @@ -22,12 +22,12 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; -import forestry.core.config.Defaults; -import forestry.core.utils.ForestryResource; +import forestry.core.config.Constants; +import forestry.core.render.ForestryResource; public class EntityBee extends EntityCreature implements IAnimals { - private static final String DEFAULT_TEXTURE = Defaults.TEXTURE_PATH_ENTITIES + "/bees/honeyBee.png"; + private static final String DEFAULT_TEXTURE = Constants.TEXTURE_PATH_ENTITIES + "/bees/honeyBee.png"; private IBee contained; private IAlleleBeeSpecies species; diff --git a/src/main/java/forestry/apiculture/render/EntityBeeFX.java b/src/main/java/forestry/apiculture/entities/EntityFXBee.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/apiculture/render/EntityBeeFX.java rename to src/main/java/forestry/apiculture/entities/EntityFXBee.java index b65f26724..c62f2e6ec --- a/src/main/java/forestry/apiculture/render/EntityBeeFX.java +++ b/src/main/java/forestry/apiculture/entities/EntityFXBee.java @@ -8,14 +8,14 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.render; +package forestry.apiculture.entities; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -public class EntityBeeFX extends EntityFX { - public EntityBeeFX(World world, double x, double y, double z, int color) { +public class EntityFXBee extends EntityFX { + public EntityFXBee(World world, double x, double y, double z, int color) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); particleRed = (color >> 16 & 255) / 255.0F; diff --git a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java index 19e909968..65f946ec4 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java @@ -48,8 +48,8 @@ import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.apiculture.BeeHousingModifier; -import forestry.core.vect.MutableVect; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.MutableVect; +import forestry.core.utils.vect.Vect; import forestry.plugins.PluginManager; public final class FlowerRegistry implements IFlowerRegistry { diff --git a/src/main/java/forestry/apiculture/flowers/VanillaDirtGrassGrowthRule.java b/src/main/java/forestry/apiculture/flowers/VanillaDirtGrassGrowthRule.java index ea0728ca5..df86818b5 100644 --- a/src/main/java/forestry/apiculture/flowers/VanillaDirtGrassGrowthRule.java +++ b/src/main/java/forestry/apiculture/flowers/VanillaDirtGrassGrowthRule.java @@ -18,7 +18,7 @@ import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class VanillaDirtGrassGrowthRule implements IFlowerGrowthRule { @@ -34,7 +34,7 @@ public class VanillaDirtGrassGrowthRule implements IFlowerGrowthRule { } IFlower flower = flowerRegistry.getRandomPlantableFlower(flowerType, world.rand); - return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/apiculture/flowers/VanillaMyceliumGrowthRule.java b/src/main/java/forestry/apiculture/flowers/VanillaMyceliumGrowthRule.java index 5df4120e3..5da9a259d 100644 --- a/src/main/java/forestry/apiculture/flowers/VanillaMyceliumGrowthRule.java +++ b/src/main/java/forestry/apiculture/flowers/VanillaMyceliumGrowthRule.java @@ -18,7 +18,7 @@ import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class VanillaMyceliumGrowthRule implements IFlowerGrowthRule { @@ -34,7 +34,7 @@ public class VanillaMyceliumGrowthRule implements IFlowerGrowthRule { } IFlower flower = fr.getRandomPlantableFlower(flowerType, world.rand); - return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/apiculture/flowers/VanillaSnowGrowthRule.java b/src/main/java/forestry/apiculture/flowers/VanillaSnowGrowthRule.java index c1a207a14..0db4cb106 100644 --- a/src/main/java/forestry/apiculture/flowers/VanillaSnowGrowthRule.java +++ b/src/main/java/forestry/apiculture/flowers/VanillaSnowGrowthRule.java @@ -18,7 +18,7 @@ import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class VanillaSnowGrowthRule implements IFlowerGrowthRule { @@ -34,7 +34,7 @@ public class VanillaSnowGrowthRule implements IFlowerGrowthRule { } IFlower flower = fr.getRandomPlantableFlower(flowerType, world.rand); - return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index cadeef325..7c72b3ac3 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -53,18 +53,18 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; import forestry.apiculture.BeeHousingModifier; -import forestry.arboriculture.genetics.FakePollinatable; -import forestry.arboriculture.genetics.ICheckPollinatable; -import forestry.core.EnumErrorCode; +import forestry.arboriculture.genetics.pollination.FakePollinatable; +import forestry.arboriculture.genetics.pollination.ICheckPollinatable; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; -import forestry.core.proxy.Proxies; import forestry.core.utils.GeneticsUtil; +import forestry.core.utils.Log; import forestry.core.utils.StringUtil; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class Bee extends IndividualLiving implements IBee { @@ -269,7 +269,7 @@ public class Bee extends IndividualLiving implements IBee { errorStates.add(EnumErrorCode.NOTDAY); } - if (housing.getBlockLightValue() > Defaults.APIARY_MIN_LEVEL_LIGHT) { + if (housing.getBlockLightValue() > Constants.APIARY_MIN_LEVEL_LIGHT) { if (!canWorkDuringDay()) { errorStates.add(EnumErrorCode.NOTGLOOMY); } @@ -439,12 +439,12 @@ public class Bee extends IndividualLiving implements IBee { @Override public ItemStack[] produceStacks(IBeeHousing housing) { if (housing == null) { - Proxies.log.warning("Failed to produce in an apiary because the beehousing was null."); + Log.warning("Failed to produce in an apiary because the beehousing was null."); return null; } IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(housing.getWorld()); if (mode == null) { - Proxies.log.warning("Failed to produce in an apiary because the beekeeping mode was null."); + Log.warning("Failed to produce in an apiary because the beekeeping mode was null."); return null; } diff --git a/src/main/java/forestry/apiculture/genetics/BeeFactory.java b/src/main/java/forestry/apiculture/genetics/BeeFactory.java index e9eca2d8d..4b13e073f 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeFactory.java +++ b/src/main/java/forestry/apiculture/genetics/BeeFactory.java @@ -14,6 +14,7 @@ import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.apiculture.IBeeFactory; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; +import forestry.apiculture.genetics.alleles.AlleleBeeSpecies; public class BeeFactory implements IBeeFactory { @Override diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index a72d8d164..feb6c0dc2 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -15,7 +15,6 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import javax.annotation.Nonnull; - import java.util.concurrent.TimeUnit; import net.minecraft.item.ItemStack; @@ -38,7 +37,7 @@ import forestry.core.genetics.Genome; import forestry.core.genetics.alleles.AlleleArea; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleTolerance; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class BeeGenome extends Genome implements IBeeGenome { /** diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index 706013fb6..2f4774108 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutation.java @@ -22,7 +22,7 @@ import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; import forestry.apiculture.BeeHousingModifier; -import forestry.core.genetics.Mutation; +import forestry.core.genetics.mutations.Mutation; public class BeeMutation extends Mutation implements IBeeMutationCustom { diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java index 8872c18f6..f3b6ca12f 100755 --- a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java @@ -19,7 +19,7 @@ import net.minecraft.util.ChunkCoordinates; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; /** * Hermits will not produce if there are any other living creatures nearby. diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java b/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java index bd1bbcd99..4060abb69 100644 --- a/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java @@ -19,7 +19,7 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IJubilanceProvider; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; public class JubilanceRequiresResource implements IJubilanceProvider { @@ -36,7 +36,7 @@ public class JubilanceRequiresResource implements IJubilanceProvider { Block block = world.getBlock(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ); int meta = world.getBlockMetadata(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ); - return StackUtils.equals(block, meta, blockRequired); + return ItemStackUtil.equals(block, meta, blockRequired); } } diff --git a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java index 762056fe9..fdf525f7a --- a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.ArrayList; import java.util.Collections; @@ -38,10 +38,11 @@ import forestry.api.apiculture.IJubilanceProvider; import forestry.api.core.IIconProvider; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; +import forestry.apiculture.genetics.JubilanceDefault; import forestry.core.genetics.alleles.AlleleSpecies; import forestry.core.render.TextureManager; import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpeciesCustom { private final Map productChances = new HashMap(); @@ -141,11 +142,11 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies if (bountyLevel > 10) { for (ItemStack stack : specialtyChances.keySet()) { - bounty.add(StackUtils.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand)); + bounty.add(ItemStackUtil.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand)); } } for (ItemStack stack : productChances.keySet()) { - bounty.add(StackUtils.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand)); + bounty.add(ItemStackUtil.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand)); } return bounty.toArray(new ItemStack[bounty.size()]); } diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectAggressive.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectAggressive.java index 3ba9adb04..bb5c8a36e --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectAggressive.java @@ -8,16 +8,16 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; -import forestry.api.apiculture.BeeManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java index bfb567ab4..a158e57b2 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java @@ -8,16 +8,16 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; -import forestry.api.apiculture.BeeManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectExploration.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectExploration.java index aac2f6204..42cc1db21 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectExploration.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java similarity index 96% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java index a3754c3a6..dfae1c968 100644 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.Random; @@ -19,7 +19,7 @@ import net.minecraft.world.World; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import forestry.core.vect.IVect; +import forestry.core.utils.vect.IVect; public class AlleleEffectFertile extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFungification.java similarity index 98% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFungification.java index 45229f94f..492752edd 100644 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFungification.java @@ -1,4 +1,4 @@ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; import java.util.Random; @@ -16,7 +16,7 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.core.genetics.EffectData; -import forestry.core.vect.IVect; +import forestry.core.utils.vect.IVect; public class AlleleEffectFungification extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectGlacial.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectGlacial.java index a8cb1d378..b183629d1 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectGlacial.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -19,7 +19,7 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IEffectData; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class AlleleEffectGlacial extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectHeroic.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectHeroic.java index 99e31420b..abdc45af9 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectHeroic.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectIgnition.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectIgnition.java index 0c310fdba..dd3ba2322 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectIgnition.java @@ -8,16 +8,16 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; -import forestry.api.apiculture.BeeManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectMisanthrope.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectMisanthrope.java index 943db8051..d75d24018 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectMisanthrope.java @@ -8,15 +8,15 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; -import forestry.api.apiculture.BeeManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java index 12cf11ffa..a158980fd --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import net.minecraft.util.AxisAlignedBB; @@ -19,8 +19,8 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; import forestry.apiculture.BeeHousingModifier; import forestry.core.genetics.alleles.AlleleCategorized; -import forestry.core.vect.MutableVect; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.MutableVect; +import forestry.core.utils.vect.Vect; import forestry.plugins.PluginApiculture; public class AlleleEffectNone extends AlleleCategorized implements IAlleleBeeEffect { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java index 4d8dcc2d0..f6de2b805 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java @@ -8,13 +8,12 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.Collection; import java.util.Collections; import java.util.List; -import forestry.api.apiculture.BeeManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -25,10 +24,12 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.ReflectionHelper; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; public class AlleleEffectPotion extends AlleleEffectThrottled { @@ -97,7 +98,7 @@ public class AlleleEffectPotion extends AlleleEffectThrottled { try { return (Boolean) ReflectionHelper.getPrivateValue(Potion.class, potion, "field_76418_K", "isBadEffect"); } catch (ReflectionHelper.UnableToFindFieldException e) { - Proxies.log.severe("Could not access potion field isBadEffect."); + Log.severe("Could not access potion field isBadEffect."); return false; } } diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java index 0c3eefcc1..bf59b83f3 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java @@ -8,12 +8,11 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; import java.util.Random; -import forestry.api.apiculture.BeeManager; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -22,13 +21,14 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import forestry.apiculture.gadgets.BlockAlveary; +import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.multiblock.TileAlveary; import forestry.core.utils.DamageSourceForestry; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class AlleleEffectRadioactive extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRepulsion.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRepulsion.java index 628df846c..99a470717 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRepulsion.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.List; @@ -19,6 +19,7 @@ import net.minecraft.util.AxisAlignedBB; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import forestry.apiculture.entities.AIAvoidPlayers; public class AlleleEffectRepulsion extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectResurrection.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectResurrection.java index 95ee2cfe2..ec8eddba6 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectResurrection.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import java.util.ArrayList; import java.util.Collections; @@ -33,8 +33,8 @@ import net.minecraft.util.AxisAlignedBB; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.utils.EntityUtil; +import forestry.core.utils.ItemStackUtil; public class AlleleEffectResurrection extends AlleleEffectThrottled { @@ -96,8 +96,8 @@ public class AlleleEffectResurrection extends AlleleEffectThrottled { ItemStack contained = item.getEntityItem(); for (Resurrectable entry : resurrectables) { - if (StackUtils.isIdenticalItem(entry.res, contained)) { - Utils.spawnEntity(housing.getWorld(), entry.risen, item.posX, item.posY, item.posZ); + if (ItemStackUtil.isIdenticalItem(entry.res, contained)) { + EntityUtil.spawnEntity(housing.getWorld(), entry.risen, item.posX, item.posY, item.posZ); contained.stackSize--; if (contained.stackSize <= 0) { item.setDead(); diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectSnowing.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectSnowing.java index 76d9292bb..e097ff10b --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectSnowing.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -21,9 +21,9 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IEffectData; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class AlleleEffectSnowing extends AlleleEffectThrottled { @@ -66,7 +66,7 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled { if (block == Blocks.snow_layer) { int meta = world.getBlockMetadata(posBlock.x, posBlock.y, posBlock.z); if (meta < 7) { - world.setBlockMetadataWithNotify(posBlock.x, posBlock.y, posBlock.z, meta + 1, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + world.setBlockMetadataWithNotify(posBlock.x, posBlock.y, posBlock.z, meta + 1, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } } else if (block.isReplaceable(world, posBlock.x, posBlock.y, posBlock.z)) { Proxies.common.setBlockWithNotify(world, posBlock.x, posBlock.y, posBlock.z, Blocks.snow_layer); diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectThrottled.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectThrottled.java index 4c322a540..2ae0b342b --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectThrottled.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleFlowers.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleFlowers.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/genetics/AlleleFlowers.java rename to src/main/java/forestry/apiculture/genetics/alleles/AlleleFlowers.java index 98acb061b..3e08fe43f --- a/src/main/java/forestry/apiculture/genetics/AlleleFlowers.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleFlowers.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.genetics; +package forestry.apiculture.genetics.alleles; import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IFlowerProvider; diff --git a/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java b/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java index 527b0a5a2..f9c60932c 100644 --- a/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java +++ b/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java @@ -14,15 +14,15 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import forestry.apiculture.BeeHousingInventory; -import forestry.apiculture.gadgets.TileApiary; -import forestry.apiculture.gadgets.TileBeeHousing; +import forestry.apiculture.tiles.TileAbstractBeeHousing; +import forestry.apiculture.tiles.TileApiary; import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -public class ContainerBeeHousing extends ContainerTile { +public class ContainerBeeHousing extends ContainerTile { - public ContainerBeeHousing(InventoryPlayer player, TileBeeHousing tile, boolean hasFrames) { + public ContainerBeeHousing(InventoryPlayer player, TileAbstractBeeHousing tile, boolean hasFrames) { super(tile, player, 8, 108); // Queen/Princess diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index ff5eb757b..e5f42f6d4 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -14,16 +14,15 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.apiculture.multiblock.IAlvearyController; import forestry.apiculture.multiblock.TileAlvearyPlain; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.ledgers.OwnerLedger; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; public class GuiAlveary extends GuiForestryTitled { public GuiAlveary(InventoryPlayer inventory, TileAlvearyPlain tile) { - super(Defaults.TEXTURE_PATH_GUI + "/alveary.png", new ContainerAlveary(inventory, tile), tile); + super(Constants.TEXTURE_PATH_GUI + "/alveary.png", new ContainerAlveary(inventory, tile), tile); ySize = 190; } @@ -33,7 +32,7 @@ public class GuiAlveary extends GuiForestryTitled { public GuiAlvearyHygroregulator(InventoryPlayer inventory, TileAlvearyHygroregulator tile) { - super(Defaults.TEXTURE_PATH_GUI + "/hygroregulator.png", new ContainerAlvearyHygroregulator(inventory, tile), tile); + super(Constants.TEXTURE_PATH_GUI + "/hygroregulator.png", new ContainerAlvearyHygroregulator(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 104, 17, 0)); } diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java index 4e0647ad7..50ebe2a03 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java @@ -13,13 +13,13 @@ package forestry.apiculture.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.apiculture.multiblock.TileAlvearySieve; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; public class GuiAlvearySieve extends GuiForestryTitled { public GuiAlvearySieve(InventoryPlayer inventory, TileAlvearySieve tile) { - super(Defaults.TEXTURE_PATH_GUI + "/sieve.png", new ContainerAlvearySieve(inventory, tile), tile); + super(Constants.TEXTURE_PATH_GUI + "/sieve.png", new ContainerAlvearySieve(inventory, tile), tile); } } diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java index a52cb8f8d..8d159a1cc 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java @@ -13,13 +13,13 @@ package forestry.apiculture.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.apiculture.multiblock.TileAlvearySwarmer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; public class GuiAlvearySwarmer extends GuiForestryTitled { public GuiAlvearySwarmer(InventoryPlayer inventory, TileAlvearySwarmer tile) { - super(Defaults.TEXTURE_PATH_GUI + "/swarmer.png", new ContainerAlvearySwarmer(inventory, tile), tile); + super(Constants.TEXTURE_PATH_GUI + "/swarmer.png", new ContainerAlvearySwarmer(inventory, tile), tile); } } diff --git a/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java b/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java index 7fb523857..95eaa2115 100644 --- a/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java @@ -12,24 +12,23 @@ package forestry.apiculture.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.apiculture.gadgets.TileApiary; -import forestry.apiculture.gadgets.TileBeeHousing; -import forestry.apiculture.gadgets.TileBeehouse; -import forestry.core.config.Defaults; +import forestry.apiculture.tiles.TileAbstractBeeHousing; +import forestry.apiculture.tiles.TileApiary; +import forestry.apiculture.tiles.TileBeeHouse; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; -public class GuiBeeHousing extends GuiForestryTitled { +public class GuiBeeHousing extends GuiForestryTitled { public GuiBeeHousing(InventoryPlayer inventory, TileApiary tile) { - super(Defaults.TEXTURE_PATH_GUI + "/apiary.png", new ContainerBeeHousing(inventory, tile, true), tile); + super(Constants.TEXTURE_PATH_GUI + "/apiary.png", new ContainerBeeHousing(inventory, tile, true), tile); ySize = 190; } - public GuiBeeHousing(InventoryPlayer inventory, TileBeehouse tile) { - super(Defaults.TEXTURE_PATH_GUI + "/alveary.png", new ContainerBeeHousing(inventory, tile, false), tile); + public GuiBeeHousing(InventoryPlayer inventory, TileBeeHouse tile) { + super(Constants.TEXTURE_PATH_GUI + "/alveary.png", new ContainerBeeHousing(inventory, tile, false), tile); ySize = 190; } @@ -38,7 +37,7 @@ public class GuiBeeHousing extends GuiForestryTitled iconStacks = new HashMap(); public GuiImprinter(InventoryPlayer inventoryplayer, ImprinterInventory inventory) { - super(Defaults.TEXTURE_PATH_GUI + "/imprinter.png", new ContainerImprinter(inventoryplayer, inventory), inventory); + super(Constants.TEXTURE_PATH_GUI + "/imprinter.png", new ContainerImprinter(inventoryplayer, inventory), inventory); xSize = 176; ySize = 185; diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index 54f8faf85..ae7fe3999 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; import forestry.api.core.Tabs; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; @@ -39,9 +39,9 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArm @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { if (ForestryItem.apiaristLegs.isItemEqual(stack)) { - return Defaults.ID + ":" + Defaults.TEXTURE_APIARIST_ARMOR_SECONDARY; + return Constants.ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_SECONDARY; } else { - return Defaults.ID + ":" + Defaults.TEXTURE_APIARIST_ARMOR_PRIMARY; + return Constants.ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_PRIMARY; } } diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index ca2c32c68..de1978dbb 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java @@ -20,13 +20,27 @@ import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.core.config.Config; -import forestry.core.interfaces.IHintSource; -import forestry.core.inventory.AlyzerInventory; -import forestry.core.items.ItemInventoried; +import forestry.core.gui.IHintSource; +import forestry.core.items.ItemAlyzer; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -public class ItemBeealyzer extends ItemInventoried { +public class ItemBeealyzer extends ItemAlyzer { + + public ItemBeealyzer() { + super(); + setMaxStackSize(1); + setCreativeTab(Tabs.tabApiculture); + } + + @Override + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { + if (Proxies.common.isSimulating(world)) { + entityplayer.openGui(ForestryAPI.instance, GuiId.BeealyzerGUI.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY, (int) entityplayer.posZ); + } + + return itemstack; + } public static class BeealyzerInventory extends AlyzerInventory implements IHintSource { @@ -90,18 +104,4 @@ public class ItemBeealyzer extends ItemInventoried { } } - public ItemBeealyzer() { - super(); - setMaxStackSize(1); - setCreativeTab(Tabs.tabApiculture); - } - - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - if (Proxies.common.isSimulating(world)) { - entityplayer.openGui(ForestryAPI.instance, GuiId.BeealyzerGUI.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY, (int) entityplayer.posZ); - } - - return itemstack; - } } diff --git a/src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java b/src/main/java/forestry/apiculture/items/ItemBlockAlveary.java old mode 100755 new mode 100644 similarity index 79% rename from src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java rename to src/main/java/forestry/apiculture/items/ItemBlockAlveary.java index d1e144a9e..ebda1b667 --- a/src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java +++ b/src/main/java/forestry/apiculture/items/ItemBlockAlveary.java @@ -12,15 +12,15 @@ package forestry.apiculture.items; import net.minecraft.block.Block; -import forestry.core.gadgets.IStructureBlockItem; -import forestry.core.items.ItemForestryBlock; +import forestry.core.items.IStructureBlockItem; +import forestry.core.items.ItemBlockForestry; /** * @author CovertJaguar */ -public class ItemAlvearyBlock extends ItemForestryBlock implements IStructureBlockItem { +public class ItemBlockAlveary extends ItemBlockForestry implements IStructureBlockItem { - public ItemAlvearyBlock(Block block) { + public ItemBlockAlveary(Block block) { super(block); } } diff --git a/src/main/java/forestry/apiculture/items/ItemCandleBlock.java b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/apiculture/items/ItemCandleBlock.java rename to src/main/java/forestry/apiculture/items/ItemBlockCandle.java index e1d484749..35cfa591d --- a/src/main/java/forestry/apiculture/items/ItemCandleBlock.java +++ b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java @@ -18,12 +18,12 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.apiculture.gadgets.BlockCandle; -import forestry.core.items.ItemForestryBlock; +import forestry.apiculture.blocks.BlockCandle; +import forestry.core.items.ItemBlockForestry; -public class ItemCandleBlock extends ItemForestryBlock { +public class ItemBlockCandle extends ItemBlockForestry { - public ItemCandleBlock(Block block) { + public ItemBlockCandle(Block block) { super(block); } diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java index 8dc8dd27e..d75c174bd 100644 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -44,16 +44,16 @@ import forestry.api.core.IErrorState; import forestry.api.core.Tabs; import forestry.api.genetics.AlleleManager; import forestry.apiculture.render.TextureHabitatLocator; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; -import forestry.core.interfaces.IHintSource; +import forestry.core.errors.EnumErrorCode; +import forestry.core.gui.IHintSource; import forestry.core.inventory.ItemInventory; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class ItemHabitatLocator extends ItemInventoried { diff --git a/src/main/java/forestry/apiculture/items/ItemWaxCast.java b/src/main/java/forestry/apiculture/items/ItemWaxCast.java index 47881a8df..411b3a7ba 100755 --- a/src/main/java/forestry/apiculture/items/ItemWaxCast.java +++ b/src/main/java/forestry/apiculture/items/ItemWaxCast.java @@ -12,7 +12,7 @@ package forestry.apiculture.items; import net.minecraft.item.ItemStack; -import forestry.core.interfaces.ICraftingPlan; +import forestry.core.items.ICraftingPlan; import forestry.core.items.ItemForestry; public class ItemWaxCast extends ItemForestry implements ICraftingPlan { diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 72110b672..a72e21466 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -36,6 +36,7 @@ import forestry.api.core.EnumTemperature; import forestry.api.core.IClimateControlled; import forestry.apiculture.BeeHousingInventory; import forestry.apiculture.BeeHousingModifier; +import forestry.core.access.EnumAccess; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.CoordTriplet; import forestry.core.multiblock.IMultiblockPart; @@ -47,8 +48,7 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketGuiUpdate; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumAccess; -import forestry.core.utils.Utils; +import forestry.core.utils.BlockUtil; public class AlvearyController extends RectangularMultiblockControllerBase implements IAlvearyController, IClimateControlled { @@ -179,7 +179,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple for (int slabX = minimumCoord.x; slabX <= maximumCoord.x; slabX++) { for (int slabZ = minimumCoord.z; slabZ <= maximumCoord.z; slabZ++) { Block block = worldObj.getBlock(slabX, slabY, slabZ); - if (!Utils.isWoodSlabBlock(block)) { + if (!BlockUtil.isWoodSlabBlock(block)) { throw new MultiblockValidationException(StatCollector.translateToLocal("for.multiblock.alveary.error.needSlabs")); } diff --git a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java index 606c124c1..8018c1357 100644 --- a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java @@ -29,14 +29,14 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogic; import forestry.apiculture.FakeBeekeepingLogic; -import forestry.core.delegates.FakeAccessHandler; -import forestry.core.delegates.FakeErrorLogic; -import forestry.core.interfaces.IAccessHandler; +import forestry.core.access.EnumAccess; +import forestry.core.access.FakeAccessHandler; +import forestry.core.access.IAccessHandler; +import forestry.core.errors.FakeErrorLogic; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.utils.EnumAccess; public class FakeAlvearyController implements IAlvearyController { public static final FakeAlvearyController instance = new FakeAlvearyController(); diff --git a/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java index 91cc94dd5..e921193e5 100644 --- a/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java @@ -12,9 +12,9 @@ package forestry.apiculture.multiblock; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBeeHousing; -import forestry.core.interfaces.IClimatised; -import forestry.core.interfaces.IRestrictedAccessTile; import forestry.core.inventory.IInventoryAdapter; +import forestry.core.tiles.IClimatised; +import forestry.core.tiles.IRestrictedAccessTile; public interface IAlvearyController extends IBeeHousing, IClimatised, IRestrictedAccessTile { IInventoryAdapter getInternalInventory(); diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java index d808b00d4..716f5097e 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java @@ -12,7 +12,7 @@ package forestry.apiculture.multiblock; import net.minecraft.util.StatCollector; -import forestry.apiculture.gadgets.BlockAlveary; +import forestry.apiculture.blocks.BlockAlveary; import forestry.core.multiblock.MultiblockControllerBase; import forestry.core.multiblock.MultiblockValidationException; import forestry.core.multiblock.rectangular.RectangularMultiblockTileEntityBase; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java index e2a0d9376..ce40501d7 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java @@ -18,8 +18,8 @@ import net.minecraftforge.common.util.ForgeDirection; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.IClimateControlled; import forestry.apiculture.network.PacketActiveUpdate; -import forestry.core.interfaces.IActivatable; import forestry.core.proxy.Proxies; +import forestry.core.tiles.IActivatable; import forestry.energy.EnergyManager; import cofh.api.energy.IEnergyHandler; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java index 664e35a60..c66bbe88f 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.apiculture.multiblock; -import forestry.apiculture.gadgets.BlockAlveary; +import forestry.apiculture.blocks.BlockAlveary; public class TileAlvearyFan extends TileAlvearyClimatiser { diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java index b869fd676..18f8fc7ea 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.apiculture.multiblock; -import forestry.apiculture.gadgets.BlockAlveary; +import forestry.apiculture.blocks.BlockAlveary; public class TileAlvearyHeater extends TileAlvearyClimatiser { diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java index d24de4b18..c4b92d62e 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java @@ -23,18 +23,18 @@ import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.IClimateControlled; -import forestry.apiculture.gadgets.BlockAlveary; -import forestry.core.config.Defaults; +import forestry.apiculture.blocks.BlockAlveary; +import forestry.core.config.Constants; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; +import forestry.core.tiles.ILiquidTankTile; -public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IInventory, ILiquidTankContainer, IAlvearyComponent.Climatiser { +public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IInventory, ILiquidTankTile, IAlvearyComponent.Climatiser { private final HygroregulatorRecipe[] recipes; @@ -55,7 +55,7 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn Fluid lava = Fluids.LAVA.getFluid(); Fluid liquidIce = Fluids.ICE.getFluid(); - this.liquidTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce); + this.liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce); this.tankManager = new TankManager(liquidTank); this.recipes = new HygroregulatorRecipe[]{new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f), diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java index 214a6ba68..2d940e272 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java @@ -35,9 +35,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.apiculture.trigger.ApicultureTriggers; import forestry.core.config.Config; -import forestry.core.interfaces.IClimatised; -import forestry.core.interfaces.IHintSource; -import forestry.core.interfaces.ITitled; +import forestry.core.gui.IHintSource; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.MultiblockControllerBase; import forestry.core.multiblock.rectangular.PartPosition; @@ -45,7 +43,9 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.network.IStreamableGui; -import forestry.core.utils.Utils; +import forestry.core.tiles.IClimatised; +import forestry.core.tiles.ITitled; +import forestry.core.utils.BlockUtil; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; @@ -62,7 +62,7 @@ public class TileAlvearyPlain extends TileAlveary implements IBeeHousing, IClima if (!worldObj.isRemote) { // set alveary entrance block meta if (getPartPosition() == PartPosition.Frame) { - if (Utils.isWoodSlabBlock(worldObj.getBlock(xCoord, yCoord + 1, zCoord))) { + if (BlockUtil.isWoodSlabBlock(worldObj.getBlock(xCoord, yCoord + 1, zCoord))) { this.worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, TileAlveary.ENTRANCE_META, 2); } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java index 51264e014..bb4b60fa7 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java @@ -20,13 +20,13 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import forestry.apiculture.gadgets.BlockAlveary; +import forestry.apiculture.blocks.BlockAlveary; import forestry.core.config.ForestryItem; -import forestry.core.interfaces.ICrafter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; -import forestry.core.utils.StackUtils; +import forestry.core.tiles.ICrafter; +import forestry.core.utils.ItemStackUtil; public class TileAlvearySieve extends TileAlvearyWithGui implements ICrafter, IAlvearyComponent.BeeListener { @@ -109,7 +109,7 @@ public class TileAlvearySieve extends TileAlvearyWithGui implements ICrafter, IA @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - return StackUtils.isIdenticalItem(ForestryItem.craftingMaterial.getItemStack(1, 3), itemStack); + return ItemStackUtil.isIdenticalItem(ForestryItem.craftingMaterial.getItemStack(1, 3), itemStack); } private boolean canStorePollen() { diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java index f76aa6d69..33307d675 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java @@ -14,7 +14,7 @@ import forestry.api.apiculture.DefaultBeeModifier; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; -import forestry.apiculture.gadgets.BlockAlveary; +import forestry.apiculture.blocks.BlockAlveary; public class TileAlvearyStabiliser extends TileAlveary implements IAlvearyComponent.BeeModifier { diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index a95647036..a195b23ce 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -22,20 +22,20 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBee; -import forestry.apiculture.gadgets.BlockAlveary; +import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.network.PacketActiveUpdate; import forestry.apiculture.worldgen.Hive; import forestry.apiculture.worldgen.HiveDecorator; import forestry.apiculture.worldgen.HiveDescriptionSwarmer; -import forestry.core.interfaces.IActivatable; +import forestry.core.access.EnumAccess; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumAccess; -import forestry.core.utils.StackUtils; +import forestry.core.tiles.IActivatable; +import forestry.core.utils.ItemStackUtil; public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInventory, IActivatable, IAlvearyComponent.Active { @@ -118,7 +118,7 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve for (IInvSlot slot : InventoryIterator.getIterable(getInternalInventory())) { ItemStack stack = slot.getStackInSlot(); for (Entry entry : BeeManager.inducers.entrySet()) { - if (StackUtils.isIdenticalItem(entry.getKey(), stack)) { + if (ItemStackUtil.isIdenticalItem(entry.getKey(), stack)) { slot.decreaseStackInSlot(); return entry.getValue(); } @@ -235,7 +235,7 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - return StackUtils.containsItemStack(BeeManager.inducers.keySet(), itemStack); + return ItemStackUtil.containsItemStack(BeeManager.inducers.keySet(), itemStack); } } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyWithGui.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyWithGui.java index a528dcd11..6c3bcfc9c 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyWithGui.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyWithGui.java @@ -17,14 +17,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChunkCoordinates; import forestry.api.core.ForestryAPI; -import forestry.core.delegates.AccessHandler; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.interfaces.IRestrictedAccessTile; -import forestry.core.interfaces.ITitled; +import forestry.core.access.AccessHandler; +import forestry.core.access.EnumAccess; +import forestry.core.access.IAccessHandler; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.EnumAccess; +import forestry.core.tiles.IRestrictedAccessTile; +import forestry.core.tiles.ITitled; public abstract class TileAlvearyWithGui extends TileAlveary implements ITitled, IRestrictedAccessTile { diff --git a/src/main/java/forestry/apiculture/network/PacketActiveUpdate.java b/src/main/java/forestry/apiculture/network/PacketActiveUpdate.java index 625d16bf3..30ae77bed 100644 --- a/src/main/java/forestry/apiculture/network/PacketActiveUpdate.java +++ b/src/main/java/forestry/apiculture/network/PacketActiveUpdate.java @@ -14,12 +14,12 @@ import java.io.IOException; import net.minecraft.tileentity.TileEntity; -import forestry.core.interfaces.IActivatable; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketId; import forestry.core.proxy.Proxies; +import forestry.core.tiles.IActivatable; public class PacketActiveUpdate extends PacketCoordinates { diff --git a/src/main/java/forestry/apiculture/network/PacketHandlerApiculture.java b/src/main/java/forestry/apiculture/network/PacketHandlerApiculture.java index 9173ddfb5..9c93b12b2 100644 --- a/src/main/java/forestry/apiculture/network/PacketHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/network/PacketHandlerApiculture.java @@ -15,8 +15,8 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import forestry.apiculture.gadgets.TileCandle; import forestry.apiculture.gui.ContainerImprinter; +import forestry.apiculture.tiles.TileCandle; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.IPacketHandler; import forestry.core.network.PacketCoordinates; diff --git a/src/main/java/forestry/apiculture/network/PacketUpdateCandle.java b/src/main/java/forestry/apiculture/network/PacketUpdateCandle.java index 7c825f734..e868d5020 100644 --- a/src/main/java/forestry/apiculture/network/PacketUpdateCandle.java +++ b/src/main/java/forestry/apiculture/network/PacketUpdateCandle.java @@ -2,7 +2,7 @@ package forestry.apiculture.network; import java.io.IOException; -import forestry.apiculture.gadgets.TileCandle; +import forestry.apiculture.tiles.TileCandle; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketCoordinates; diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java index 3c39492c5..2df15aea9 100755 --- a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java @@ -13,7 +13,7 @@ package forestry.apiculture.proxy; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; -import forestry.core.interfaces.IBlockRenderer; +import forestry.core.render.IBlockRenderer; public class ProxyApiculture { public void addBeeHiveFX(String texture, World world, ChunkCoordinates coordinates, int color) { diff --git a/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java old mode 100755 new mode 100644 similarity index 76% rename from src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java rename to src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java index 299a80c70..10c98bf2b --- a/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java @@ -19,58 +19,58 @@ import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.RenderingRegistry; import forestry.apiculture.entities.EntityBee; -import forestry.apiculture.render.BeeItemRenderer; -import forestry.apiculture.render.EntityBeeFX; +import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.render.ParticleRenderer; -import forestry.apiculture.render.RenderBee; +import forestry.apiculture.render.RenderBeeEntity; +import forestry.apiculture.render.RenderBeeItem; import forestry.core.config.ForestryItem; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.proxy.ClientProxyRender; +import forestry.core.proxy.ProxyRenderClient; +import forestry.core.render.IBlockRenderer; import forestry.core.render.RenderAnalyzer; import forestry.core.render.TextureManager; import forestry.plugins.PluginApiculture; -public class ClientProxyApiculture extends ProxyApiculture { +public class ProxyApicultureClient extends ProxyApiculture { @Override public void initializeRendering() { if (PluginApiculture.fancyRenderedBees) { - RenderingRegistry.registerEntityRenderingHandler(EntityBee.class, new RenderBee()); + RenderingRegistry.registerEntityRenderingHandler(EntityBee.class, new RenderBeeEntity()); - MinecraftForgeClient.registerItemRenderer(ForestryItem.beeDroneGE.item(), new BeeItemRenderer()); - MinecraftForgeClient.registerItemRenderer(ForestryItem.beePrincessGE.item(), new BeeItemRenderer()); - MinecraftForgeClient.registerItemRenderer(ForestryItem.beeQueenGE.item(), new BeeItemRenderer()); + MinecraftForgeClient.registerItemRenderer(ForestryItem.beeDroneGE.item(), new RenderBeeItem()); + MinecraftForgeClient.registerItemRenderer(ForestryItem.beePrincessGE.item(), new RenderBeeItem()); + MinecraftForgeClient.registerItemRenderer(ForestryItem.beeQueenGE.item(), new RenderBeeItem()); } } @Override public void addBeeHiveFX(String icon, World world, ChunkCoordinates coordinates, int color) { - if (!ClientProxyRender.shouldSpawnParticle(world)) { + if (!ProxyRenderClient.shouldSpawnParticle(world)) { return; } - EntityFX fx = new EntityBeeFX(world, coordinates.posX + 0.5D, coordinates.posY + 0.5D, coordinates.posZ + 0.5D, color); + EntityFX fx = new EntityFXBee(world, coordinates.posX + 0.5D, coordinates.posY + 0.5D, coordinates.posZ + 0.5D, color); fx.setParticleIcon(TextureManager.getInstance().getDefault(icon)); ParticleRenderer.getInstance().addEffect(fx); } @Override public void addBeeSwarmFX(String icon, World world, double xCoord, double yCoord, double zCoord, int color) { - if (!ClientProxyRender.shouldSpawnParticle(world)) { + if (!ProxyRenderClient.shouldSpawnParticle(world)) { return; } EntityFX fx; if (world.rand.nextBoolean()) { - fx = new EntityBeeFX(world, xCoord, yCoord, zCoord, color); + fx = new EntityFXBee(world, xCoord, yCoord, zCoord, color); } else { double spawnX = xCoord + world.rand.nextInt(4) - 2; double spawnY = yCoord + world.rand.nextInt(4) - 2; double spawnZ = zCoord + world.rand.nextInt(4) - 2; - fx = new EntityBeeFX(world, spawnX, spawnY, spawnZ, color); + fx = new EntityFXBee(world, spawnX, spawnY, spawnZ, color); } fx.setParticleIcon(TextureManager.getInstance().getDefault(icon)); diff --git a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java index b7ee458ef..7b9323554 100755 --- a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java +++ b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java @@ -19,7 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; +import forestry.core.render.ForestryResource; public class ModelAnalyzer extends ModelBase { diff --git a/src/main/java/forestry/apiculture/render/RenderBee.java b/src/main/java/forestry/apiculture/render/RenderBeeEntity.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/apiculture/render/RenderBee.java rename to src/main/java/forestry/apiculture/render/RenderBeeEntity.java index 03d7c57af..79b23e4b7 --- a/src/main/java/forestry/apiculture/render/RenderBee.java +++ b/src/main/java/forestry/apiculture/render/RenderBeeEntity.java @@ -16,11 +16,11 @@ import net.minecraft.util.ResourceLocation; import forestry.apiculture.entities.EntityBee; -public class RenderBee extends RenderLiving { +public class RenderBeeEntity extends RenderLiving { private final ModelBee beeModel; - public RenderBee() { + public RenderBeeEntity() { super(new ModelBee(), 0.15f); beeModel = (ModelBee) mainModel; } diff --git a/src/main/java/forestry/apiculture/render/BeeItemRenderer.java b/src/main/java/forestry/apiculture/render/RenderBeeItem.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/forestry/apiculture/render/BeeItemRenderer.java rename to src/main/java/forestry/apiculture/render/RenderBeeItem.java index febad37e7..54c7d4e2f --- a/src/main/java/forestry/apiculture/render/BeeItemRenderer.java +++ b/src/main/java/forestry/apiculture/render/RenderBeeItem.java @@ -25,7 +25,7 @@ import forestry.api.apiculture.IBee; import forestry.apiculture.entities.EntityBee; import forestry.core.proxy.Proxies; -public class BeeItemRenderer implements IItemRenderer { +public class RenderBeeItem implements IItemRenderer { private EntityBee entity; diff --git a/src/main/java/forestry/apiculture/render/BlockCandleRenderer.java b/src/main/java/forestry/apiculture/render/RenderCandleBlock.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/apiculture/render/BlockCandleRenderer.java rename to src/main/java/forestry/apiculture/render/RenderCandleBlock.java index 8de0d8bcb..b3d9291ca --- a/src/main/java/forestry/apiculture/render/BlockCandleRenderer.java +++ b/src/main/java/forestry/apiculture/render/RenderCandleBlock.java @@ -19,11 +19,11 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import forestry.apiculture.gadgets.BlockCandle; -import forestry.apiculture.gadgets.TileCandle; +import forestry.apiculture.blocks.BlockCandle; +import forestry.apiculture.tiles.TileCandle; import forestry.core.ForestryClient; -public class BlockCandleRenderer implements ISimpleBlockRenderingHandler { +public class RenderCandleBlock implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeeHousing.java b/src/main/java/forestry/apiculture/tiles/TileAbstractBeeHousing.java similarity index 89% rename from src/main/java/forestry/apiculture/gadgets/TileBeeHousing.java rename to src/main/java/forestry/apiculture/tiles/TileAbstractBeeHousing.java index 510796e5c..6655d7e1f 100644 --- a/src/main/java/forestry/apiculture/gadgets/TileBeeHousing.java +++ b/src/main/java/forestry/apiculture/tiles/TileAbstractBeeHousing.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.tiles; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -26,18 +26,18 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.apiculture.BeeHousingInventory; import forestry.core.config.Config; -import forestry.core.gadgets.TileBase; -import forestry.core.interfaces.IClimatised; import forestry.core.proxy.Proxies; +import forestry.core.tiles.IClimatised; +import forestry.core.tiles.TileBase; -public abstract class TileBeeHousing extends TileBase implements IBeeHousing, IClimatised { +public abstract class TileAbstractBeeHousing extends TileBase implements IBeeHousing, IClimatised { private final IBeekeepingLogic beeLogic; private BiomeGenBase cachedBiome; // CLIENT private int breedingProgressPercent = 0; - protected TileBeeHousing() { + protected TileAbstractBeeHousing() { setHints(Config.hints.get("apiary")); this.beeLogic = BeeManager.beeRoot.createBeekeepingLogic(this); } @@ -167,9 +167,9 @@ public abstract class TileBeeHousing extends TileBase implements IBeeHousing, IC } public static class TileBeeHousingInventory extends BeeHousingInventory { - private final TileBeeHousing tile; + private final TileAbstractBeeHousing tile; - public TileBeeHousingInventory(TileBeeHousing tile, int size, String name) { + public TileBeeHousingInventory(TileAbstractBeeHousing tile, int size, String name) { super(size, name, tile.getAccessHandler()); this.tile = tile; } diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiaristChest.java b/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java similarity index 79% rename from src/main/java/forestry/apiculture/gadgets/TileApiaristChest.java rename to src/main/java/forestry/apiculture/tiles/TileApiaristChest.java index f7c45e160..77dd0902b 100644 --- a/src/main/java/forestry/apiculture/gadgets/TileApiaristChest.java +++ b/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java @@ -8,19 +8,19 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.tiles; import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import forestry.api.apiculture.BeeManager; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.gadgets.TileNaturalistChest; +import forestry.core.inventory.InventoryPlain; import forestry.core.network.GuiId; -import forestry.core.utils.PlainInventory; -import forestry.core.utils.Utils; +import forestry.core.tiles.TileNaturalistChest; +import forestry.core.tiles.TileUtil; public class TileApiaristChest extends TileNaturalistChest { @@ -43,7 +43,7 @@ public class TileApiaristChest extends TileNaturalistChest { } private void migrateFromLegacyBlock() { - IInventory inventoryCopy = new PlainInventory(getInternalInventory()); + IInventory inventoryCopy = new InventoryPlain(getInternalInventory()); // clear the inventory so it isn't dropped when the block is replaced for (int i = 0; i < getSizeInventory(); i++) { @@ -51,9 +51,9 @@ public class TileApiaristChest extends TileNaturalistChest { } worldObj.setBlockToAir(xCoord, yCoord, zCoord); - worldObj.setBlock(xCoord, yCoord, zCoord, ForestryBlock.apicultureChest.block(), Defaults.DEFINITION_APIARISTCHEST_META, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + worldObj.setBlock(xCoord, yCoord, zCoord, ForestryBlock.apicultureChest.block(), Constants.DEFINITION_APIARISTCHEST_META, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); - TileApiaristChest tile = Utils.getTile(worldObj, xCoord, yCoord, zCoord, TileApiaristChest.class); + TileApiaristChest tile = TileUtil.getTile(worldObj, xCoord, yCoord, zCoord, TileApiaristChest.class); for (int i = 0; i < getSizeInventory(); i++) { ItemStack stack = inventoryCopy.getStackInSlot(i); tile.setInventorySlotContents(i, stack); diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/tiles/TileApiary.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/apiculture/gadgets/TileApiary.java rename to src/main/java/forestry/apiculture/tiles/TileApiary.java index cd336ddde..5c9cb50a2 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/tiles/TileApiary.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.tiles; import java.util.ArrayList; import java.util.Collection; @@ -40,11 +40,11 @@ import forestry.api.core.ForestryAPI; import forestry.apiculture.trigger.ApicultureTriggers; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.GuiId; -import forestry.core.utils.Utils; +import forestry.core.utils.SlotUtil; import buildcraft.api.statements.ITriggerExternal; -public class TileApiary extends TileBeeHousing { +public class TileApiary extends TileAbstractBeeHousing { private static final IBeeModifier beeModifier = new ApiaryBeeModifier(); private final IBeeListener beeListener; @@ -138,7 +138,7 @@ public class TileApiary extends TileBeeHousing { @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (Utils.isIndexInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { return (itemStack.getItem() instanceof IHiveFrame) && (getStackInSlot(slotIndex) == null); } @@ -148,7 +148,7 @@ public class TileApiary extends TileBeeHousing { // override for pipe automation @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { - if (Utils.isIndexInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { return false; } return super.isItemValidForSlot(slotIndex, itemStack); diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/tiles/TileBeehouse.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/apiculture/gadgets/TileBeehouse.java rename to src/main/java/forestry/apiculture/tiles/TileBeehouse.java index 0c1c9d004..81eb5c160 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/tiles/TileBeehouse.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.tiles; import java.util.Collections; @@ -23,13 +23,13 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.core.ForestryAPI; import forestry.core.network.GuiId; -public class TileBeehouse extends TileBeeHousing { +public class TileBeeHouse extends TileAbstractBeeHousing { private static final IBeeModifier beeModifier = new BeehouseBeeModifier(); private final IBeeListener beeListener; private final IBeeHousingInventory beeInventory; - public TileBeehouse() { + public TileBeeHouse() { this.beeListener = new DefaultBeeListener(); TileBeeHousingInventory beeHousingInventory = new TileBeeHousingInventory(this, 12, "Items"); diff --git a/src/main/java/forestry/apiculture/gadgets/TileCandle.java b/src/main/java/forestry/apiculture/tiles/TileCandle.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/apiculture/gadgets/TileCandle.java rename to src/main/java/forestry/apiculture/tiles/TileCandle.java index 5e1cafea1..505ccf41c --- a/src/main/java/forestry/apiculture/gadgets/TileCandle.java +++ b/src/main/java/forestry/apiculture/tiles/TileCandle.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.tiles; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; diff --git a/src/main/java/forestry/apiculture/gadgets/TileSwarm.java b/src/main/java/forestry/apiculture/tiles/TileSwarm.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/apiculture/gadgets/TileSwarm.java rename to src/main/java/forestry/apiculture/tiles/TileSwarm.java index f736a81a4..026bae37a --- a/src/main/java/forestry/apiculture/gadgets/TileSwarm.java +++ b/src/main/java/forestry/apiculture/tiles/TileSwarm.java @@ -8,15 +8,15 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.gadgets; +package forestry.apiculture.tiles; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.EnumSkyBlock; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; +import forestry.core.utils.InventoryUtil; public class TileSwarm extends TileEntity { @@ -43,7 +43,7 @@ public class TileSwarm extends TileEntity { public TileSwarm setContained(ItemStack[] bees) { for (ItemStack itemstack : bees) { - InvTools.addStack(contained, itemstack, true); + InventoryUtil.addStack(contained, itemstack, true); } return this; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java index 51265a2fd..6334685ba 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.core.IErrorLogicSource; -import forestry.core.EnumErrorCode; +import forestry.core.errors.EnumErrorCode; import forestry.core.triggers.Trigger; import buildcraft.api.statements.IStatementContainer; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java index f45f49d22..bbb8e8667 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.core.IErrorLogicSource; -import forestry.core.EnumErrorCode; +import forestry.core.errors.EnumErrorCode; import forestry.core.triggers.Trigger; import buildcraft.api.statements.IStatementContainer; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java b/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java index adb31bbb4..8d0376be1 100755 --- a/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java @@ -14,7 +14,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import forestry.apiculture.gadgets.TileApiary; +import forestry.apiculture.tiles.TileApiary; import forestry.core.triggers.Trigger; import buildcraft.api.statements.IStatementContainer; diff --git a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java index 11bf88a4b..9f51f1b2f 100755 --- a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java @@ -37,13 +37,13 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IFlower; -import forestry.apiculture.gadgets.TileApiary; +import forestry.apiculture.tiles.TileApiary; import forestry.arboriculture.WoodType; import forestry.arboriculture.worldgen.BlockTypeLog; import forestry.arboriculture.worldgen.BlockTypeVanillaStairs; import forestry.arboriculture.worldgen.BlockTypeWood; import forestry.arboriculture.worldgen.BlockTypeWoodStairs; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.worldgen.BlockType; @@ -176,7 +176,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { // Escritoire if (random.nextInt(2) == 0) { - IBlockType escritoireBlock = new BlockTypeTileForestry(ForestryBlock.core, Defaults.DEFINITION_ESCRITOIRE_META); + IBlockType escritoireBlock = new BlockTypeTileForestry(ForestryBlock.core, Constants.DEFINITION_ESCRITOIRE_META); escritoireBlock.setDirection(getRotatedDirection(ForgeDirection.EAST)); placeBlockAtCurrentPosition(world, escritoireBlock, 1, 1, 3, structBoundingBox); } @@ -208,7 +208,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { } generateStructureChestContents(world, structBoundingBox, random, 7, 1, 4, - ChestGenHooks.getItems(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, random), + ChestGenHooks.getItems(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, random), random.nextInt(4) + random.nextInt(4) + 5); spawnVillagers(world, boundingBox, 7, 1, 1, 2); @@ -284,7 +284,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { return; } - world.setBlock(xCoord, yCoord, zCoord, ForestryBlock.apiculture.block(), Defaults.DEFINITION_APIARY_META, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(xCoord, yCoord, zCoord, ForestryBlock.apiculture.block(), Constants.DEFINITION_APIARY_META, Constants.FLAG_BLOCK_SYNCH); ForestryBlock.apiculture.block().onBlockAdded(world, xCoord, yCoord, zCoord); TileEntity tile = world.getTileEntity(xCoord, yCoord, zCoord); @@ -388,9 +388,9 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { @Override protected int getVillagerType(int villagerCount) { if (villagerCount <= 0) { - return Defaults.ID_VILLAGER_BEEKEEPER; + return Constants.ID_VILLAGER_BEEKEEPER; } else { - return Defaults.ID_VILLAGER_LUMBERJACK; + return Constants.ID_VILLAGER_LUMBERJACK; } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index 4655fbf16..da2d7e925 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -26,7 +26,7 @@ import net.minecraftforge.event.terraingen.TerrainGen; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.plugins.PluginApiculture; public abstract class HiveDecorator { @@ -132,7 +132,7 @@ public abstract class HiveDecorator { private static boolean setHive(World world, int x, int y, int z, Hive hive) { Block hiveBlock = hive.getHiveBlock(); - boolean placed = world.setBlock(x, y, z, hiveBlock, hive.getHiveMeta(), Defaults.FLAG_BLOCK_SYNCH); + boolean placed = world.setBlock(x, y, z, hiveBlock, hive.getHiveMeta(), Constants.FLAG_BLOCK_SYNCH); if (!placed) { return false; } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java index c1c342632..1d4b3cb9b 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java @@ -21,7 +21,7 @@ import forestry.api.apiculture.hives.IHiveDescription; import forestry.api.apiculture.hives.IHiveGen; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.apiculture.gadgets.TileSwarm; +import forestry.apiculture.tiles.TileSwarm; import forestry.core.config.ForestryBlock; public class HiveDescriptionSwarmer implements IHiveDescription { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java rename to src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index 4e60681af..fe2dc9b75 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.ArrayList; import java.util.List; @@ -38,6 +38,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodType; +import forestry.arboriculture.tiles.TileWood; import forestry.plugins.PluginArboriculture; public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntityProvider { @@ -83,11 +84,6 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntity } } - @Override - public int getRenderType() { - return PluginArboriculture.modelIdFences; - } - /* ICONS */ @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java rename to src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java index 2c928f5d0..bf7a26808 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.ArrayList; import java.util.List; @@ -34,6 +34,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodType; +import forestry.arboriculture.tiles.TileWood; public class BlockArbStairs extends BlockStairs implements IWoodTyped, ITileEntityProvider { diff --git a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java similarity index 95% rename from src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java rename to src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 5c418ffaa..0016f79c5 100644 --- a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import javax.annotation.Nullable; import java.util.ArrayList; @@ -52,16 +52,17 @@ import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterfly; import forestry.arboriculture.LeafDecayHelper; import forestry.arboriculture.genetics.TreeDefinition; -import forestry.arboriculture.items.ItemLeavesBlock; -import forestry.arboriculture.render.LeafTexture; +import forestry.arboriculture.items.ItemBlockLeaves; +import forestry.arboriculture.render.TextureLeaves; +import forestry.arboriculture.tiles.TileLeaves; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginArboriculture; import forestry.plugins.PluginLepidopterology; -public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProvider, IGrowable { +public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProvider, IGrowable { - public ForestryBlockLeaves() { + public BlockForestryLeaves() { this.setCreativeTab(Tabs.tabArboriculture); } @@ -191,7 +192,7 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv leaves.writeToNBTDecorative(shearedLeavesNBT); for (ItemStack stack : ret) { - if (stack.getItem() instanceof ItemLeavesBlock) { + if (stack.getItem() instanceof ItemBlockLeaves) { stack.setTagCompound(shearedLeavesNBT); } } @@ -283,8 +284,8 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister register) { - LeafTexture.registerAllIcons(register); - defaultIcon = LeafTexture.get(EnumLeafType.DECIDUOUS).getFancy(); + TextureLeaves.registerAllIcons(register); + defaultIcon = TextureLeaves.get(EnumLeafType.DECIDUOUS).getFancy(); } @SideOnly(Side.CLIENT) @@ -340,7 +341,7 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv IButterfly caterpillar = tile instanceof TileLeaves ? ((TileLeaves) tile).getCaterpillar() : null; if (heldItem != null && (heldItem.getItem() instanceof IToolScoop) && caterpillar != null) { ItemStack butterfly = PluginLepidopterology.butterflyInterface.getMemberStack(caterpillar, EnumFlutterType.CATERPILLAR.ordinal()); - StackUtils.dropItemStackAsEntity(butterfly, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(butterfly, world, x, y, z); ((TileLeaves) tile).setCaterpillar(null); return true; } diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java b/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java rename to src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java index d87c92b1b..ad7e7cfa0 --- a/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.ArrayList; import java.util.Random; @@ -26,10 +26,11 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import forestry.arboriculture.tiles.TileFruitPod; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; import forestry.core.utils.BlockUtil; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginArboriculture; public class BlockFruitPod extends BlockCocoa { @@ -70,7 +71,7 @@ public class BlockFruitPod extends BlockCocoa { TileFruitPod tile = getPodTile(world, x, y, z); if (tile != null) { for (ItemStack drop : tile.getDrop()) { - StackUtils.dropItemStackAsEntity(drop, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(drop, world, x, y, z); } } } diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java b/src/main/java/forestry/arboriculture/blocks/BlockLog.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/arboriculture/gadgets/BlockLog.java rename to src/main/java/forestry/arboriculture/blocks/BlockLog.java index 86d631efc..408fa4db9 --- a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockLog.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.List; @@ -26,6 +26,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.arboriculture.WoodType; +import forestry.arboriculture.tiles.TileWood; public class BlockLog extends BlockWood { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java rename to src/main/java/forestry/arboriculture/blocks/BlockPlanks.java index a1fad52c5..4727db3a0 --- a/src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.List; @@ -21,6 +21,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.arboriculture.WoodType; +import forestry.arboriculture.tiles.TileWood; public class BlockPlanks extends BlockWood { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/arboriculture/gadgets/BlockSapling.java rename to src/main/java/forestry/arboriculture/blocks/BlockSapling.java index 55314425d..a9d4273b3 --- a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.ArrayList; import java.util.Random; @@ -35,16 +35,17 @@ import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; +import forestry.arboriculture.tiles.TileSapling; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginArboriculture; public class BlockSapling extends BlockTreeContainer implements IGrowable { public static TileSapling getSaplingTile(IBlockAccess world, int x, int y, int z) { - return Utils.getTile(world, x, y, z, TileSapling.class); + return TileUtil.getTile(world, x, y, z, TileSapling.class); } public BlockSapling() { @@ -181,7 +182,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable { TileSapling sapling = getSaplingTile(world, x, y, z); if (sapling != null && sapling.getTree() != null) { ItemStack saplingStack = TreeManager.treeRoot.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING.ordinal()); - StackUtils.dropItemStackAsEntity(saplingStack, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(saplingStack, world, x, y, z); } } diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/arboriculture/gadgets/BlockSlab.java rename to src/main/java/forestry/arboriculture/blocks/BlockSlab.java index 24d265d96..07aecde3a --- a/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.ArrayList; import java.util.List; @@ -38,6 +38,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodType; +import forestry.arboriculture.tiles.TileWood; public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyped, ITileEntityProvider { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java b/src/main/java/forestry/arboriculture/blocks/BlockTreeContainer.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java rename to src/main/java/forestry/arboriculture/blocks/BlockTreeContainer.java index 543f67106..4c0aae430 --- a/src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockTreeContainer.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.Random; @@ -17,6 +17,8 @@ import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import forestry.arboriculture.tiles.TileTreeContainer; + public abstract class BlockTreeContainer extends BlockContainer { protected BlockTreeContainer(Material material) { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockWood.java b/src/main/java/forestry/arboriculture/blocks/BlockWood.java similarity index 92% rename from src/main/java/forestry/arboriculture/gadgets/BlockWood.java rename to src/main/java/forestry/arboriculture/blocks/BlockWood.java index 3b2e5db51..4a9ea6a0e 100644 --- a/src/main/java/forestry/arboriculture/gadgets/BlockWood.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockWood.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.blocks; import java.util.ArrayList; @@ -33,7 +33,8 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodType; -import forestry.core.utils.Utils; +import forestry.arboriculture.tiles.TileWood; +import forestry.core.tiles.TileUtil; public abstract class BlockWood extends Block implements ITileEntityProvider, IWoodTyped { @@ -60,7 +61,7 @@ public abstract class BlockWood extends Block implements ITileEntityProvider, IW } public static TileWood getWoodTile(IBlockAccess world, int x, int y, int z) { - return Utils.getTile(world, x, y, z, TileWood.class); + return TileUtil.getTile(world, x, y, z, TileWood.class); } protected static NBTTagCompound getTagCompound(IBlockAccess world, int x, int y, int z) { diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java index c3ec3c21d..24de32a2e 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java @@ -18,10 +18,10 @@ import forestry.api.arboriculture.EnumGrowthConditions; import forestry.api.arboriculture.IGrowthProvider; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; -import forestry.arboriculture.gadgets.TileSapling; +import forestry.arboriculture.tiles.TileSapling; +import forestry.core.utils.BlockUtil; import forestry.core.utils.StringUtil; -import forestry.core.utils.Utils; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class GrowthProvider implements IGrowthProvider { @@ -105,7 +105,7 @@ public class GrowthProvider implements IGrowthProvider { for (int x = start.x; x < start.x + area.x; x++) { for (int y = start.y; y < start.y + area.y; y++) { for (int z = start.z; z < start.z + area.z; z++) { - if (!world.isAirBlock(x, y, z) && !Utils.isReplaceableBlock(world, x, y, z)) { + if (!world.isAirBlock(x, y, z) && !BlockUtil.isReplaceableBlock(world, x, y, z)) { return false; } } diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 1658b8f59..8507b0b65 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -95,14 +95,14 @@ public class Tree extends Individual implements ITree, IPlantable { super.writeToNBT(nbttagcompound); if (genome != null) { - NBTTagCompound NBTmachine = new NBTTagCompound(); - genome.writeToNBT(NBTmachine); - nbttagcompound.setTag("Genome", NBTmachine); + NBTTagCompound nbtGenome = new NBTTagCompound(); + genome.writeToNBT(nbtGenome); + nbttagcompound.setTag("Genome", nbtGenome); } if (mate != null) { - NBTTagCompound NBTmachine = new NBTTagCompound(); - mate.writeToNBT(NBTmachine); - nbttagcompound.setTag("Mate", NBTmachine); + NBTTagCompound nbtMate = new NBTTagCompound(); + mate.writeToNBT(nbtMate); + nbttagcompound.setTag("Mate", nbtMate); } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index 50a7fe6a5..12acdc467 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -40,11 +40,11 @@ import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.world.ITreeGenData; import forestry.arboriculture.WoodType; -import forestry.arboriculture.gadgets.ForestryBlockLeaves; -import forestry.arboriculture.gadgets.TileLeaves; -import forestry.arboriculture.render.GermlingIconProvider; -import forestry.arboriculture.render.GermlingVanillaIconProvider; -import forestry.arboriculture.render.LeafIconProvider; +import forestry.arboriculture.blocks.BlockForestryLeaves; +import forestry.arboriculture.render.IconProviderGermling; +import forestry.arboriculture.render.IconProviderGermlingVanilla; +import forestry.arboriculture.render.IconProviderLeaves; +import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.worldgen.BlockTypeLog; import forestry.arboriculture.worldgen.WorldGenAcacia; import forestry.arboriculture.worldgen.WorldGenAcaciaVanilla; @@ -81,7 +81,7 @@ import forestry.arboriculture.worldgen.WorldGenWalnut; import forestry.arboriculture.worldgen.WorldGenWenge; import forestry.arboriculture.worldgen.WorldGenWillow; import forestry.arboriculture.worldgen.WorldGenZebrawood; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.genetics.alleles.Allele; import forestry.core.genetics.alleles.AlleleBoolean; @@ -960,8 +960,8 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { this.branch = branch; - ILeafIconProvider leafIconProvider = new LeafIconProvider(leafType, primary, secondary); - IGermlingIconProvider germlingIconProvider = new GermlingVanillaIconProvider(vanillaMeta); + ILeafIconProvider leafIconProvider = new IconProviderLeaves(leafType, primary, secondary); + IGermlingIconProvider germlingIconProvider = new IconProviderGermlingVanilla(vanillaMeta); this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, leafIconProvider, germlingIconProvider, this); this.woodType = null; @@ -976,8 +976,8 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { this.branch = branch; - ILeafIconProvider leafIconProvider = new LeafIconProvider(leafType, primary, secondary); - IGermlingIconProvider germlingIconProvider = new GermlingIconProvider(uid); + ILeafIconProvider leafIconProvider = new IconProviderLeaves(leafType, primary, secondary); + IGermlingIconProvider germlingIconProvider = new IconProviderGermling(uid); this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, leafIconProvider, germlingIconProvider, this); this.woodType = woodType; @@ -995,7 +995,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { if (woodType == null) { Block vanillaWoodBlock = Block.getBlockFromItem(vanillaWood.getItem()); int vanillaWoodMeta = vanillaWood.getItemDamage(); - world.setBlock(x, y, z, vanillaWoodBlock, vanillaWoodMeta, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(x, y, z, vanillaWoodBlock, vanillaWoodMeta, Constants.FLAG_BLOCK_SYNCH); } else { AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); boolean fireproof = fireproofAllele.getValue(); @@ -1019,7 +1019,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { return; } - TileLeaves tileLeaves = ForestryBlockLeaves.getLeafTile(world, x, y, z); + TileLeaves tileLeaves = BlockForestryLeaves.getLeafTile(world, x, y, z); if (tileLeaves == null) { world.setBlockToAir(x, y, z); return; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java index 40bad3d6b..6cc1e4521 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java @@ -20,7 +20,8 @@ import forestry.api.arboriculture.ITreeFactory; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; -import forestry.arboriculture.render.LeafIconProvider; +import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; +import forestry.arboriculture.render.IconProviderLeaves; public class TreeFactory implements ITreeFactory { @Override @@ -32,6 +33,6 @@ public class TreeFactory implements ITreeFactory { @Override public ILeafIconProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated) { - return new LeafIconProvider(enumLeafType, color, colorPollinated); + return new IconProviderLeaves(enumLeafType, color, colorPollinated); } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java index 8daddad18..337fb7717 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java @@ -46,10 +46,10 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; -import forestry.arboriculture.gadgets.BlockFruitPod; -import forestry.arboriculture.gadgets.TileFruitPod; -import forestry.arboriculture.gadgets.TileSapling; -import forestry.core.config.Defaults; +import forestry.arboriculture.blocks.BlockFruitPod; +import forestry.arboriculture.tiles.TileFruitPod; +import forestry.arboriculture.tiles.TileSapling; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.genetics.SpeciesRoot; @@ -66,7 +66,7 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot { private final ArrayList treekeepingModes = new ArrayList(); public TreeHelper() { - setResearchSuitability(new ItemStack(Blocks.sapling, 1, Defaults.WILDCARD), 1.0f); + setResearchSuitability(new ItemStack(Blocks.sapling, 1, Constants.WILDCARD), 1.0f); } @Override @@ -189,7 +189,7 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot { @Override public boolean plantSapling(World world, ITree tree, GameProfile owner, int x, int y, int z) { - boolean placed = world.setBlock(x, y, z, ForestryBlock.saplingGE.block(), 0, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + boolean placed = world.setBlock(x, y, z, ForestryBlock.saplingGE.block(), 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return false; } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index 23b0c643b..4d545df48 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -18,7 +18,7 @@ import forestry.api.arboriculture.ITreeMutationCustom; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; -import forestry.core.genetics.Mutation; +import forestry.core.genetics.mutations.Mutation; public class TreeMutation extends Mutation implements ITreeMutationCustom { diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/arboriculture/genetics/AlleleFruit.java rename to src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java index e60ecab6f..be3f40786 --- a/src/main/java/forestry/arboriculture/genetics/AlleleFruit.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.alleles; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IFruitProvider; diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleGrowth.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/arboriculture/genetics/AlleleGrowth.java rename to src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java index 7e143c476..414c44df7 --- a/src/main/java/forestry/arboriculture/genetics/AlleleGrowth.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.alleles; import forestry.api.arboriculture.IAlleleGrowth; import forestry.api.arboriculture.IGrowthProvider; diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffectNone.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java rename to src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffectNone.java index 3c868736e..5c1680125 --- a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffectNone.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.alleles; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; @@ -17,7 +17,7 @@ import forestry.api.arboriculture.IAlleleLeafEffect; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IEffectData; import forestry.core.genetics.alleles.AlleleCategorized; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class AlleleLeafEffectNone extends AlleleCategorized implements IAlleleLeafEffect { diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java rename to src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index 7e547417e..3dff2277d --- a/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.alleles; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/forestry/arboriculture/genetics/CheckPollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java similarity index 92% rename from src/main/java/forestry/arboriculture/genetics/CheckPollinatable.java rename to src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java index 44768c89e..18de8309d 100644 --- a/src/main/java/forestry/arboriculture/genetics/CheckPollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.pollination; import java.util.EnumSet; diff --git a/src/main/java/forestry/arboriculture/genetics/CheckPollinatableTree.java b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java similarity index 92% rename from src/main/java/forestry/arboriculture/genetics/CheckPollinatableTree.java rename to src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java index 8d6ac99d6..36f8fa90f 100644 --- a/src/main/java/forestry/arboriculture/genetics/CheckPollinatableTree.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.pollination; import java.util.EnumSet; diff --git a/src/main/java/forestry/arboriculture/genetics/FakePollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java similarity index 89% rename from src/main/java/forestry/arboriculture/genetics/FakePollinatable.java rename to src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java index f5f50ac83..746588c60 100644 --- a/src/main/java/forestry/arboriculture/genetics/FakePollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java @@ -1,4 +1,4 @@ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.pollination; import java.util.EnumSet; diff --git a/src/main/java/forestry/arboriculture/genetics/ICheckPollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java similarity index 93% rename from src/main/java/forestry/arboriculture/genetics/ICheckPollinatable.java rename to src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java index e8d2ac8fc..d443d2fd6 100644 --- a/src/main/java/forestry/arboriculture/genetics/ICheckPollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.genetics; +package forestry.arboriculture.genetics.pollination; import java.util.EnumSet; diff --git a/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java similarity index 92% rename from src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java rename to src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java index ce032b740..d2c715c66 100644 --- a/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java @@ -16,15 +16,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import forestry.arboriculture.gadgets.TileLeaves; -import forestry.core.items.ItemForestryBlock; +import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.items.ItemBlockForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; import forestry.plugins.PluginArboriculture; -public class ItemLeavesBlock extends ItemForestryBlock { +public class ItemBlockLeaves extends ItemBlockForestry { - public ItemLeavesBlock(Block block) { + public ItemBlockLeaves(Block block) { super(block); } diff --git a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/arboriculture/items/ItemWoodBlock.java rename to src/main/java/forestry/arboriculture/items/ItemBlockWood.java index 89362d662..4ea6aeb0b --- a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java @@ -20,14 +20,14 @@ import net.minecraft.world.World; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodType; -import forestry.arboriculture.gadgets.TileWood; -import forestry.core.config.Defaults; -import forestry.core.items.ItemForestryBlock; +import forestry.arboriculture.tiles.TileWood; +import forestry.core.config.Constants; +import forestry.core.items.ItemBlockForestry; import forestry.core.utils.StringUtil; -public class ItemWoodBlock extends ItemForestryBlock { +public class ItemBlockWood extends ItemBlockForestry { - public ItemWoodBlock(Block block) { + public ItemBlockWood(Block block) { super(block); } @@ -35,7 +35,7 @@ public class ItemWoodBlock extends ItemForestryBlock { WoodType woodType = WoodType.getFromCompound(stack.getTagCompound()); Block block = Block.getBlockFromItem(stack.getItem()); - boolean placed = world.setBlock(x, y, z, block, metadata, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + boolean placed = world.setBlock(x, y, z, block, metadata, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return false; } diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index 5ee9bdbbf..ca72ec1fa 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -31,18 +31,18 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.api.recipes.IVariableFermentable; -import forestry.arboriculture.genetics.ICheckPollinatable; import forestry.arboriculture.genetics.Tree; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.TreeGenome; +import forestry.arboriculture.genetics.pollination.ICheckPollinatable; import forestry.core.config.Config; import forestry.core.genetics.ItemGE; import forestry.core.network.PacketFXSignal; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; +import forestry.core.utils.BlockUtil; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.StringUtil; -import forestry.core.utils.Utils; public class ItemGermlingGE extends ItemGE implements IVariableFermentable { @@ -153,7 +153,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { if (type == EnumGermlingType.SAPLING) { // x, y, z are the coordinates of the block "hit", can thus either be the soil or tall grass, etc. int yShift; - if (!Utils.isReplaceableBlock(world, x, y, z)) { + if (!BlockUtil.isReplaceableBlock(world, x, y, z)) { if (!world.isAirBlock(x, y + 1, z)) { return false; } diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index 88c9fa630..10e785a0b 100755 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java @@ -20,14 +20,29 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.core.config.Config; -import forestry.core.interfaces.IHintSource; -import forestry.core.inventory.AlyzerInventory; -import forestry.core.items.ItemInventoried; +import forestry.core.gui.IHintSource; +import forestry.core.items.ItemAlyzer; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.GeneticsUtil; -public class ItemTreealyzer extends ItemInventoried { +public class ItemTreealyzer extends ItemAlyzer { + + public ItemTreealyzer() { + super(); + setMaxStackSize(1); + setCreativeTab(Tabs.tabArboriculture); + } + + @Override + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { + if (Proxies.common.isSimulating(world)) { + entityplayer.openGui(ForestryAPI.instance, GuiId.TreealyzerGUI.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY, + (int) entityplayer.posZ); + } + + return itemstack; + } public static class TreealyzerInventory extends AlyzerInventory implements IHintSource { @@ -96,19 +111,4 @@ public class ItemTreealyzer extends ItemInventoried { } } - public ItemTreealyzer() { - super(); - setMaxStackSize(1); - setCreativeTab(Tabs.tabArboriculture); - } - - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - if (Proxies.common.isSimulating(world)) { - entityplayer.openGui(ForestryAPI.instance, GuiId.TreealyzerGUI.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY, - (int) entityplayer.posZ); - } - - return itemstack; - } } diff --git a/src/main/java/forestry/arboriculture/network/PacketRipeningUpdate.java b/src/main/java/forestry/arboriculture/network/PacketRipeningUpdate.java index a612a7c41..3f572bc86 100644 --- a/src/main/java/forestry/arboriculture/network/PacketRipeningUpdate.java +++ b/src/main/java/forestry/arboriculture/network/PacketRipeningUpdate.java @@ -14,8 +14,8 @@ import java.io.IOException; import net.minecraft.tileentity.TileEntity; -import forestry.arboriculture.gadgets.TileFruitPod; -import forestry.arboriculture.gadgets.TileLeaves; +import forestry.arboriculture.tiles.TileFruitPod; +import forestry.arboriculture.tiles.TileLeaves; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketCoordinates; diff --git a/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java old mode 100755 new mode 100644 similarity index 62% rename from src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java rename to src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index 542d6deba..a3ed556ee --- a/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -16,46 +16,45 @@ import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.RenderingRegistry; -import forestry.arboriculture.render.FenceRenderingHandler; -import forestry.arboriculture.render.FruitPodRenderingHandler; -import forestry.arboriculture.render.LeavesRenderingHandler; -import forestry.arboriculture.render.LogItemRenderer; -import forestry.arboriculture.render.PlankItemRenderer; -import forestry.arboriculture.render.SaplingRenderHandler; -import forestry.arboriculture.render.SlabItemRenderer; -import forestry.arboriculture.render.StairItemRenderer; +import forestry.arboriculture.render.RenderFenceItem; +import forestry.arboriculture.render.RenderFruitPodBlock; +import forestry.arboriculture.render.RenderLeavesBlock; +import forestry.arboriculture.render.RenderLeavesItem; +import forestry.arboriculture.render.RenderLogItem; +import forestry.arboriculture.render.RenderPlankItem; +import forestry.arboriculture.render.RenderSaplingBlock; +import forestry.arboriculture.render.RenderSlabItem; +import forestry.arboriculture.render.RenderStairItem; import forestry.core.config.ForestryBlock; import forestry.plugins.PluginArboriculture; -public class ClientProxyArboriculture extends ProxyArboriculture { +public class ProxyArboricultureClient extends ProxyArboriculture { @Override public void initializeRendering() { PluginArboriculture.modelIdSaplings = RenderingRegistry.getNextAvailableRenderId(); PluginArboriculture.modelIdLeaves = RenderingRegistry.getNextAvailableRenderId(); - PluginArboriculture.modelIdFences = RenderingRegistry.getNextAvailableRenderId(); PluginArboriculture.modelIdPods = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new SaplingRenderHandler()); - RenderingRegistry.registerBlockHandler(new LeavesRenderingHandler()); - RenderingRegistry.registerBlockHandler(new FenceRenderingHandler()); - RenderingRegistry.registerBlockHandler(new FruitPodRenderingHandler()); + RenderingRegistry.registerBlockHandler(new RenderSaplingBlock()); + RenderingRegistry.registerBlockHandler(new RenderLeavesBlock()); + RenderingRegistry.registerBlockHandler(new RenderFruitPodBlock()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.logs.item(), new LogItemRenderer()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.logsFireproof.item(), new LogItemRenderer()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.logs.item(), new RenderLogItem()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.logsFireproof.item(), new RenderLogItem()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.stairs.item(), new StairItemRenderer()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.stairsFireproof.item(), new StairItemRenderer()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.stairs.item(), new RenderStairItem()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.stairsFireproof.item(), new RenderStairItem()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.planks.item(), new PlankItemRenderer()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.planksFireproof.item(), new PlankItemRenderer()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.planks.item(), new RenderPlankItem()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.planksFireproof.item(), new RenderPlankItem()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.slabs.item(), new SlabItemRenderer()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.slabsFireproof.item(), new SlabItemRenderer()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.slabs.item(), new RenderSlabItem()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.slabsFireproof.item(), new RenderSlabItem()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.fences.item(), new FenceRenderingHandler()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.fencesFireproof.item(), new FenceRenderingHandler()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.fences.item(), new RenderFenceItem()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.fencesFireproof.item(), new RenderFenceItem()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.leaves.item(), new LeavesRenderingHandler()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.leaves.item(), new RenderLeavesItem()); } @Override diff --git a/src/main/java/forestry/arboriculture/render/GermlingIconProvider.java b/src/main/java/forestry/arboriculture/render/IconProviderGermling.java similarity index 90% rename from src/main/java/forestry/arboriculture/render/GermlingIconProvider.java rename to src/main/java/forestry/arboriculture/render/IconProviderGermling.java index e76f24050..272a00e95 100644 --- a/src/main/java/forestry/arboriculture/render/GermlingIconProvider.java +++ b/src/main/java/forestry/arboriculture/render/IconProviderGermling.java @@ -18,13 +18,13 @@ import forestry.api.arboriculture.IGermlingIconProvider; import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; -public class GermlingIconProvider implements IGermlingIconProvider { +public class IconProviderGermling implements IGermlingIconProvider { private final String name; private IIcon icon; - public GermlingIconProvider(String uid) { + public IconProviderGermling(String uid) { this.name = uid.substring("forestry.".length()); } diff --git a/src/main/java/forestry/arboriculture/render/GermlingVanillaIconProvider.java b/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java similarity index 89% rename from src/main/java/forestry/arboriculture/render/GermlingVanillaIconProvider.java rename to src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java index ea16c8af5..c02b188bd 100644 --- a/src/main/java/forestry/arboriculture/render/GermlingVanillaIconProvider.java +++ b/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java @@ -18,12 +18,12 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IGermlingIconProvider; import forestry.core.config.ForestryItem; -public class GermlingVanillaIconProvider implements IGermlingIconProvider { +public class IconProviderGermlingVanilla implements IGermlingIconProvider { private final int vanillaMap; private IIcon icon; - public GermlingVanillaIconProvider(int vanillaMap) { + public IconProviderGermlingVanilla(int vanillaMap) { this.vanillaMap = vanillaMap; } diff --git a/src/main/java/forestry/arboriculture/render/LeafIconProvider.java b/src/main/java/forestry/arboriculture/render/IconProviderLeaves.java similarity index 81% rename from src/main/java/forestry/arboriculture/render/LeafIconProvider.java rename to src/main/java/forestry/arboriculture/render/IconProviderLeaves.java index daa18ba14..9b0112777 100644 --- a/src/main/java/forestry/arboriculture/render/LeafIconProvider.java +++ b/src/main/java/forestry/arboriculture/render/IconProviderLeaves.java @@ -17,14 +17,14 @@ import net.minecraft.util.IIcon; import forestry.api.arboriculture.EnumLeafType; import forestry.api.arboriculture.ILeafIconProvider; -public class LeafIconProvider implements ILeafIconProvider { +public class IconProviderLeaves implements ILeafIconProvider { - private final LeafTexture leafTexture; + private final TextureLeaves leafTexture; private final int color; private final int colorPollinated; - public LeafIconProvider(EnumLeafType leafType, Color color, Color colorPollinated) { - this.leafTexture = LeafTexture.get(leafType); + public IconProviderLeaves(EnumLeafType leafType, Color color, Color colorPollinated) { + this.leafTexture = TextureLeaves.get(leafType); this.color = color.getRGB(); this.colorPollinated = colorPollinated.getRGB(); } diff --git a/src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java b/src/main/java/forestry/arboriculture/render/RenderFenceItem.java old mode 100755 new mode 100644 similarity index 82% rename from src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java rename to src/main/java/forestry/arboriculture/render/RenderFenceItem.java index 492c2990f..70529d8ba --- a/src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java +++ b/src/main/java/forestry/arboriculture/render/RenderFenceItem.java @@ -1,155 +1,129 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import net.minecraftforge.client.IItemRenderer; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import org.lwjgl.opengl.GL11; - -import forestry.arboriculture.WoodType; -import forestry.plugins.PluginArboriculture; - -public class FenceRenderingHandler implements ISimpleBlockRenderingHandler, IItemRenderer { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - // uses IItemRenderer - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return renderer.renderBlockFence((BlockFence) block, x, y, z); - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return PluginArboriculture.modelIdFences; - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch (type) { - case ENTITY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); - break; - case INVENTORY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - default: - } - } - - private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z) { - Tessellator tess = Tessellator.instance; - - WoodType woodType = WoodType.getFromCompound(itemStack.getTagCompound()); - IIcon plankIcon = woodType.getPlankIcon(); - Block block = Block.getBlockFromItem(itemStack.getItem()); - - for (int i = 0; i < 4; ++i) { - - float thickness = 0.125F; - - if (i == 0) { - block.setBlockBounds(0.5F - thickness, 0.0F, 0.0F, 0.5F + thickness, 1.0F, thickness * 2.0F); - } - - if (i == 1) { - block.setBlockBounds(0.5F - thickness, 0.0F, 1.0F - thickness * 2.0F, 0.5F + thickness, 1.0F, 1.0F); - } - - thickness = 0.0625F; - - if (i == 2) { - block.setBlockBounds(0.5F - thickness, 1.0F - thickness * 3.0F, -thickness * 2.0F, 0.5F + thickness, 1.0F - thickness, 1.0F + thickness * 2.0F); - } - - if (i == 3) { - block.setBlockBounds(0.5F - thickness, 0.5F - thickness * 3.0F, -thickness * 2.0F, 0.5F + thickness, 0.5F - thickness, 1.0F + thickness * 2.0F); - } - - renderer.setRenderBoundsFromBlock(block); - - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tess.startDrawingQuads(); - tess.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, x, y, z, plankIcon); - tess.draw(); - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.setRenderBoundsFromBlock(block); - } -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import forestry.arboriculture.WoodType; + +public class RenderFenceItem implements IItemRenderer { + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + switch (type) { + case ENTITY: + case EQUIPPED_FIRST_PERSON: + case EQUIPPED: + case INVENTORY: + return true; + default: + return false; + } + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + switch (type) { + case ENTITY: + renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); + break; + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); + break; + case INVENTORY: + renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); + break; + default: + } + } + + private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z) { + Tessellator tess = Tessellator.instance; + + WoodType woodType = WoodType.getFromCompound(itemStack.getTagCompound()); + IIcon plankIcon = woodType.getPlankIcon(); + Block block = Block.getBlockFromItem(itemStack.getItem()); + + for (int i = 0; i < 4; ++i) { + + float thickness = 0.125F; + + if (i == 0) { + block.setBlockBounds(0.5F - thickness, 0.0F, 0.0F, 0.5F + thickness, 1.0F, thickness * 2.0F); + } + + if (i == 1) { + block.setBlockBounds(0.5F - thickness, 0.0F, 1.0F - thickness * 2.0F, 0.5F + thickness, 1.0F, 1.0F); + } + + thickness = 0.0625F; + + if (i == 2) { + block.setBlockBounds(0.5F - thickness, 1.0F - thickness * 3.0F, -thickness * 2.0F, 0.5F + thickness, 1.0F - thickness, 1.0F + thickness * 2.0F); + } + + if (i == 3) { + block.setBlockBounds(0.5F - thickness, 0.5F - thickness * 3.0F, -thickness * 2.0F, 0.5F + thickness, 0.5F - thickness, 1.0F + thickness * 2.0F); + } + + renderer.setRenderBoundsFromBlock(block); + + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tess.startDrawingQuads(); + tess.setNormal(0.0F, -1.0F, 0.0F); + renderer.renderFaceYNeg(block, x, y, z, plankIcon); + tess.draw(); + + tess.startDrawingQuads(); + tess.setNormal(0.0F, 1.0F, 0.0F); + renderer.renderFaceYPos(block, x, y, z, plankIcon); + tess.draw(); + + tess.startDrawingQuads(); + tess.setNormal(0.0F, 0.0F, -1.0F); + renderer.renderFaceZNeg(block, x, y, z, plankIcon); + tess.draw(); + + tess.startDrawingQuads(); + tess.setNormal(0.0F, 0.0F, 1.0F); + renderer.renderFaceZPos(block, x, y, z, plankIcon); + tess.draw(); + + tess.startDrawingQuads(); + tess.setNormal(-1.0F, 0.0F, 0.0F); + renderer.renderFaceXNeg(block, x, y, z, plankIcon); + tess.draw(); + + tess.startDrawingQuads(); + tess.setNormal(1.0F, 0.0F, 0.0F); + renderer.renderFaceXPos(block, x, y, z, plankIcon); + tess.draw(); + + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + + block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.setRenderBoundsFromBlock(block); + } +} diff --git a/src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java b/src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java rename to src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java index 0ca62200d..63cc27c39 --- a/src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java +++ b/src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java @@ -19,11 +19,11 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import forestry.arboriculture.gadgets.BlockFruitPod; -import forestry.arboriculture.gadgets.TileFruitPod; +import forestry.arboriculture.blocks.BlockFruitPod; +import forestry.arboriculture.tiles.TileFruitPod; import forestry.plugins.PluginArboriculture; -public class FruitPodRenderingHandler implements ISimpleBlockRenderingHandler { +public class RenderFruitPodBlock implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { diff --git a/src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java b/src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java new file mode 100644 index 000000000..77d94e2c8 --- /dev/null +++ b/src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + +import forestry.arboriculture.blocks.BlockForestryLeaves; +import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.render.RenderOverlayBlock; +import forestry.plugins.PluginArboriculture; + +/** + * Ugly but serviceable renderer for leaves, taking fruits into account. + */ +public class RenderLeavesBlock extends RenderOverlayBlock { + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + // uses IItemRenderer + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + + TileLeaves tile = BlockForestryLeaves.getLeafTile(world, x, y, z); + if (tile == null) { + return false; + } + + // Render the plain leaf block. + renderer.renderStandardBlock(block, x, y, z); + + // Render overlay for fruit leaves. + IIcon fruitIcon = tile.getFruitTexture(); + + if (fruitIcon != null) { + int fruitColor = tile.getFruitColour(); + renderFruitOverlay(world, block, x, y, z, renderer, fruitIcon, fruitColor); + } + + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return PluginArboriculture.modelIdLeaves; + } + + private static boolean renderFruitOverlay(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon texture, int multiplier) { + + float mR = (multiplier >> 16 & 255) / 255.0F; + float mG = (multiplier >> 8 & 255) / 255.0F; + float mB = (multiplier & 255) / 255.0F; + + if (EntityRenderer.anaglyphEnable) { + mR = (mR * 30.0F + mG * 59.0F + mB * 11.0F) / 100.0F; + mG = (mR * 30.0F + mG * 70.0F) / 100.0F; + mB = (mR * 30.0F + mB * 70.0F) / 100.0F; + } + + return renderFruitOverlayWithColorMultiplier(world, block, x, y, z, mR, mG, mB, renderer, texture); + } + + private static boolean renderFruitOverlayWithColorMultiplier(IBlockAccess world, Block block, int x, int y, int z, float r, float g, float b, + RenderBlocks renderer, IIcon texture) { + + int mixedBrightness = block.getMixedBrightnessForBlock(world, x, y, z); + + float adjR = 0.5f * r; + float adjG = 0.5f * g; + float adjB = 0.5f * b; + + // Bottom + renderBottomFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderTopFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderEastFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderWestFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderNorthFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderSouthFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); + + return true; + } +} diff --git a/src/main/java/forestry/arboriculture/render/LeavesRenderingHandler.java b/src/main/java/forestry/arboriculture/render/RenderLeavesItem.java old mode 100755 new mode 100644 similarity index 60% rename from src/main/java/forestry/arboriculture/render/LeavesRenderingHandler.java rename to src/main/java/forestry/arboriculture/render/RenderLeavesItem.java index b84f35819..6f7a7b815 --- a/src/main/java/forestry/arboriculture/render/LeavesRenderingHandler.java +++ b/src/main/java/forestry/arboriculture/render/RenderLeavesItem.java @@ -1,256 +1,176 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.arboriculture.gadgets.ForestryBlockLeaves; -import forestry.arboriculture.gadgets.TileLeaves; -import forestry.arboriculture.genetics.TreeHelper; -import forestry.arboriculture.items.ItemLeavesBlock; -import forestry.core.proxy.Proxies; -import forestry.core.render.OverlayRenderingHandler; -import forestry.core.utils.StackUtils; -import forestry.plugins.PluginArboriculture; - -/** - * Ugly but serviceable renderer for leaves, taking fruits into account. - */ -public class LeavesRenderingHandler extends OverlayRenderingHandler implements IItemRenderer { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - // see IItemRenderer section below for inventory rendering - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - TileLeaves tile = ForestryBlockLeaves.getLeafTile(world, x, y, z); - if (tile == null) { - return false; - } - - // Render the plain leaf block. - renderer.renderStandardBlock(block, x, y, z); - - // Render overlay for fruit leaves. - IIcon fruitIcon = tile.getFruitTexture(); - - if (fruitIcon != null) { - int fruitColor = tile.getFruitColour(); - renderFruitOverlay(world, block, x, y, z, renderer, fruitIcon, fruitColor); - } - - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return PluginArboriculture.modelIdLeaves; - } - - private static boolean renderFruitOverlay(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon texture, int multiplier) { - - float mR = (multiplier >> 16 & 255) / 255.0F; - float mG = (multiplier >> 8 & 255) / 255.0F; - float mB = (multiplier & 255) / 255.0F; - - if (EntityRenderer.anaglyphEnable) { - mR = (mR * 30.0F + mG * 59.0F + mB * 11.0F) / 100.0F; - mG = (mR * 30.0F + mG * 70.0F) / 100.0F; - mB = (mR * 30.0F + mB * 70.0F) / 100.0F; - } - - return renderFruitOverlayWithColorMultiplier(world, block, x, y, z, mR, mG, mB, renderer, texture); - } - - private static boolean renderFruitOverlayWithColorMultiplier(IBlockAccess world, Block block, int x, int y, int z, float r, float g, float b, - RenderBlocks renderer, IIcon texture) { - - int mixedBrightness = block.getMixedBrightnessForBlock(world, x, y, z); - - float adjR = 0.5f * r; - float adjG = 0.5f * g; - float adjB = 0.5f * b; - - // Bottom - renderBottomFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderTopFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderEastFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderWestFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderNorthFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderSouthFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - - return true; - } - - /* IItemRenderer */ - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch (type) { - case ENTITY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); - break; - case INVENTORY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - default: - } - } - - private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z) { - Tessellator tessellator = Tessellator.instance; - Block block = StackUtils.getBlock(itemStack); - - if (!(itemStack.getItem() instanceof ItemLeavesBlock) || block == null) { - return; - } - - TileLeaves leaves = new TileLeaves(); - if (itemStack.hasTagCompound()) { - leaves.readFromNBT(itemStack.getTagCompound()); - } else { - leaves.setTree(TreeHelper.treeTemplates.get(0)); - } - - GL11.glEnable(GL11.GL_BLEND); - - IIcon leavesIcon = leaves.getIcon(Proxies.render.fancyGraphicsEnabled()); - if (leavesIcon == null) { - return; - } - int color = leaves.getFoliageColour(Proxies.common.getPlayer()); - - float r1 = (float) (color >> 16 & 255) / 255.0F; - float g1 = (float) (color >> 8 & 255) / 255.0F; - float b1 = (float) (color & 255) / 255.0F; - GL11.glColor4f(r1, g1, b1, 1.0F); - - GL11.glTranslatef(x, y, z); - - block.setBlockBoundsForItemRender(); - renderer.setRenderBoundsFromBlock(block); - - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - - - // add fruit - if (!leaves.hasFruit()) { - return; - } - - IIcon fruitTexture = leaves.getFruitTexture(); - if (fruitTexture == null) { - return; - } - int fruitColor = leaves.getFruitColour(); - - float r2 = (float) (fruitColor >> 16 & 255) / 255.0F; - float g2 = (float) (fruitColor >> 8 & 255) / 255.0F; - float b2 = (float) (fruitColor & 255) / 255.0F; - GL11.glColor4f(r2, g2, b2, 1.0F); - - block.setBlockBoundsForItemRender(); - renderer.setRenderBoundsFromBlock(block); - - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D - OVERLAY_SHIFT, 0.0D, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D + OVERLAY_SHIFT, 0.0D, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D - OVERLAY_SHIFT, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D + OVERLAY_SHIFT, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D - OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D + OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import forestry.arboriculture.genetics.TreeHelper; +import forestry.arboriculture.items.ItemBlockLeaves; +import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.proxy.Proxies; +import forestry.core.utils.ItemStackUtil; + +public class RenderLeavesItem implements IItemRenderer { + protected static final double OVERLAY_SHIFT = 0.001; + + @Override + public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { + switch (type) { + case ENTITY: + case EQUIPPED_FIRST_PERSON: + case EQUIPPED: + case INVENTORY: + return true; + default: + return false; + } + } + + @Override + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { + switch (type) { + case ENTITY: + renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); + break; + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); + break; + case INVENTORY: + renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); + break; + default: + } + } + + private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z) { + Tessellator tessellator = Tessellator.instance; + Block block = ItemStackUtil.getBlock(itemStack); + + if (!(itemStack.getItem() instanceof ItemBlockLeaves) || block == null) { + return; + } + + TileLeaves leaves = new TileLeaves(); + if (itemStack.hasTagCompound()) { + leaves.readFromNBT(itemStack.getTagCompound()); + } else { + leaves.setTree(TreeHelper.treeTemplates.get(0)); + } + + GL11.glEnable(GL11.GL_BLEND); + + IIcon leavesIcon = leaves.getIcon(Proxies.render.fancyGraphicsEnabled()); + if (leavesIcon == null) { + return; + } + int color = leaves.getFoliageColour(Proxies.common.getPlayer()); + + float r1 = (float) (color >> 16 & 255) / 255.0F; + float g1 = (float) (color >> 8 & 255) / 255.0F; + float b1 = (float) (color & 255) / 255.0F; + GL11.glColor4f(r1, g1, b1, 1.0F); + + GL11.glTranslatef(x, y, z); + + block.setBlockBoundsForItemRender(); + renderer.setRenderBoundsFromBlock(block); + + GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1.0F, 0.0F); + renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1.0F); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1.0F, 0.0F, 0.0F); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + + + // add fruit + if (!leaves.hasFruit()) { + return; + } + + IIcon fruitTexture = leaves.getFruitTexture(); + if (fruitTexture == null) { + return; + } + int fruitColor = leaves.getFruitColour(); + + float r2 = (float) (fruitColor >> 16 & 255) / 255.0F; + float g2 = (float) (fruitColor >> 8 & 255) / 255.0F; + float b2 = (float) (fruitColor & 255) / 255.0F; + GL11.glColor4f(r2, g2, b2, 1.0F); + + block.setBlockBoundsForItemRender(); + renderer.setRenderBoundsFromBlock(block); + + GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1.0F, 0.0F); + renderer.renderFaceYNeg(block, 0.0D, 0.0D - OVERLAY_SHIFT, 0.0D, fruitTexture); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderer.renderFaceYPos(block, 0.0D, 0.0D + OVERLAY_SHIFT, 0.0D, fruitTexture); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1.0F); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D - OVERLAY_SHIFT, fruitTexture); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D + OVERLAY_SHIFT, fruitTexture); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1.0F, 0.0F, 0.0F); + renderer.renderFaceXNeg(block, 0.0D - OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderer.renderFaceXPos(block, 0.0D + OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } +} diff --git a/src/main/java/forestry/arboriculture/render/LogItemRenderer.java b/src/main/java/forestry/arboriculture/render/RenderLogItem.java similarity index 90% rename from src/main/java/forestry/arboriculture/render/LogItemRenderer.java rename to src/main/java/forestry/arboriculture/render/RenderLogItem.java index 618db75bc..b0611ad5b 100644 --- a/src/main/java/forestry/arboriculture/render/LogItemRenderer.java +++ b/src/main/java/forestry/arboriculture/render/RenderLogItem.java @@ -21,10 +21,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import forestry.arboriculture.WoodType; -import forestry.arboriculture.items.ItemWoodBlock; -import forestry.core.utils.StackUtils; +import forestry.arboriculture.items.ItemBlockWood; +import forestry.core.utils.ItemStackUtil; -public class LogItemRenderer implements IItemRenderer { +public class RenderLogItem implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { switch (type) { @@ -62,9 +62,9 @@ public class LogItemRenderer implements IItemRenderer { private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z, boolean fullBlock) { Tessellator tessellator = Tessellator.instance; - Block block = StackUtils.getBlock(itemStack); + Block block = ItemStackUtil.getBlock(itemStack); - if (!(itemStack.getItem() instanceof ItemWoodBlock) || block == null) { + if (!(itemStack.getItem() instanceof ItemBlockWood) || block == null) { return; } diff --git a/src/main/java/forestry/arboriculture/render/PlankItemRenderer.java b/src/main/java/forestry/arboriculture/render/RenderPlankItem.java similarity index 89% rename from src/main/java/forestry/arboriculture/render/PlankItemRenderer.java rename to src/main/java/forestry/arboriculture/render/RenderPlankItem.java index e9c6ff219..16df30ca0 100644 --- a/src/main/java/forestry/arboriculture/render/PlankItemRenderer.java +++ b/src/main/java/forestry/arboriculture/render/RenderPlankItem.java @@ -21,10 +21,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import forestry.arboriculture.WoodType; -import forestry.arboriculture.items.ItemWoodBlock; -import forestry.core.utils.StackUtils; +import forestry.arboriculture.items.ItemBlockWood; +import forestry.core.utils.ItemStackUtil; -public class PlankItemRenderer implements IItemRenderer { +public class RenderPlankItem implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { switch (type) { @@ -62,9 +62,9 @@ public class PlankItemRenderer implements IItemRenderer { private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z, boolean fullBlock) { Tessellator tessellator = Tessellator.instance; - Block block = StackUtils.getBlock(itemStack); + Block block = ItemStackUtil.getBlock(itemStack); - if (!(itemStack.getItem() instanceof ItemWoodBlock) || block == null) { + if (!(itemStack.getItem() instanceof ItemBlockWood) || block == null) { return; } diff --git a/src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java b/src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java rename to src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java index 688d76b52..433fc19b0 --- a/src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java +++ b/src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java @@ -21,11 +21,11 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.arboriculture.gadgets.BlockSapling; -import forestry.arboriculture.gadgets.TileSapling; +import forestry.arboriculture.blocks.BlockSapling; +import forestry.arboriculture.tiles.TileSapling; import forestry.plugins.PluginArboriculture; -public class SaplingRenderHandler implements ISimpleBlockRenderingHandler { +public class RenderSaplingBlock implements ISimpleBlockRenderingHandler { private static int renderLayer = 0; diff --git a/src/main/java/forestry/arboriculture/render/SlabItemRenderer.java b/src/main/java/forestry/arboriculture/render/RenderSlabItem.java similarity index 88% rename from src/main/java/forestry/arboriculture/render/SlabItemRenderer.java rename to src/main/java/forestry/arboriculture/render/RenderSlabItem.java index ab40f0d33..92e953d43 100644 --- a/src/main/java/forestry/arboriculture/render/SlabItemRenderer.java +++ b/src/main/java/forestry/arboriculture/render/RenderSlabItem.java @@ -11,10 +11,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import forestry.arboriculture.WoodType; -import forestry.arboriculture.items.ItemWoodBlock; -import forestry.core.utils.StackUtils; +import forestry.arboriculture.items.ItemBlockWood; +import forestry.core.utils.ItemStackUtil; -public class SlabItemRenderer implements IItemRenderer { +public class RenderSlabItem implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { switch (type) { @@ -52,9 +52,9 @@ public class SlabItemRenderer implements IItemRenderer { private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z, boolean fullBlock) { Tessellator tessellator = Tessellator.instance; - Block block = StackUtils.getBlock(itemStack); + Block block = ItemStackUtil.getBlock(itemStack); - if (!(itemStack.getItem() instanceof ItemWoodBlock) || block == null) { + if (!(itemStack.getItem() instanceof ItemBlockWood) || block == null) { return; } diff --git a/src/main/java/forestry/arboriculture/render/StairItemRenderer.java b/src/main/java/forestry/arboriculture/render/RenderStairItem.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/arboriculture/render/StairItemRenderer.java rename to src/main/java/forestry/arboriculture/render/RenderStairItem.java index b017ae852..ae4c18d04 --- a/src/main/java/forestry/arboriculture/render/StairItemRenderer.java +++ b/src/main/java/forestry/arboriculture/render/RenderStairItem.java @@ -21,9 +21,9 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import forestry.arboriculture.WoodType; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; -public class StairItemRenderer implements IItemRenderer { +public class RenderStairItem implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -63,7 +63,7 @@ public class StairItemRenderer implements IItemRenderer { private static void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float x, float y, float z) { Tessellator tessellator = Tessellator.instance; - Block block = StackUtils.getBlock(item); + Block block = ItemStackUtil.getBlock(item); IIcon texture = WoodType.getFromCompound(item.getTagCompound()).getPlankIcon(); diff --git a/src/main/java/forestry/arboriculture/render/LeafTexture.java b/src/main/java/forestry/arboriculture/render/TextureLeaves.java similarity index 79% rename from src/main/java/forestry/arboriculture/render/LeafTexture.java rename to src/main/java/forestry/arboriculture/render/TextureLeaves.java index 32304c628..64d44890a 100644 --- a/src/main/java/forestry/arboriculture/render/LeafTexture.java +++ b/src/main/java/forestry/arboriculture/render/TextureLeaves.java @@ -20,21 +20,21 @@ import net.minecraft.util.IIcon; import forestry.api.arboriculture.EnumLeafType; import forestry.core.render.TextureManager; -public class LeafTexture { - private static final Map leafTextures = new EnumMap(EnumLeafType.class); +public class TextureLeaves { + private static final Map leafTextures = new EnumMap(EnumLeafType.class); static { for (EnumLeafType leafType : EnumLeafType.values()) { - leafTextures.put(leafType, new LeafTexture(leafType)); + leafTextures.put(leafType, new TextureLeaves(leafType)); } } - public static LeafTexture get(EnumLeafType leafType) { + public static TextureLeaves get(EnumLeafType leafType) { return leafTextures.get(leafType); } public static void registerAllIcons(IIconRegister register) { - for (LeafTexture leafTexture : leafTextures.values()) { + for (TextureLeaves leafTexture : leafTextures.values()) { leafTexture.registerIcons(register); } } @@ -45,7 +45,7 @@ public class LeafTexture { private IIcon pollinated; private IIcon fancy; - private LeafTexture(EnumLeafType enumLeafType) { + private TextureLeaves(EnumLeafType enumLeafType) { this.leafType = enumLeafType; } diff --git a/src/main/java/forestry/arboriculture/gadgets/TileArboristChest.java b/src/main/java/forestry/arboriculture/tiles/TileArboristChest.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/forestry/arboriculture/gadgets/TileArboristChest.java rename to src/main/java/forestry/arboriculture/tiles/TileArboristChest.java index 237969ae4..65c75e9e6 --- a/src/main/java/forestry/arboriculture/gadgets/TileArboristChest.java +++ b/src/main/java/forestry/arboriculture/tiles/TileArboristChest.java @@ -8,12 +8,12 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.tiles; import forestry.api.genetics.AlleleManager; import forestry.arboriculture.genetics.TreeHelper; -import forestry.core.gadgets.TileNaturalistChest; import forestry.core.network.GuiId; +import forestry.core.tiles.TileNaturalistChest; public class TileArboristChest extends TileNaturalistChest { public TileArboristChest() { diff --git a/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java b/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java rename to src/main/java/forestry/arboriculture/tiles/TileFruitPod.java index d145cca06..65a58b960 --- a/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java +++ b/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.tiles; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/arboriculture/gadgets/TileLeaves.java rename to src/main/java/forestry/arboriculture/tiles/TileLeaves.java index ef524e4ea..29f36afbe --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.tiles; import java.io.IOException; import java.util.Arrays; @@ -59,8 +59,9 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketTileStream; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; +import forestry.core.utils.ColourUtil; import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.Utils; +import forestry.core.utils.Log; public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery { @@ -241,9 +242,9 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru colourLeaves = species.getLeafColour(false); colourLeavesPollinated = species.getLeafColour(true); if (isDestroyed(tree, damage)) { - colourLeaves = Utils.addRGBComponents(colourLeaves, 92, 61, 0); + colourLeaves = ColourUtil.addRGBComponents(colourLeaves, 92, 61, 0); } else if (caterpillar != null) { - colourLeaves = Utils.multiplyRGBComponents(colourLeaves, 1.5f); + colourLeaves = ColourUtil.multiplyRGBComponents(colourLeaves, 1.5f); } markDirty(); } @@ -539,7 +540,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru private static void attemptButterflySpawn(World world, IButterfly butterfly, double x, double y, double z) { IButterflyRoot butterflyRoot = (IButterflyRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootButterflies"); if (butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.1f, z) != null) { - Proxies.log.finest("A caterpillar '%s' hatched at %s/%s/%s.", butterfly.getDisplayName(), x, y, z); + Log.finest("A caterpillar '%s' hatched at %s/%s/%s.", butterfly.getDisplayName(), x, y, z); } } diff --git a/src/main/java/forestry/arboriculture/gadgets/TileSapling.java b/src/main/java/forestry/arboriculture/tiles/TileSapling.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/arboriculture/gadgets/TileSapling.java rename to src/main/java/forestry/arboriculture/tiles/TileSapling.java index 24e23c991..d32d8836c --- a/src/main/java/forestry/arboriculture/gadgets/TileSapling.java +++ b/src/main/java/forestry/arboriculture/tiles/TileSapling.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.tiles; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileTreeContainer.java b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/forestry/arboriculture/gadgets/TileTreeContainer.java rename to src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java index 9fbe78d67..27ae76e16 --- a/src/main/java/forestry/arboriculture/gadgets/TileTreeContainer.java +++ b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.tiles; import java.io.IOException; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileWood.java b/src/main/java/forestry/arboriculture/tiles/TileWood.java similarity index 92% rename from src/main/java/forestry/arboriculture/gadgets/TileWood.java rename to src/main/java/forestry/arboriculture/tiles/TileWood.java index 9fcae1328..cfc33c711 100644 --- a/src/main/java/forestry/arboriculture/gadgets/TileWood.java +++ b/src/main/java/forestry/arboriculture/tiles/TileWood.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gadgets; +package forestry.arboriculture.tiles; import java.io.IOException; @@ -27,7 +27,7 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.network.PacketTileStream; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; public class TileWood extends TileEntity implements IStreamable { private WoodType woodType; @@ -97,7 +97,7 @@ public class TileWood extends TileEntity implements IStreamable { NBTTagCompound compound = new NBTTagCompound(); wood.getWoodType().saveToCompound(compound); stack.setTagCompound(compound); - StackUtils.dropItemStackAsEntity(stack, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(stack, world, x, y, z); } } diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java index 782e4681b..66703a4e8 100644 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.world.ITreeGenData; -import forestry.arboriculture.items.ItemWoodBlock; +import forestry.arboriculture.items.ItemBlockWood; import forestry.core.worldgen.IBlockType; public class BlockTypeWood implements IBlockType, ITreeBlockType { @@ -35,7 +35,7 @@ public class BlockTypeWood implements IBlockType, ITreeBlockType { @Override public void setBlock(World world, int x, int y, int z) { - ItemWoodBlock.placeWood(itemStack, null, world, x, y, z, itemStack.getItemDamage()); + ItemBlockWood.placeWood(itemStack, null, world, x, y, z, itemStack.getItemDamage()); } @Override diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java b/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java index a69517a68..1fa6c032e 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.world.ITreeGenData; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class TreeBlockType implements ITreeBlockType { @@ -35,7 +35,7 @@ public class TreeBlockType implements ITreeBlockType { @Override public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { - world.setBlock(x, y, z, block, meta, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(x, y, z, block, meta, Constants.FLAG_BLOCK_SYNCH); } public int getMeta() { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index 88f3fd9c4..02dedb4f3 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -16,8 +16,9 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import forestry.api.world.ITreeGenData; -import forestry.arboriculture.gadgets.TileTreeContainer; -import forestry.core.utils.Utils; +import forestry.arboriculture.tiles.TileTreeContainer; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.BlockUtil; import forestry.core.worldgen.BlockType; import forestry.core.worldgen.BlockTypeVoid; import forestry.core.worldgen.WorldGenBase; @@ -62,7 +63,7 @@ public abstract class WorldGenArboriculture extends WorldGenBase { } private static GameProfile getOwner(World world, int x, int y, int z) { - TileTreeContainer tile = Utils.getTile(world, x, y, z, TileTreeContainer.class); + TileTreeContainer tile = TileUtil.getTile(world, x, y, z, TileTreeContainer.class); if (tile == null) { return null; } @@ -158,7 +159,7 @@ public abstract class WorldGenArboriculture extends WorldGenBase { @Override protected void addBlock(World world, int x, int y, int z, ITreeBlockType type, EnumReplaceMode replace) { if (replace == EnumReplaceMode.ALL - || (replace == EnumReplaceMode.SOFT && Utils.isReplaceableBlock(world, startX + x, startY + y, startZ + z)) + || (replace == EnumReplaceMode.SOFT && BlockUtil.isReplaceableBlock(world, startX + x, startY + y, startZ + z)) || world.isAirBlock(startX + x, startY + y, startZ + z)) { type.setBlock(world, tree, startX + x, startY + y, startZ + z); } diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 8bf372989..4409a808d 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -19,8 +19,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.interfaces.IPickupHandler; -import forestry.core.interfaces.ISaveEventHandler; +import forestry.core.errors.ErrorStateRegistry; import forestry.core.render.TextureManager; import forestry.plugins.PluginManager; diff --git a/src/main/java/forestry/core/ForestryClient.java b/src/main/java/forestry/core/ForestryClient.java index e8152d29b..f38f9e7ad 100755 --- a/src/main/java/forestry/core/ForestryClient.java +++ b/src/main/java/forestry/core/ForestryClient.java @@ -12,9 +12,9 @@ package forestry.core; import cpw.mods.fml.client.registry.RenderingRegistry; -import forestry.apiculture.render.BlockCandleRenderer; +import forestry.apiculture.render.RenderCandleBlock; import forestry.core.proxy.Proxies; -import forestry.core.render.BlockRenderingHandler; +import forestry.core.render.RenderBlock; public class ForestryClient extends ForestryCore { @@ -29,9 +29,9 @@ public class ForestryClient extends ForestryCore { byBlockModelId = Proxies.render.getNextAvailableRenderId(); candleRenderId = Proxies.render.getNextAvailableRenderId(); - BlockRenderingHandler renderHandler = new BlockRenderingHandler(); + RenderBlock renderHandler = new RenderBlock(); RenderingRegistry.registerBlockHandler(byBlockModelId, renderHandler); - RenderingRegistry.registerBlockHandler(candleRenderId, new BlockCandleRenderer()); + RenderingRegistry.registerBlockHandler(candleRenderId, new RenderCandleBlock()); } @Override diff --git a/src/main/java/forestry/core/ForestryConstants.java b/src/main/java/forestry/core/ForestryConstants.java deleted file mode 100755 index 8911b3946..000000000 --- a/src/main/java/forestry/core/ForestryConstants.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core; - -import forestry.api.core.IForestryConstants; -import forestry.core.config.Defaults; - -public class ForestryConstants implements IForestryConstants { - - @Override - public int getApicultureVillagerID() { - return Defaults.ID_VILLAGER_BEEKEEPER; - } - - @Override - public int getArboricultureVillagerID() { - return Defaults.ID_VILLAGER_LUMBERJACK; - } - - @Override - public String getVillagerChestGenKey() { - return Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST; - } - -} diff --git a/src/main/java/forestry/core/ForestryCore.java b/src/main/java/forestry/core/ForestryCore.java index 26f09ced2..662d24ca8 100755 --- a/src/main/java/forestry/core/ForestryCore.java +++ b/src/main/java/forestry/core/ForestryCore.java @@ -33,18 +33,22 @@ import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; +import forestry.core.errors.EnumErrorCode; +import forestry.core.errors.ErrorStateRegistry; import forestry.core.fluids.Fluids; import forestry.core.multiblock.MultiblockEventHandler; import forestry.core.proxy.Proxies; +import forestry.core.worldgen.WorldGenerator; import forestry.plugins.PluginManager; public class ForestryCore { public void preInit(File modLocation, Object basemod) { ForestryAPI.instance = basemod; - ForestryAPI.forestryConstants = new ForestryConstants(); + ForestryAPI.forestryConstants = new Constants(); ForestryAPI.errorStateRegistry = new ErrorStateRegistry(); // Register event handler @@ -77,26 +81,26 @@ public class ForestryCore { // Set fuels for our own engines FuelManager.copperEngineFuel.put(ForestryItem.peat.getItemStack(), new EngineCopperFuel(ForestryItem.peat.getItemStack(), - Defaults.ENGINE_COPPER_FUEL_VALUE_PEAT, Defaults.ENGINE_COPPER_CYCLE_DURATION_PEAT)); + Constants.ENGINE_COPPER_FUEL_VALUE_PEAT, Constants.ENGINE_COPPER_CYCLE_DURATION_PEAT)); FuelManager.copperEngineFuel.put(ForestryItem.bituminousPeat.getItemStack(), new EngineCopperFuel(ForestryItem.bituminousPeat.getItemStack(), - Defaults.ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT, Defaults.ENGINE_COPPER_CYCLE_DURATION_BITUMINOUS_PEAT)); + Constants.ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT, Constants.ENGINE_COPPER_CYCLE_DURATION_BITUMINOUS_PEAT)); FuelManager.bronzeEngineFuel.put(Fluids.BIOMASS.getFluid(), new EngineBronzeFuel(Fluids.BIOMASS.getFluid(), - Defaults.ENGINE_FUEL_VALUE_BIOMASS, (int) (Defaults.ENGINE_CYCLE_DURATION_BIOMASS * GameMode.getGameMode().getFloatSetting("fuel.biomass.biogas")), 1)); + Constants.ENGINE_FUEL_VALUE_BIOMASS, (int) (Constants.ENGINE_CYCLE_DURATION_BIOMASS * GameMode.getGameMode().getFloatSetting("fuel.biomass.biogas")), 1)); FuelManager.bronzeEngineFuel.put(Fluids.WATER.getFluid(), new EngineBronzeFuel(Fluids.WATER.getFluid(), - Defaults.ENGINE_FUEL_VALUE_WATER, Defaults.ENGINE_CYCLE_DURATION_WATER, 3)); + Constants.ENGINE_FUEL_VALUE_WATER, Constants.ENGINE_CYCLE_DURATION_WATER, 3)); FuelManager.bronzeEngineFuel.put(Fluids.MILK.getFluid(), new EngineBronzeFuel(Fluids.MILK.getFluid(), - Defaults.ENGINE_FUEL_VALUE_MILK, Defaults.ENGINE_CYCLE_DURATION_MILK, 3)); + Constants.ENGINE_FUEL_VALUE_MILK, Constants.ENGINE_CYCLE_DURATION_MILK, 3)); FuelManager.bronzeEngineFuel.put(Fluids.SEEDOIL.getFluid(), new EngineBronzeFuel(Fluids.SEEDOIL.getFluid(), - Defaults.ENGINE_FUEL_VALUE_SEED_OIL, Defaults.ENGINE_CYCLE_DURATION_SEED_OIL, 1)); + Constants.ENGINE_FUEL_VALUE_SEED_OIL, Constants.ENGINE_CYCLE_DURATION_SEED_OIL, 1)); FuelManager.bronzeEngineFuel.put(Fluids.HONEY.getFluid(), new EngineBronzeFuel(Fluids.HONEY.getFluid(), - Defaults.ENGINE_FUEL_VALUE_HONEY, Defaults.ENGINE_CYCLE_DURATION_HONEY, 1)); + Constants.ENGINE_FUEL_VALUE_HONEY, Constants.ENGINE_CYCLE_DURATION_HONEY, 1)); FuelManager.bronzeEngineFuel.put(Fluids.JUICE.getFluid(), new EngineBronzeFuel(Fluids.JUICE.getFluid(), - Defaults.ENGINE_FUEL_VALUE_JUICE, Defaults.ENGINE_CYCLE_DURATION_JUICE, 1)); + Constants.ENGINE_FUEL_VALUE_JUICE, Constants.ENGINE_CYCLE_DURATION_JUICE, 1)); // Set rain substrates FuelManager.rainSubstrate.put(ForestryItem.iodineCharge.getItemStack(), new RainSubstrate(ForestryItem.iodineCharge.getItemStack(), - Defaults.RAINMAKER_RAIN_DURATION_IODINE, 0.01f)); + Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f)); FuelManager.rainSubstrate.put(ForestryItem.craftingMaterial.getItemStack(1, 4), new RainSubstrate(ForestryItem.craftingMaterial.getItemStack(1, 4), 0.075f)); // Register gui handler diff --git a/src/main/java/forestry/core/GuiHandler.java b/src/main/java/forestry/core/GuiHandler.java index c74810080..3bf390bb8 100755 --- a/src/main/java/forestry/core/GuiHandler.java +++ b/src/main/java/forestry/core/GuiHandler.java @@ -19,13 +19,13 @@ import cpw.mods.fml.common.network.IGuiHandler; import forestry.core.circuits.ContainerSolderingIron; import forestry.core.circuits.GuiSolderingIron; import forestry.core.circuits.ItemSolderingIron.SolderingInventory; -import forestry.core.gadgets.TileAnalyzer; -import forestry.core.gadgets.TileEscritoire; import forestry.core.gui.ContainerAnalyzer; import forestry.core.gui.ContainerEscritoire; import forestry.core.gui.GuiAnalyzer; import forestry.core.gui.GuiEscritoire; import forestry.core.network.GuiId; +import forestry.core.tiles.TileAnalyzer; +import forestry.core.tiles.TileEscritoire; import forestry.plugins.PluginManager; public class GuiHandler extends GuiHandlerBase { diff --git a/src/main/java/forestry/core/GuiHandlerBase.java b/src/main/java/forestry/core/GuiHandlerBase.java index 616e4d479..874bb87d7 100755 --- a/src/main/java/forestry/core/GuiHandlerBase.java +++ b/src/main/java/forestry/core/GuiHandlerBase.java @@ -18,18 +18,18 @@ import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import forestry.core.gadgets.TileNaturalistChest; import forestry.core.gui.ContainerNaturalistInventory; import forestry.core.gui.GuiNaturalistInventory; import forestry.core.network.IStreamableGui; import forestry.core.network.PacketGuiUpdate; import forestry.core.proxy.Proxies; -import forestry.core.utils.Utils; +import forestry.core.tiles.TileNaturalistChest; +import forestry.core.tiles.TileUtil; public abstract class GuiHandlerBase implements IGuiHandler { protected static T getTile(World world, int x, int y, int z, EntityPlayer player, Class tileClass) { - T tileForestry = Utils.getTile(world, x, y, z, tileClass); + T tileForestry = TileUtil.getTile(world, x, y, z, tileClass); if (tileForestry instanceof IStreamableGui && !world.isRemote) { PacketGuiUpdate packet = new PacketGuiUpdate((IStreamableGui) tileForestry); diff --git a/src/main/java/forestry/core/interfaces/IPickupHandler.java b/src/main/java/forestry/core/IPickupHandler.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/interfaces/IPickupHandler.java rename to src/main/java/forestry/core/IPickupHandler.java index 3409eeaf3..b45d90c50 --- a/src/main/java/forestry/core/interfaces/IPickupHandler.java +++ b/src/main/java/forestry/core/IPickupHandler.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/forestry/core/interfaces/IResupplyHandler.java b/src/main/java/forestry/core/IResupplyHandler.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/interfaces/IResupplyHandler.java rename to src/main/java/forestry/core/IResupplyHandler.java index 300e6bd4e..5d4beacfd --- a/src/main/java/forestry/core/interfaces/IResupplyHandler.java +++ b/src/main/java/forestry/core/IResupplyHandler.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/forestry/core/interfaces/ISaveEventHandler.java b/src/main/java/forestry/core/ISaveEventHandler.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/interfaces/ISaveEventHandler.java rename to src/main/java/forestry/core/ISaveEventHandler.java index a7aa506af..dd73140ef --- a/src/main/java/forestry/core/interfaces/ISaveEventHandler.java +++ b/src/main/java/forestry/core/ISaveEventHandler.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core; import net.minecraft.world.World; diff --git a/src/main/java/forestry/core/PickupHandlerCore.java b/src/main/java/forestry/core/PickupHandlerCore.java index c284ca96b..53374a6de 100755 --- a/src/main/java/forestry/core/PickupHandlerCore.java +++ b/src/main/java/forestry/core/PickupHandlerCore.java @@ -18,7 +18,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import forestry.core.interfaces.IPickupHandler; public class PickupHandlerCore implements IPickupHandler { diff --git a/src/main/java/forestry/core/SaveEventHandlerCore.java b/src/main/java/forestry/core/SaveEventHandlerCore.java index dc44f74b0..1f4bb0e1b 100755 --- a/src/main/java/forestry/core/SaveEventHandlerCore.java +++ b/src/main/java/forestry/core/SaveEventHandlerCore.java @@ -12,8 +12,6 @@ package forestry.core; import net.minecraft.world.World; -import forestry.core.interfaces.ISaveEventHandler; - public class SaveEventHandlerCore implements ISaveEventHandler { @Override diff --git a/src/main/java/forestry/core/TickHandlerCoreServer.java b/src/main/java/forestry/core/TickHandlerCoreServer.java index fc8092710..036e46ab4 100755 --- a/src/main/java/forestry/core/TickHandlerCoreServer.java +++ b/src/main/java/forestry/core/TickHandlerCoreServer.java @@ -18,6 +18,7 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.world.ChunkDataEvent; @@ -26,9 +27,8 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; import forestry.core.config.Config; -import forestry.core.config.Defaults; -import forestry.core.interfaces.IResupplyHandler; -import forestry.core.utils.ChunkCoords; +import forestry.core.config.Constants; +import forestry.core.worldgen.WorldGenerator; import forestry.plugins.PluginManager; public class TickHandlerCoreServer { @@ -83,17 +83,30 @@ public class TickHandlerCoreServer { tag.setBoolean("retrogen", true); } - event.getData().setTag(Defaults.MOD, tag); + event.getData().setTag(Constants.MOD, tag); } @SubscribeEvent public void chunkLoadEventHandler(ChunkDataEvent.Load event) { if (Config.doRetrogen) { - NBTTagCompound tag = (NBTTagCompound) event.getData().getTag(Defaults.MOD); + NBTTagCompound tag = (NBTTagCompound) event.getData().getTag(Constants.MOD); if (tag == null || !tag.hasKey("retrogen") || Config.forceRetrogen) { ChunkCoords coords = new ChunkCoords(event.getChunk()); chunkRegenList.put(coords.dimension, coords); } } } + + private static class ChunkCoords { + public final int dimension; + public final int xCoord; + public final int zCoord; + + public ChunkCoords(Chunk chunk) { + this.dimension = chunk.worldObj.provider.dimensionId; + this.xCoord = chunk.xPosition; + this.zCoord = chunk.zPosition; + } + } + } diff --git a/src/main/java/forestry/core/delegates/AccessHandler.java b/src/main/java/forestry/core/access/AccessHandler.java similarity index 92% rename from src/main/java/forestry/core/delegates/AccessHandler.java rename to src/main/java/forestry/core/access/AccessHandler.java index be077c575..22ab0efdd 100644 --- a/src/main/java/forestry/core/delegates/AccessHandler.java +++ b/src/main/java/forestry/core/access/AccessHandler.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.delegates; +package forestry.core.access; import java.io.IOException; import java.util.UUID; @@ -21,15 +21,13 @@ import com.mojang.authlib.GameProfile; import forestry.api.core.INBTTagable; import forestry.core.config.Config; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.interfaces.IRestrictedAccessTile; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketId; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumAccess; +import forestry.core.tiles.IRestrictedAccessTile; import forestry.core.utils.PlayerUtil; public final class AccessHandler implements IAccessHandler, IStreamable, INBTTagable { diff --git a/src/main/java/forestry/core/utils/EnumAccess.java b/src/main/java/forestry/core/access/EnumAccess.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/core/utils/EnumAccess.java rename to src/main/java/forestry/core/access/EnumAccess.java index 43176834b..5f13d8894 --- a/src/main/java/forestry/core/utils/EnumAccess.java +++ b/src/main/java/forestry/core/access/EnumAccess.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.access; import net.minecraft.util.IIcon; diff --git a/src/main/java/forestry/core/delegates/FakeAccessHandler.java b/src/main/java/forestry/core/access/FakeAccessHandler.java similarity index 89% rename from src/main/java/forestry/core/delegates/FakeAccessHandler.java rename to src/main/java/forestry/core/access/FakeAccessHandler.java index 4f1609a7d..9648b0142 100644 --- a/src/main/java/forestry/core/delegates/FakeAccessHandler.java +++ b/src/main/java/forestry/core/access/FakeAccessHandler.java @@ -8,15 +8,12 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.delegates; +package forestry.core.access; import net.minecraft.entity.player.EntityPlayer; import com.mojang.authlib.GameProfile; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.utils.EnumAccess; - public class FakeAccessHandler implements IAccessHandler { private static FakeAccessHandler instance; diff --git a/src/main/java/forestry/core/interfaces/IAccessHandler.java b/src/main/java/forestry/core/access/IAccessHandler.java similarity index 89% rename from src/main/java/forestry/core/interfaces/IAccessHandler.java rename to src/main/java/forestry/core/access/IAccessHandler.java index 0e2c8e17b..b155a9334 100644 --- a/src/main/java/forestry/core/interfaces/IAccessHandler.java +++ b/src/main/java/forestry/core/access/IAccessHandler.java @@ -8,12 +8,10 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.access; import net.minecraft.entity.player.EntityPlayer; -import forestry.core.utils.EnumAccess; - public interface IAccessHandler extends IOwnable { boolean switchAccessRule(EntityPlayer player); diff --git a/src/main/java/forestry/core/interfaces/IOwnable.java b/src/main/java/forestry/core/access/IOwnable.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/interfaces/IOwnable.java rename to src/main/java/forestry/core/access/IOwnable.java index ab7870f8f..f801b60c4 --- a/src/main/java/forestry/core/interfaces/IOwnable.java +++ b/src/main/java/forestry/core/access/IOwnable.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.access; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/forestry/core/gadgets/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/forestry/core/gadgets/BlockBase.java rename to src/main/java/forestry/core/blocks/BlockBase.java index 3fee9ff6f..76c48e3af --- a/src/main/java/forestry/core/gadgets/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.blocks; import java.util.ArrayList; import java.util.List; @@ -36,13 +36,17 @@ import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.access.IAccessHandler; import forestry.core.circuits.ISocketable; import forestry.core.fluids.FluidHelper; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.items.ItemNBTTile; +import forestry.core.items.ItemBlockNBT; import forestry.core.proxy.Proxies; +import forestry.core.tiles.MachineDefinition; +import forestry.core.tiles.TileBase; +import forestry.core.tiles.TileForestry; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.InventoryUtil; import forestry.core.utils.PlayerUtil; -import forestry.core.utils.Utils; public class BlockBase extends BlockForestry { @@ -166,7 +170,7 @@ public class BlockBase extends BlockForestry { TileForestry tile = (TileForestry) world.getTileEntity(x, y, z); - if (stack.getItem() instanceof ItemNBTTile && stack.hasTagCompound()) { + if (stack.getItem() instanceof ItemBlockNBT && stack.hasTagCompound()) { tile.readFromNBT(stack.getTagCompound()); tile.xCoord = x; tile.yCoord = y; @@ -187,7 +191,7 @@ public class BlockBase extends BlockForestry { } TileBase tile = (TileBase) world.getTileEntity(x, y, z); - if (!Utils.isUseableByPlayer(player, tile)) { + if (!TileUtil.isUsableByPlayer(player, tile)) { return false; } @@ -227,12 +231,12 @@ public class BlockBase extends BlockForestry { TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof IInventory) { IInventory inventory = (IInventory) tile; - Utils.dropInventory(inventory, world, x, y, z); + InventoryUtil.dropInventory(inventory, world, x, y, z); if (tile instanceof TileForestry) { ((TileForestry) tile).onRemoval(); } if (tile instanceof ISocketable) { - Utils.dropSockets((ISocketable) tile, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord); + InventoryUtil.dropSockets((ISocketable) tile, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord); } } super.breakBlock(world, x, y, z, block, meta); diff --git a/src/main/java/forestry/core/gadgets/BlockForestry.java b/src/main/java/forestry/core/blocks/BlockForestry.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/core/gadgets/BlockForestry.java rename to src/main/java/forestry/core/blocks/BlockForestry.java index 40f799306..9a45d1edd --- a/src/main/java/forestry/core/gadgets/BlockForestry.java +++ b/src/main/java/forestry/core/blocks/BlockForestry.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.blocks; import org.apache.logging.log4j.Level; @@ -24,9 +24,11 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import forestry.core.CreativeTabForestry; -import forestry.core.interfaces.IOwnable; -import forestry.core.interfaces.IRestrictedAccessTile; +import forestry.core.access.IOwnable; import forestry.core.proxy.Proxies; +import forestry.core.tiles.IRestrictedAccessTile; +import forestry.core.tiles.TileForestry; +import forestry.core.utils.Log; public abstract class BlockForestry extends BlockContainer { @@ -84,7 +86,7 @@ public abstract class BlockForestry extends BlockContainer { ((TileForestry) tile).onNeighborBlockChange(block); } } catch (StackOverflowError error) { - Proxies.log.logThrowable(Level.ERROR, "Stack Overflow Error in BlockMachine.onNeighborBlockChange()", 10, error); + Log.logThrowable(Level.ERROR, "Stack Overflow Error in BlockMachine.onNeighborBlockChange()", 10, error); throw error; } } diff --git a/src/main/java/forestry/core/gadgets/BlockResource.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/core/gadgets/BlockResource.java rename to src/main/java/forestry/core/blocks/BlockResourceOre.java index 7ab831e78..f10f5c0e6 --- a/src/main/java/forestry/core/gadgets/BlockResource.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.blocks; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import forestry.core.CreativeTabForestry; import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; -public class BlockResource extends Block { - public BlockResource() { +public class BlockResourceOre extends Block { + public BlockResourceOre() { super(Material.rock); setHardness(3F); setResistance(5F); diff --git a/src/main/java/forestry/core/gadgets/BlockResourceStorageBlock.java b/src/main/java/forestry/core/blocks/BlockResourceStorage.java similarity index 93% rename from src/main/java/forestry/core/gadgets/BlockResourceStorageBlock.java rename to src/main/java/forestry/core/blocks/BlockResourceStorage.java index 4a9eb9412..fa760acd2 100644 --- a/src/main/java/forestry/core/gadgets/BlockResourceStorageBlock.java +++ b/src/main/java/forestry/core/blocks/BlockResourceStorage.java @@ -1,4 +1,4 @@ -package forestry.core.gadgets; +package forestry.core.blocks; import java.util.List; @@ -16,9 +16,9 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.core.CreativeTabForestry; import forestry.core.render.TextureManager; -public class BlockResourceStorageBlock extends Block { +public class BlockResourceStorage extends Block { - public BlockResourceStorageBlock() { + public BlockResourceStorage() { super(Material.iron); setHardness(3F); setResistance(5F); diff --git a/src/main/java/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/blocks/BlockSoil.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/gadgets/BlockSoil.java rename to src/main/java/forestry/core/blocks/BlockSoil.java index f3053bcf4..dff79cb70 --- a/src/main/java/forestry/core/gadgets/BlockSoil.java +++ b/src/main/java/forestry/core/blocks/BlockSoil.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.blocks; import java.util.ArrayList; import java.util.List; @@ -33,8 +33,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.CreativeTabForestry; -import forestry.core.IItemTyped; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; @@ -155,9 +154,9 @@ public class BlockSoil extends Block implements IItemTyped { meta = (grade << 2 | type); if (grade >= degradeDelimiter) { - world.setBlock(x, y, z, Blocks.sand, 0, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(x, y, z, Blocks.sand, 0, Constants.FLAG_BLOCK_SYNCH); } else { - world.setBlockMetadataWithNotify(x, y, z, meta, Defaults.FLAG_BLOCK_SYNCH); + world.setBlockMetadataWithNotify(x, y, z, meta, Constants.FLAG_BLOCK_SYNCH); } world.markBlockForUpdate(x, y, z); } @@ -197,7 +196,7 @@ public class BlockSoil extends Block implements IItemTyped { maturity++; meta = (maturity << 2 | type); - world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); + world.setBlockMetadataWithNotify(i, j, k, meta, Constants.FLAG_BLOCK_SYNCH); world.markBlockForUpdate(i, j, k); } diff --git a/src/main/java/forestry/core/gadgets/BlockStructure.java b/src/main/java/forestry/core/blocks/BlockStructure.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/core/gadgets/BlockStructure.java rename to src/main/java/forestry/core/blocks/BlockStructure.java index a84eb87f6..2f9245424 --- a/src/main/java/forestry/core/gadgets/BlockStructure.java +++ b/src/main/java/forestry/core/blocks/BlockStructure.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -22,7 +22,7 @@ import forestry.core.circuits.ISocketable; import forestry.core.multiblock.MultiblockControllerBase; import forestry.core.multiblock.MultiblockTileEntityBase; import forestry.core.proxy.Proxies; -import forestry.core.utils.Utils; +import forestry.core.utils.InventoryUtil; public abstract class BlockStructure extends BlockForestry { @@ -98,9 +98,9 @@ public abstract class BlockStructure extends BlockForestry { // drop inventory if we're the last part remaining if (part.getNeighboringParts().length == 0) { - Utils.dropInventory(part, world, x, y, z); + InventoryUtil.dropInventory(part, world, x, y, z); if (tile instanceof ISocketable) { - Utils.dropSockets((ISocketable) tile, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord); + InventoryUtil.dropSockets((ISocketable) tile, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord); } } } diff --git a/src/main/java/forestry/core/IItemTyped.java b/src/main/java/forestry/core/blocks/IItemTyped.java similarity index 65% rename from src/main/java/forestry/core/IItemTyped.java rename to src/main/java/forestry/core/blocks/IItemTyped.java index c64e5258f..fc731a6d1 100644 --- a/src/main/java/forestry/core/IItemTyped.java +++ b/src/main/java/forestry/core/blocks/IItemTyped.java @@ -1,4 +1,4 @@ -package forestry.core; +package forestry.core.blocks; public interface IItemTyped { Enum getTypeFromMeta(int meta); diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index dffaf462e..9dd3267ce 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -16,14 +16,14 @@ import net.minecraft.entity.player.EntityPlayer; import forestry.api.circuits.ICircuitLayout; import forestry.core.circuits.ItemSolderingIron.CircuitRecipe; import forestry.core.circuits.ItemSolderingIron.SolderingInventory; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.utils.StringUtil; public class GuiSolderingIron extends GuiForestry { public GuiSolderingIron(EntityPlayer player, SolderingInventory inventory) { - super(Defaults.TEXTURE_PATH_GUI + "/solder.png", new ContainerSolderingIron(player, inventory), inventory); + super(Constants.TEXTURE_PATH_GUI + "/solder.png", new ContainerSolderingIron(player, inventory), inventory); xSize = 176; ySize = 205; diff --git a/src/main/java/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java index e9e990a5b..471b1d8f6 100755 --- a/src/main/java/forestry/core/circuits/ItemSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ItemSolderingIron.java @@ -27,12 +27,12 @@ import forestry.api.circuits.ISolderManager; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; -import forestry.core.EnumErrorCode; +import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.ItemInventory; import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.RevolvingList; +import forestry.core.utils.datastructures.RevolvingList; public class ItemSolderingIron extends ItemForestry implements ISolderingIron { diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index 6a633b53a..934351ef9 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -30,7 +30,7 @@ import net.minecraft.world.World; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.Version; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; @@ -115,7 +115,7 @@ public final class CommandSaveStats extends SubCommand { } } - File file = new File(Proxies.common.getForestryRoot(), "config/" + Defaults.MOD.toLowerCase(Locale.ENGLISH) + "/stats/" + player.getDisplayName() + '-' + saveHelper.getFileSuffix() + ".log"); + File file = new File(Proxies.common.getForestryRoot(), "config/" + Constants.MOD.toLowerCase(Locale.ENGLISH) + "/stats/" + player.getDisplayName() + '-' + saveHelper.getFileSuffix() + ".log"); try { File folder = file.getParentFile(); if (folder != null && !folder.exists()) { @@ -139,7 +139,7 @@ public final class CommandSaveStats extends SubCommand { FileOutputStream fileout = new FileOutputStream(file); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fileout, "UTF-8")); - writer.write("# " + Defaults.MOD + newLine + "# " + Version.getVersion() + newLine); + writer.write("# " + Constants.MOD + newLine + "# " + Version.getVersion() + newLine); for (String line : statistics) { writer.write(line + newLine); diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 874bbd591..783ab2d3d 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -28,7 +28,7 @@ import net.minecraftforge.common.config.Property; import forestry.Forestry; import forestry.core.fluids.Fluids; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; import forestry.core.utils.StringUtil; public class Config { @@ -143,7 +143,7 @@ public class Config { final String oldConfigRenamed = CATEGORY_COMMON + ".conf.old"; File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed); if (oldConfigCommonFile.renameTo(oldConfigFileRenamed)) { - Proxies.log.info("Migrated " + CATEGORY_COMMON + " settings to the new file '" + newConfigCommon + "' and renamed '" + oldConfigCommon + "' to '" + oldConfigRenamed + "'."); + Log.info("Migrated " + CATEGORY_COMMON + " settings to the new file '" + newConfigCommon + "' and renamed '" + oldConfigCommon + "' to '" + oldConfigRenamed + "'."); } } loadNewConfigCommon(newConfigCommonFile); @@ -158,7 +158,7 @@ public class Config { final String oldConfigRenamed = CATEGORY_FLUIDS + ".conf.old"; File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed); if (oldConfigFluidsFile.renameTo(oldConfigFileRenamed)) { - Proxies.log.info("Migrated " + CATEGORY_FLUIDS + " settings to the new file '" + newConfigFluids + "' and renamed '" + oldConfigFluids + "' to '" + oldConfigRenamed + "'."); + Log.info("Migrated " + CATEGORY_FLUIDS + " settings to the new file '" + newConfigFluids + "' and renamed '" + oldConfigFluids + "' to '" + oldConfigRenamed + "'."); } } loadNewConfigFluids(newConfigFluidsFile); @@ -169,7 +169,7 @@ public class Config { final String oldConfigRenamed = CATEGORY_DEBUG + ".conf.old"; File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed); if (oldConfigDebugFile.renameTo(oldConfigFileRenamed)) { - Proxies.log.info("Renamed '" + oldConfigDebug + "' to '" + oldConfigRenamed + "'."); + Log.info("Renamed '" + oldConfigDebug + "' to '" + oldConfigRenamed + "'."); } } @@ -184,7 +184,7 @@ public class Config { boolean recreate = configCommon.getBooleanLocalized("difficulty", "recreate.definitions", true); if (recreate) { - Proxies.log.info("Recreating all gamemode definitions from the defaults. This may be caused by an upgrade"); + Log.info("Recreating all gamemode definitions from the defaults. This may be caused by an upgrade"); String recreateDefinitionsComment = StringUtil.localize("config.difficulty.recreate.definitions.comment"); Property property = configCommon.get("difficulty", "recreate.definitions", true, recreateDefinitionsComment); @@ -213,10 +213,10 @@ public class Config { Property property = configCommon.get("world.generate.retrogen", "forced", false); property.set(false); - Proxies.log.info("Enabled force retrogen."); + Log.info("Enabled force retrogen."); doRetrogen = true; } else if (doRetrogen) { - Proxies.log.info("Enabled retrogen."); + Log.info("Enabled retrogen."); } generateBeehivesAmount = configCommon.getFloatLocalized("world.generate.beehives", "amount", generateBeehivesAmount, 0.0f, 10.0f); @@ -237,7 +237,7 @@ public class Config { try { collectorStamps.addAll(Arrays.asList(stamps)); } catch (Exception ex) { - Proxies.log.warning("Failed to read config for 'crafting.stamps.disabled', setting to default."); + Log.warning("Failed to read config for 'crafting.stamps.disabled', setting to default."); Property property = configCommon.get("crafting.stamps", "disabled", defaultCollectors); property.setToDefault(); collectorStamps.addAll(Arrays.asList(defaultCollectors)); @@ -271,7 +271,7 @@ public class Config { disabledStructures.addAll(Arrays.asList(disabledStructureArray)); for (String str : disabledStructures) { - Proxies.log.finer("Disabled structure '%s'.", str); + Log.finer("Disabled structure '%s'.", str); } isDebug = configCommon.getBooleanLocalized("debug", "enabled", isDebug); @@ -304,11 +304,11 @@ public class Config { forceRetrogen = Boolean.parseBoolean(property.value); if (forceRetrogen) { - Proxies.log.info(forcedRetroGenMessage); + Log.info(forcedRetroGenMessage); configOld.set(forcedRetroGenKey, CATEGORY_COMMON, false); doRetrogen = true; } else if (doRetrogen) { - Proxies.log.info(retroGenMessage); + Log.info(retroGenMessage); } property = configOld.get("world.generate.apatite", CATEGORY_COMMON, true); @@ -407,7 +407,7 @@ public class Config { property.comment = "add schemata keys to disable them. current keys: alveary3x3;farm3x3;farm3x4;farm3x5;farm4x4;farm5x5"; disabledStructures.addAll(Arrays.asList(parseStructureKeys(property.value))); for (String str : disabledStructures) { - Proxies.log.finer("Disabled structure '%s'.", str); + Log.finer("Disabled structure '%s'.", str); } } diff --git a/src/main/java/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Constants.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/forestry/core/config/Defaults.java rename to src/main/java/forestry/core/config/Constants.java index 2c21ea246..52b60fad9 --- a/src/main/java/forestry/core/config/Defaults.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -14,7 +14,9 @@ import java.util.Locale; import net.minecraftforge.oredict.OreDictionary; -public class Defaults { +import forestry.api.core.IForestryConstants; + +public class Constants implements IForestryConstants { // System public static final String MOD = "Forestry"; public static final String ID = MOD.toLowerCase(Locale.ENGLISH); @@ -63,11 +65,11 @@ public class Defaults { public static final int DEFINITION_APIARISTCHEST_META = 0; - public static final int DEFINITION_ENGINETIN_META = 0; - public static final int DEFINITION_ENGINECOPPER_META = 1; - public static final int DEFINITION_ENGINEBRONZE_META = 2; + public static final int DEFINITION_ENGINE_ELECTRIC_META = 0; + public static final int DEFINITION_ENGINE_PEAT_META = 1; + public static final int DEFINITION_ENGINE_BIOGAS_META = 2; public static final int DEFINITION_GENERATOR_META = 3; - public static final int DEFINITION_ENGINECLOCKWORK_META = 4; + public static final int DEFINITION_ENGINE_CLOCKWORK_META = 4; public static final int DEFINITION_MAILBOX_META = 0; public static final int DEFINITION_TRADESTATION_META = 1; @@ -138,7 +140,7 @@ public class Defaults { public static final int ENGINE_COPPER_HEAT_MAX = 10000; public static final int ENGINE_COPPER_ASH_FOR_ITEM = 7500; - public static final int ENGINE_TIN_HEAT_MAX = 3000; + public static final int ENGINE_ELECTRIC_HEAT_MAX = 3000; public static final int ENGINE_TIN_EU_FOR_CYCLE = 5; //Reduced from 6 to 5, as per the 4 RF to 1 EU ratio public static final int ENGINE_TIN_ENERGY_PER_CYCLE = 20; public static final int ENGINE_TIN_MAX_EU_STORED = 2 * ENGINE_TIN_EU_FOR_CYCLE; @@ -165,4 +167,19 @@ public class Defaults { public static final int CARPENTER_CRATING_CYCLES = 5; public static final int CARPENTER_UNCRATING_CYCLES = 5; public static final int CARPENTER_CRATING_LIQUID_QUANTITY = 100; + + @Override + public int getApicultureVillagerID() { + return ID_VILLAGER_BEEKEEPER; + } + + @Override + public int getArboricultureVillagerID() { + return ID_VILLAGER_LUMBERJACK; + } + + @Override + public String getVillagerChestGenKey() { + return CHEST_GEN_HOOK_NATURALIST_CHEST; + } } diff --git a/src/main/java/forestry/core/config/ForestryBlock.java b/src/main/java/forestry/core/config/ForestryBlock.java index 4f19347c7..a9d8fc71f 100755 --- a/src/main/java/forestry/core/config/ForestryBlock.java +++ b/src/main/java/forestry/core/config/ForestryBlock.java @@ -128,6 +128,6 @@ public enum ForestryBlock { } public boolean setBlock(World world, int x, int y, int z, int meta) { - return world.setBlock(x, y, z, block, meta, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + return world.setBlock(x, y, z, block, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } } diff --git a/src/main/java/forestry/core/config/ForestryGuiConfig.java b/src/main/java/forestry/core/config/ForestryGuiConfig.java index 525d8c4f5..db1d6afe8 100644 --- a/src/main/java/forestry/core/config/ForestryGuiConfig.java +++ b/src/main/java/forestry/core/config/ForestryGuiConfig.java @@ -25,7 +25,7 @@ import cpw.mods.fml.client.config.IConfigElement; public class ForestryGuiConfig extends GuiConfig { public ForestryGuiConfig(GuiScreen parent) { - super(parent, getConfigCategories(), Defaults.MOD, true, true, Defaults.MOD); + super(parent, getConfigCategories(), Constants.MOD, true, true, Constants.MOD); } private static List getConfigCategories() { diff --git a/src/main/java/forestry/core/GameMode.java b/src/main/java/forestry/core/config/GameMode.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/GameMode.java rename to src/main/java/forestry/core/config/GameMode.java index d2b506b11..9341c697b --- a/src/main/java/forestry/core/GameMode.java +++ b/src/main/java/forestry/core/config/GameMode.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core; +package forestry.core.config; import java.io.File; import java.util.HashMap; @@ -20,11 +20,7 @@ import net.minecraft.item.ItemStack; import forestry.Forestry; import forestry.api.core.ForestryAPI; import forestry.api.core.IGameMode; -import forestry.core.config.Config; -import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; -import forestry.core.config.LocalizedConfiguration; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; public class GameMode implements IGameMode { @@ -97,7 +93,7 @@ public class GameMode implements IGameMode { final String oldConfigRenamed = category + ".conf.old"; File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed); if (oldConfigFile.renameTo(oldConfigFileRenamed)) { - Proxies.log.info("Migrated " + category + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); + Log.info("Migrated " + category + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); } } @@ -284,7 +280,7 @@ public class GameMode implements IGameMode { if (integerSettings.containsKey(ident)) { return integerSettings.get(ident); } - Proxies.log.warning("No such setting: " + ident); + Log.warning("No such setting: " + ident); return -1; } @@ -293,7 +289,7 @@ public class GameMode implements IGameMode { if (floatSettings.containsKey(ident)) { return floatSettings.get(ident); } - Proxies.log.warning("No such setting: " + ident); + Log.warning("No such setting: " + ident); return 1; } @@ -302,7 +298,7 @@ public class GameMode implements IGameMode { if (booleanSettings.containsKey(ident)) { return booleanSettings.get(ident); } - Proxies.log.warning("No such setting: " + ident); + Log.warning("No such setting: " + ident); return false; } @@ -311,7 +307,7 @@ public class GameMode implements IGameMode { if (stackSettings.containsKey(ident)) { return stackSettings.get(ident); } - Proxies.log.warning("No such setting: " + ident); + Log.warning("No such setting: " + ident); return new ItemStack(Items.apple, 1); } diff --git a/src/main/java/forestry/core/config/Version.java b/src/main/java/forestry/core/config/Version.java index 6722b9bf4..83c8efd16 100755 --- a/src/main/java/forestry/core/config/Version.java +++ b/src/main/java/forestry/core/config/Version.java @@ -25,6 +25,7 @@ import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import forestry.Forestry; import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; /** * With permission from pahimar. @@ -40,7 +41,7 @@ public class Version { public static final String VERSION = "@VERSION@"; public static final String BUILD_NUMBER = "@BUILD_NUMBER@"; - public static final String[] FAILED_CHANGELOG = new String[]{String.format("Unable to retrieve changelog for %s", Defaults.MOD)}; + public static final String[] FAILED_CHANGELOG = new String[]{String.format("Unable to retrieve changelog for %s", Constants.MOD)}; private static final String REMOTE_VERSION_FILE = "http://bit.ly/forestryver"; private static final String REMOTE_CHANGELOG_ROOT = "https://dl.dropbox.com/u/44760587/forestry/changelog/"; public static EnumUpdateState currentVersion = EnumUpdateState.CURRENT; @@ -100,7 +101,7 @@ public class Version { String line; String mcVersion = Proxies.common.getMinecraftVersion(); while ((line = reader.readLine()) != null) { - if (line.startsWith(mcVersion) && line.contains(Defaults.MOD)) { + if (line.startsWith(mcVersion) && line.contains(Constants.MOD)) { String[] tokens = line.split(":"); recommendedVersion = tokens[2]; } @@ -112,19 +113,19 @@ public class Version { int result = FMLCommonHandler.instance().findContainerFor(Forestry.instance).getProcessedVersion().compareTo(new DefaultArtifactVersion(recommendedVersion)); if (result >= 0) { - Proxies.log.finer("Using the latest version [" + VERSION + " (build:" + BUILD_NUMBER + ")] for Minecraft " + mcVersion); + Log.finer("Using the latest version [" + VERSION + " (build:" + BUILD_NUMBER + ")] for Minecraft " + mcVersion); currentVersion = EnumUpdateState.CURRENT; return; } cachedChangelog = grabChangelog(recommendedVersion); - Proxies.log.warning("Using outdated version [" + VERSION + " (build:" + BUILD_NUMBER + ")] for Minecraft " + mcVersion + ". Consider updating."); + Log.warning("Using outdated version [" + VERSION + " (build:" + BUILD_NUMBER + ")] for Minecraft " + mcVersion + ". Consider updating."); currentVersion = EnumUpdateState.OUTDATED; } catch (Exception e) { // e.printStackTrace(); - Proxies.log.warning("Unable to read from remote version authority."); + Log.warning("Unable to read from remote version authority."); currentVersion = EnumUpdateState.CONNECTION_ERROR; } } @@ -171,9 +172,9 @@ public class Version { } catch (Exception ex) { // ex.printStackTrace(); - Proxies.log.warning("Unable to read changelog from remote site."); + Log.warning("Unable to read changelog from remote site."); } - return new String[]{String.format("Unable to retrieve changelog for %s %s", Defaults.MOD, version)}; + return new String[]{String.format("Unable to retrieve changelog for %s %s", Constants.MOD, version)}; } } diff --git a/src/main/java/forestry/core/config/deprecated/Configuration.java b/src/main/java/forestry/core/config/deprecated/Configuration.java index 97303da54..b7ce209b3 100644 --- a/src/main/java/forestry/core/config/deprecated/Configuration.java +++ b/src/main/java/forestry/core/config/deprecated/Configuration.java @@ -19,7 +19,7 @@ import java.util.TreeMap; import net.minecraftforge.common.config.Configuration.UnicodeInputStreamReader; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; @Deprecated @@ -146,7 +146,7 @@ public class Configuration { } public File getCategoryFile(String category) { - return new File(Proxies.common.getForestryRoot(), "config/" + Defaults.MOD.toLowerCase(Locale.ENGLISH) + "/" + category + ".conf"); + return new File(Proxies.common.getForestryRoot(), "config/" + Constants.MOD.toLowerCase(Locale.ENGLISH) + "/" + category + ".conf"); } public void loadCategory(String category) { diff --git a/src/main/java/forestry/core/render/EntityColoredDropParticleFX.java b/src/main/java/forestry/core/entities/EntityFXColoredDropParticle.java similarity index 91% rename from src/main/java/forestry/core/render/EntityColoredDropParticleFX.java rename to src/main/java/forestry/core/entities/EntityFXColoredDropParticle.java index bccc400b6..725377058 100644 --- a/src/main/java/forestry/core/render/EntityColoredDropParticleFX.java +++ b/src/main/java/forestry/core/entities/EntityFXColoredDropParticle.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render; +package forestry.core.entities; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; @@ -16,14 +16,14 @@ import net.minecraft.client.particle.EntityFX; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -public class EntityColoredDropParticleFX extends EntityFX { +public class EntityFXColoredDropParticle extends EntityFX { /** * The height of the current bob */ private int bobTimer; - public EntityColoredDropParticleFX(World world, double x, double y, double z, float red, float green, float blue) { + public EntityFXColoredDropParticle(World world, double x, double y, double z, float red, float green, float blue) { super(world, x, y, z); this.particleRed = red; this.particleGreen = green; diff --git a/src/main/java/forestry/core/render/EntityHoneydustFX.java b/src/main/java/forestry/core/entities/EntityFXHoneydust.java old mode 100755 new mode 100644 similarity index 82% rename from src/main/java/forestry/core/render/EntityHoneydustFX.java rename to src/main/java/forestry/core/entities/EntityFXHoneydust.java index 18500ead9..6282979da --- a/src/main/java/forestry/core/render/EntityHoneydustFX.java +++ b/src/main/java/forestry/core/entities/EntityFXHoneydust.java @@ -8,18 +8,18 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render; +package forestry.core.entities; import net.minecraft.client.particle.EntityReddustFX; import net.minecraft.world.World; -public class EntityHoneydustFX extends EntityReddustFX { +public class EntityFXHoneydust extends EntityReddustFX { - public EntityHoneydustFX(World world, double d, double d1, double d2, float f, float f1, float f2) { + public EntityFXHoneydust(World world, double d, double d1, double d2, float f, float f1, float f2) { this(world, d, d1, d2, 1.0F, f, f1, f2); } - public EntityHoneydustFX(World world, double d, double d1, double d2, float f, float f1, float f2, float f3) { + public EntityFXHoneydust(World world, double d, double d1, double d2, float f, float f1, float f2, float f3) { super(world, d, d1, d2, f, f1, f2, f3); particleRed = 0.9F + (world.rand.nextFloat() * 0.2F); particleGreen = 0.75F + (world.rand.nextFloat() * 0.2F); diff --git a/src/main/java/forestry/core/render/EntityIgnitionFX.java b/src/main/java/forestry/core/entities/EntityFXIgnition.java similarity index 92% rename from src/main/java/forestry/core/render/EntityIgnitionFX.java rename to src/main/java/forestry/core/entities/EntityFXIgnition.java index 8c7fbc3c5..61ac5d808 100644 --- a/src/main/java/forestry/core/render/EntityIgnitionFX.java +++ b/src/main/java/forestry/core/entities/EntityFXIgnition.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render; +package forestry.core.entities; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -18,10 +18,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class EntityIgnitionFX extends EntityFX { +public class EntityFXIgnition extends EntityFX { private final float ignitionParticleScale; - public EntityIgnitionFX(World world, double x, double y, double z) { + public EntityFXIgnition(World world, double x, double y, double z) { super(world, x, y, z, 0, 0, 0); this.motionX *= 0.8; this.motionY *= 0.8; diff --git a/src/main/java/forestry/core/render/EntitySnowFX.java b/src/main/java/forestry/core/entities/EntityFXSnow.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/render/EntitySnowFX.java rename to src/main/java/forestry/core/entities/EntityFXSnow.java index 6c8e1f9c1..c46f1854e --- a/src/main/java/forestry/core/render/EntitySnowFX.java +++ b/src/main/java/forestry/core/entities/EntityFXSnow.java @@ -8,18 +8,18 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render; +package forestry.core.entities; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class EntitySnowFX extends EntityFX { +public class EntityFXSnow extends EntityFX { public static IIcon icons[]; - public EntitySnowFX(World world, double x, double y, double z) { + public EntityFXSnow(World world, double x, double y, double z) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); this.setParticleIcon(icons[rand.nextInt(icons.length)]); diff --git a/src/main/java/forestry/core/EnumErrorCode.java b/src/main/java/forestry/core/errors/EnumErrorCode.java similarity index 96% rename from src/main/java/forestry/core/EnumErrorCode.java rename to src/main/java/forestry/core/errors/EnumErrorCode.java index ae2c9bb07..068e97c51 100644 --- a/src/main/java/forestry/core/EnumErrorCode.java +++ b/src/main/java/forestry/core/errors/EnumErrorCode.java @@ -3,7 +3,7 @@ * * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. ******************************************************************************/ -package forestry.core; +package forestry.core.errors; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorState; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public enum EnumErrorCode implements IErrorState { @@ -103,7 +103,7 @@ public enum EnumErrorCode implements IErrorState { @Override public String getUniqueName() { - return Defaults.MOD + ":" + name; + return Constants.MOD + ":" + name; } public static void init() { diff --git a/src/main/java/forestry/core/delegates/ErrorLogic.java b/src/main/java/forestry/core/errors/ErrorLogic.java similarity index 95% rename from src/main/java/forestry/core/delegates/ErrorLogic.java rename to src/main/java/forestry/core/errors/ErrorLogic.java index 4c8256d80..06e8b1a25 100644 --- a/src/main/java/forestry/core/delegates/ErrorLogic.java +++ b/src/main/java/forestry/core/errors/ErrorLogic.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.delegates; +package forestry.core.errors; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/forestry/core/ErrorStateRegistry.java b/src/main/java/forestry/core/errors/ErrorStateRegistry.java similarity index 97% rename from src/main/java/forestry/core/ErrorStateRegistry.java rename to src/main/java/forestry/core/errors/ErrorStateRegistry.java index 14e258ea0..7c90a18a7 100644 --- a/src/main/java/forestry/core/ErrorStateRegistry.java +++ b/src/main/java/forestry/core/errors/ErrorStateRegistry.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core; +package forestry.core.errors; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -26,7 +26,6 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; import forestry.api.core.IErrorStateRegistry; -import forestry.core.delegates.ErrorLogic; /** * diff --git a/src/main/java/forestry/core/delegates/FakeErrorLogic.java b/src/main/java/forestry/core/errors/FakeErrorLogic.java similarity index 93% rename from src/main/java/forestry/core/delegates/FakeErrorLogic.java rename to src/main/java/forestry/core/errors/FakeErrorLogic.java index afd76aff8..b1982801c 100644 --- a/src/main/java/forestry/core/delegates/FakeErrorLogic.java +++ b/src/main/java/forestry/core/errors/FakeErrorLogic.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.delegates; +package forestry.core.errors; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/forestry/core/delegates/FakeErrorSource.java b/src/main/java/forestry/core/errors/FakeErrorSource.java similarity index 93% rename from src/main/java/forestry/core/delegates/FakeErrorSource.java rename to src/main/java/forestry/core/errors/FakeErrorSource.java index ba8618081..4952014d1 100644 --- a/src/main/java/forestry/core/delegates/FakeErrorSource.java +++ b/src/main/java/forestry/core/errors/FakeErrorSource.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.delegates; +package forestry.core.errors; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/forestry/core/fluids/BlockForestryFluid.java b/src/main/java/forestry/core/fluids/BlockForestryFluid.java index 3293cddb8..fd7de90f7 100644 --- a/src/main/java/forestry/core/fluids/BlockForestryFluid.java +++ b/src/main/java/forestry/core/fluids/BlockForestryFluid.java @@ -37,8 +37,8 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.config.Defaults; -import forestry.core.render.EntityColoredDropParticleFX; +import forestry.core.config.Constants; +import forestry.core.entities.EntityFXColoredDropParticle; import forestry.core.render.TextureManager; public class BlockForestryFluid extends BlockFluidClassic { @@ -106,7 +106,7 @@ public class BlockForestryFluid extends BlockFluidClassic { @SideOnly(Side.CLIENT) private boolean flowTextureExists() { try { - ResourceLocation resourceLocation = new ResourceLocation(Defaults.ID, "textures/blocks/liquid/" + fluidName + "_flow.png"); + ResourceLocation resourceLocation = new ResourceLocation(Constants.ID, "textures/blocks/liquid/" + fluidName + "_flow.png"); IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager(); return resourceManager.getResource(resourceLocation) != null; } catch (java.lang.Exception e) { @@ -122,7 +122,7 @@ public class BlockForestryFluid extends BlockFluidClassic { double py = (double) y - 1.05D; double pz = (double) ((float) z + rand.nextFloat()); - EntityFX fx = new EntityColoredDropParticleFX(world, px, py, pz, color.getRed(), color.getGreen(), color.getBlue()); + EntityFX fx = new EntityFXColoredDropParticle(world, px, py, pz, color.getRed(), color.getGreen(), color.getBlue()); FMLClientHandler.instance().getClient().effectRenderer.addEffect(fx); } } diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index 78616262b..1eba6e777 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -23,9 +23,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -import forestry.core.config.Defaults; -import forestry.core.inventory.InvTools; -import forestry.core.utils.StackUtils; +import forestry.core.config.Constants; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; /** * @author CovertJaguar @@ -76,10 +76,10 @@ public final class FluidHelper { if (!player.inventory.addItemStackToInventory(filled)) { return false; } - player.inventory.setInventorySlotContents(player.inventory.currentItem, InvTools.depleteItem(current)); + player.inventory.setInventorySlotContents(player.inventory.currentItem, InventoryUtil.depleteItem(current)); player.inventory.markDirty(); } else { - player.inventory.setInventorySlotContents(player.inventory.currentItem, InvTools.depleteItem(current)); + player.inventory.setInventorySlotContents(player.inventory.currentItem, InventoryUtil.depleteItem(current)); player.inventory.setInventorySlotContents(player.inventory.currentItem, filled); player.inventory.markDirty(); } @@ -101,7 +101,7 @@ public final class FluidHelper { ItemStack input = inv.getStackInSlot(inputSlot); ItemStack output = inv.getStackInSlot(outputSlot); ItemStack filled = getFilledContainer(fluidToFill, input); - if (filled != null && (output == null || (output.stackSize < output.getMaxStackSize() && InvTools.isItemEqual(filled, output)))) { + if (filled != null && (output == null || (output.stackSize < output.getMaxStackSize() && InventoryUtil.isItemEqual(filled, output)))) { FluidStack fluidInContainer = getFluidStackInContainer(filled); FluidStack drain = fluidHandler.drain(ForgeDirection.UNKNOWN, fluidInContainer, false); if (drain != null && drain.amount == fluidInContainer.amount) { @@ -121,7 +121,7 @@ public final class FluidHelper { } public static boolean drainContainers(IFluidHandler fluidHandler, IInventory inv, int slot) { - return drainContainers(fluidHandler, inv, slot, slot, Defaults.BUCKET_VOLUME); + return drainContainers(fluidHandler, inv, slot, slot, Constants.BUCKET_VOLUME); } public static boolean drainContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot, int maxAmount) { @@ -152,7 +152,7 @@ public final class FluidHelper { if (input.stackSize > 1) { return false; } - } else if (!StackUtils.isIdenticalItem(output, drainedItem)) { + } else if (!ItemStackUtil.isIdenticalItem(output, drainedItem)) { return false; } else if (output.stackSize + drainedItem.stackSize > output.getMaxStackSize()) { return false; @@ -178,7 +178,7 @@ public final class FluidHelper { } public static boolean isFillableContainer(ItemStack stack, FluidStack liquid) { - ItemStack empty = StackUtils.createSplitStack(stack, 1); + ItemStack empty = ItemStackUtil.createSplitStack(stack, 1); Item item = empty.getItem(); if (item instanceof IFluidContainerItem) { IFluidContainerItem containerItem = (IFluidContainerItem) item; @@ -229,7 +229,7 @@ public final class FluidHelper { containerItem.drain(drained, drainAmount, true); return drained; } else { - if (drainAmount < Defaults.BUCKET_VOLUME) { + if (drainAmount < Constants.BUCKET_VOLUME) { return container; } return item.getContainerItem(container); diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index e9d99c0d1..1d5ba8d5f 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -24,7 +24,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.items.ItemLiquidContainer; @@ -132,7 +132,7 @@ public enum Fluids { @Override public void setProperties(ItemLiquidContainer liquidContainer) { if (liquidContainer.getType() != EnumContainerType.BUCKET) { - liquidContainer.setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION); + liquidContainer.setDrink(Constants.FOOD_HONEY_HEAL, Constants.FOOD_HONEY_SATURATION); } } }, @@ -194,7 +194,7 @@ public enum Fluids { @Override public void setProperties(ItemLiquidContainer liquidContainer) { if (liquidContainer.getType() != EnumContainerType.BUCKET) { - liquidContainer.setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION); + liquidContainer.setDrink(Constants.FOOD_JUICE_HEAL, Constants.FOOD_JUICE_SATURATION); } } }, diff --git a/src/main/java/forestry/core/utils/LiquidHelper.java b/src/main/java/forestry/core/fluids/LiquidRegistryHelper.java old mode 100755 new mode 100644 similarity index 56% rename from src/main/java/forestry/core/utils/LiquidHelper.java rename to src/main/java/forestry/core/fluids/LiquidRegistryHelper.java index ee4041f83..fb36badda --- a/src/main/java/forestry/core/utils/LiquidHelper.java +++ b/src/main/java/forestry/core/fluids/LiquidRegistryHelper.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.fluids; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -20,53 +20,52 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; -import forestry.core.fluids.Fluids; import forestry.core.items.ItemLiquidContainer; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; -public class LiquidHelper { +public class LiquidRegistryHelper { - public static void injectLiquidContainer(Fluids fluid, ItemStack filled) { + public static void registerLiquidContainer(Fluids fluid, ItemStack filled) { Item item = filled.getItem(); if (item.getContainerItem() instanceof ItemBucket) { - LiquidHelper.injectLiquidContainer(fluid, Defaults.BUCKET_VOLUME, filled, new ItemStack(Items.bucket)); + LiquidRegistryHelper.registerLiquidContainer(fluid, Constants.BUCKET_VOLUME, filled, new ItemStack(Items.bucket)); return; } else if (item instanceof ItemLiquidContainer) { ItemLiquidContainer liquidContainer = (ItemLiquidContainer) item; switch (liquidContainer.getType()) { case CAN: - LiquidHelper.injectTinContainer(fluid, Defaults.BUCKET_VOLUME, filled, ForestryItem.canEmpty.getItemStack()); + LiquidRegistryHelper.registerTinContainer(fluid, Constants.BUCKET_VOLUME, filled, ForestryItem.canEmpty.getItemStack()); return; case CAPSULE: - LiquidHelper.injectWaxContainer(fluid, Defaults.BUCKET_VOLUME, filled, ForestryItem.waxCapsule.getItemStack()); + LiquidRegistryHelper.registerWaxContainer(fluid, Constants.BUCKET_VOLUME, filled, ForestryItem.waxCapsule.getItemStack()); return; case REFRACTORY: - LiquidHelper.injectRefractoryContainer(fluid, Defaults.BUCKET_VOLUME, filled, ForestryItem.refractoryEmpty.getItemStack()); + LiquidRegistryHelper.registerRefractoryContainer(fluid, Constants.BUCKET_VOLUME, filled, ForestryItem.refractoryEmpty.getItemStack()); return; } } - Proxies.log.warning("Unable to inject liquid container: " + filled); + Log.warning("Unable to inject liquid container: " + filled); } - public static void injectLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(fluid, volume, filled, empty, null, 0); + public static void registerLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + registerLiquidContainer(fluid, volume, filled, empty, null, 0); } - public static void injectWaxContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(fluid, volume, filled, empty, ForestryItem.beeswax.getItemStack(), 10); + public static void registerWaxContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + registerLiquidContainer(fluid, volume, filled, empty, ForestryItem.beeswax.getItemStack(), 10); } - public static void injectRefractoryContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(fluid, volume, filled, empty, ForestryItem.refractoryWax.getItemStack(), 10); + public static void registerRefractoryContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + registerLiquidContainer(fluid, volume, filled, empty, ForestryItem.refractoryWax.getItemStack(), 10); } - public static void injectTinContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(fluid, volume, filled, empty, ForestryItem.ingotTin.getItemStack(), 5); + public static void registerTinContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + registerLiquidContainer(fluid, volume, filled, empty, ForestryItem.ingotTin.getItemStack(), 5); } - public static void injectLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty, ItemStack remnant, int chance) { + public static void registerLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty, ItemStack remnant, int chance) { FluidStack contained = fluid.getFluid(volume); if (contained == null) { throw new IllegalArgumentException(String.format("Attempted to inject a liquid container for the non-existent liquid '%s'.", fluid)); diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index 2d480d459..c750467ac 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -38,7 +38,6 @@ import net.minecraftforge.fluids.IFluidTank; import forestry.core.fluids.tanks.FakeTank; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.inventory.ITileFilter; import forestry.core.network.PacketProgressBarUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.NBTUtil; @@ -49,13 +48,6 @@ import forestry.core.utils.NBTUtil.NBTList; */ public class TankManager extends ForwardingList implements ITankManager, List { - public static final ITileFilter TANK_FILTER = new ITileFilter() { - @Override - public boolean matches(TileEntity tile) { - return tile instanceof IFluidHandler; - } - - }; private static final byte NETWORK_DATA = 3; private final List tanks = new ArrayList(); private final List prevFluidStacks = new ArrayList(); diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index 98bfb46ea..18644ad21 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -19,7 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; public class Chromosome implements IChromosome { @@ -111,21 +111,21 @@ public class Chromosome implements IChromosome { } if (primary == null) { - Proxies.log.warning("Missing primary allele: {0}. Setting to: {1}", this, template); + Log.warning("Missing primary allele: {0}. Setting to: {1}", this, template); primary = template; foundInvalidAlleles = true; } else if (!chromosomeClass.isInstance(primary)) { - Proxies.log.warning("Wrong primary allele: {0}. Setting to: {1}", this, template); + Log.warning("Wrong primary allele: {0}. Setting to: {1}", this, template); primary = template; foundInvalidAlleles = true; } if (secondary == null) { - Proxies.log.warning("Missing secondary allele: {0}. Setting to: {1}", this, template); + Log.warning("Missing secondary allele: {0}. Setting to: {1}", this, template); secondary = template; foundInvalidAlleles = true; } else if (!chromosomeClass.isInstance(secondary)) { - Proxies.log.warning("Wrong secondary allele: {0}. Setting to: {1}", this, template); + Log.warning("Wrong secondary allele: {0}. Setting to: {1}", this, template); secondary = template; foundInvalidAlleles = true; } @@ -135,22 +135,22 @@ public class Chromosome implements IChromosome { public boolean hasInvalidAlleles(Class chromosomeClass) { if (primary == null) { - Proxies.log.severe("Missing primary allele: {0}", this); + Log.severe("Missing primary allele: {0}", this); return true; } if (!chromosomeClass.isInstance(primary)) { - Proxies.log.severe("Wrong primary allele for: {0}. Should be: {1}", this, chromosomeClass.getSimpleName()); + Log.severe("Wrong primary allele for: {0}. Should be: {1}", this, chromosomeClass.getSimpleName()); return true; } if (secondary == null) { - Proxies.log.severe("Missing secondary allele: {0}", this); + Log.severe("Missing secondary allele: {0}", this); return true; } if (!chromosomeClass.isInstance(secondary)) { - Proxies.log.severe("Wrong secondary allele for: {0}. Should be: {1}", this, chromosomeClass.getSimpleName()); + Log.severe("Wrong secondary allele for: {0}. Should be: {1}", this, chromosomeClass.getSimpleName()); return true; } diff --git a/src/main/java/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java index c32c5cd8d..9c5a647a7 100755 --- a/src/main/java/forestry/core/genetics/IndividualLiving.java +++ b/src/main/java/forestry/core/genetics/IndividualLiving.java @@ -48,14 +48,14 @@ public abstract class IndividualLiving extends Individual implements IIndividual nbttagcompound.setInteger("MaxH", maxHealth); if (getGenome() != null) { - NBTTagCompound NBTmachine = new NBTTagCompound(); - getGenome().writeToNBT(NBTmachine); - nbttagcompound.setTag("Genome", NBTmachine); + NBTTagCompound nbtGenome = new NBTTagCompound(); + getGenome().writeToNBT(nbtGenome); + nbttagcompound.setTag("Genome", nbtGenome); } if (getMate() != null) { - NBTTagCompound NBTmachine = new NBTTagCompound(); - getMate().writeToNBT(NBTmachine); - nbttagcompound.setTag("Mate", NBTmachine); + NBTTagCompound nbtMate = new NBTTagCompound(); + getMate().writeToNBT(nbtMate); + nbttagcompound.setTag("Mate", nbtMate); } } diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 1f6e8e1dc..116c3f070 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -37,6 +37,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; +import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.items.ItemForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleArea.java b/src/main/java/forestry/core/genetics/alleles/AlleleArea.java index 6a0c859c7..d93d4114f 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleArea.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleArea.java @@ -11,7 +11,7 @@ package forestry.core.genetics.alleles; import forestry.api.genetics.IAlleleArea; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class AlleleArea extends AlleleCategorized implements IAlleleArea { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java b/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java index 778a40240..73befaf9f 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java @@ -7,7 +7,7 @@ import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IFlowerProvider; -import forestry.apiculture.genetics.AlleleFlowers; +import forestry.apiculture.genetics.alleles.AlleleFlowers; public class AlleleFactory implements IAlleleFactory { @Override diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java index 2fc235e2d..012bbbff5 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java @@ -22,7 +22,7 @@ import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IChromosomeType; import forestry.apiculture.flowers.FlowerProvider; -import forestry.core.vect.IVect; +import forestry.core.utils.vect.IVect; import forestry.plugins.PluginManager; public class AlleleHelper implements IAlleleHelper { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index 20eebfa82..f3f025702 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -31,7 +31,7 @@ import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.core.config.ForestryItem; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCustom { @@ -82,7 +82,7 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust } for (Map.Entry entry : getRoot().getResearchCatalysts().entrySet()) { - if (StackUtils.isIdenticalItem(entry.getKey(), itemstack)) { + if (ItemStackUtil.isIdenticalItem(entry.getKey(), itemstack)) { return entry.getValue(); } } @@ -105,7 +105,7 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust if (research != null) { return new ItemStack[]{research}; } else { - return StackUtils.EMPTY_STACK_ARRAY; + return ItemStackUtil.EMPTY_STACK_ARRAY; } } diff --git a/src/main/java/forestry/core/genetics/alleles/EnumAllele.java b/src/main/java/forestry/core/genetics/alleles/EnumAllele.java index a4992f3c3..709f22483 100644 --- a/src/main/java/forestry/core/genetics/alleles/EnumAllele.java +++ b/src/main/java/forestry/core/genetics/alleles/EnumAllele.java @@ -5,8 +5,8 @@ import java.util.Locale; import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.EnumTolerance; import forestry.apiculture.flowers.FlowerProvider; -import forestry.core.vect.IVect; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.IVect; +import forestry.core.utils.vect.Vect; public class EnumAllele { public enum Fertility implements IAlleleValue { diff --git a/src/main/java/forestry/core/genetics/EnumMutateChance.java b/src/main/java/forestry/core/genetics/mutations/EnumMutateChance.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/genetics/EnumMutateChance.java rename to src/main/java/forestry/core/genetics/mutations/EnumMutateChance.java index a5a05117e..4ab285610 --- a/src/main/java/forestry/core/genetics/EnumMutateChance.java +++ b/src/main/java/forestry/core/genetics/mutations/EnumMutateChance.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; public enum EnumMutateChance { NONE(0xffffff), LOWEST(0xffba77), LOW(0xfffd77), NORMAL(0xfffd77), HIGH(0xfffd77), HIGHER(0xbeff77), HIGHEST(0x7bff77); diff --git a/src/main/java/forestry/core/genetics/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/forestry/core/genetics/Mutation.java rename to src/main/java/forestry/core/genetics/mutations/Mutation.java index c34fcb399..85cbaefda --- a/src/main/java/forestry/core/genetics/Mutation.java +++ b/src/main/java/forestry/core/genetics/mutations/Mutation.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/forestry/core/genetics/MutationConditionBiome.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java similarity index 95% rename from src/main/java/forestry/core/genetics/MutationConditionBiome.java rename to src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java index 3fc2a0f44..cfe3a409b 100644 --- a/src/main/java/forestry/core/genetics/MutationConditionBiome.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/forestry/core/genetics/MutationConditionDaytime.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java similarity index 93% rename from src/main/java/forestry/core/genetics/MutationConditionDaytime.java rename to src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java index b1fb5ffe4..52192d008 100644 --- a/src/main/java/forestry/core/genetics/MutationConditionDaytime.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; import net.minecraft.world.World; diff --git a/src/main/java/forestry/core/genetics/MutationConditionHumidity.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java similarity index 95% rename from src/main/java/forestry/core/genetics/MutationConditionHumidity.java rename to src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java index 778545576..85923cc94 100644 --- a/src/main/java/forestry/core/genetics/MutationConditionHumidity.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/forestry/core/genetics/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java similarity index 88% rename from src/main/java/forestry/core/genetics/MutationConditionRequiresResource.java rename to src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index fd367a870..d3b1ac300 100644 --- a/src/main/java/forestry/core/genetics/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -17,7 +17,7 @@ import net.minecraft.world.World; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; public class MutationConditionRequiresResource implements IMutationCondition { @@ -31,7 +31,7 @@ public class MutationConditionRequiresResource implements IMutationCondition { public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { Block block = world.getBlock(x, y - 1, z); int meta = world.getBlockMetadata(x, y - 1, z); - return StackUtils.equals(block, meta, blockRequired) ? 1 : 0; + return ItemStackUtil.equals(block, meta, blockRequired) ? 1 : 0; } @Override diff --git a/src/main/java/forestry/core/genetics/MutationConditionTemperature.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java similarity index 95% rename from src/main/java/forestry/core/genetics/MutationConditionTemperature.java rename to src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java index 15ed9e6ab..741b8aef5 100644 --- a/src/main/java/forestry/core/genetics/MutationConditionTemperature.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/forestry/core/genetics/MutationConditionTimeLimited.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java similarity index 97% rename from src/main/java/forestry/core/genetics/MutationConditionTimeLimited.java rename to src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java index 09705d417..c46902355 100644 --- a/src/main/java/forestry/core/genetics/MutationConditionTimeLimited.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.genetics.mutations; import java.util.Calendar; diff --git a/src/main/java/forestry/core/gui/ContainerAlyzer.java b/src/main/java/forestry/core/gui/ContainerAlyzer.java index 3c2e1d6c3..9b20cb65b 100644 --- a/src/main/java/forestry/core/gui/ContainerAlyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAlyzer.java @@ -4,28 +4,28 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.core.gui.slots.SlotFiltered; -import forestry.core.inventory.AlyzerInventory; +import forestry.core.items.ItemAlyzer; import forestry.core.proxy.Proxies; -public class ContainerAlyzer extends ContainerItemInventory { +public class ContainerAlyzer extends ContainerItemInventory { - public ContainerAlyzer(AlyzerInventory inventory, EntityPlayer player) { + public ContainerAlyzer(ItemAlyzer.AlyzerInventory inventory, EntityPlayer player) { super(inventory, player.inventory, 43, 156); final int xPosLeftSlots = 223; // Energy - this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ENERGY, xPosLeftSlots, 8)); + this.addSlotToContainer(new SlotFiltered(inventory, ItemAlyzer.AlyzerInventory.SLOT_ENERGY, xPosLeftSlots, 8)); // Bee to analyze - this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_SPECIMEN, xPosLeftSlots, 26)); + this.addSlotToContainer(new SlotFiltered(inventory, ItemAlyzer.AlyzerInventory.SLOT_SPECIMEN, xPosLeftSlots, 26)); // Analyzed bee - this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_1, xPosLeftSlots, 57)); - this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_2, xPosLeftSlots, 75)); - this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_3, xPosLeftSlots, 93)); - this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_4, xPosLeftSlots, 111)); - this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_5, xPosLeftSlots, 129)); + this.addSlotToContainer(new SlotFiltered(inventory, ItemAlyzer.AlyzerInventory.SLOT_ANALYZE_1, xPosLeftSlots, 57)); + this.addSlotToContainer(new SlotFiltered(inventory, ItemAlyzer.AlyzerInventory.SLOT_ANALYZE_2, xPosLeftSlots, 75)); + this.addSlotToContainer(new SlotFiltered(inventory, ItemAlyzer.AlyzerInventory.SLOT_ANALYZE_3, xPosLeftSlots, 93)); + this.addSlotToContainer(new SlotFiltered(inventory, ItemAlyzer.AlyzerInventory.SLOT_ANALYZE_4, xPosLeftSlots, 111)); + this.addSlotToContainer(new SlotFiltered(inventory, ItemAlyzer.AlyzerInventory.SLOT_ANALYZE_5, xPosLeftSlots, 129)); } @Override @@ -37,7 +37,7 @@ public class ContainerAlyzer extends ContainerItemInventory { // Last slot is the energy slot, so we don't save that one. for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (i == AlyzerInventory.SLOT_ENERGY) { + if (i == ItemAlyzer.AlyzerInventory.SLOT_ENERGY) { continue; } ItemStack stack = inventory.getStackInSlot(i); diff --git a/src/main/java/forestry/core/gui/ContainerAnalyzer.java b/src/main/java/forestry/core/gui/ContainerAnalyzer.java index ba82f06c5..9d5715d59 100755 --- a/src/main/java/forestry/core/gui/ContainerAnalyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAnalyzer.java @@ -12,10 +12,10 @@ package forestry.core.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.gadgets.TileAnalyzer; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.core.gui.slots.SlotWorking; +import forestry.core.tiles.TileAnalyzer; public class ContainerAnalyzer extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/core/gui/ContainerEscritoire.java b/src/main/java/forestry/core/gui/ContainerEscritoire.java index 136f216d9..b34a60027 100755 --- a/src/main/java/forestry/core/gui/ContainerEscritoire.java +++ b/src/main/java/forestry/core/gui/ContainerEscritoire.java @@ -12,10 +12,10 @@ package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; -import forestry.core.gadgets.TileEscritoire; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.core.network.PacketGuiSelect; +import forestry.core.tiles.TileEscritoire; public class ContainerEscritoire extends ContainerTile implements IGuiSelectable { diff --git a/src/main/java/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java index 6b599b4e8..708bfb26a 100644 --- a/src/main/java/forestry/core/gui/ContainerForestry.java +++ b/src/main/java/forestry/core/gui/ContainerForestry.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import forestry.core.gui.slots.SlotForestry; import forestry.core.network.ForestryPacket; import forestry.core.proxy.Proxies; -import forestry.core.utils.SlotHelper; +import forestry.core.utils.SlotUtil; public abstract class ContainerForestry extends Container { @@ -48,7 +48,7 @@ public abstract class ContainerForestry extends Container { Slot slot = (slotIndex < 0) ? null : (Slot) this.inventorySlots.get(slotIndex); if (slot instanceof SlotForestry && ((SlotForestry) slot).isPhantom()) { - return SlotHelper.slotClickPhantom(slot, button, modifier, player); + return SlotUtil.slotClickPhantom(slot, button, modifier, player); } return super.slotClick(slotIndex, button, modifier, player); @@ -60,7 +60,7 @@ public abstract class ContainerForestry extends Container { return null; } - return SlotHelper.transferStackInSlot(inventorySlots, player, slotIndex); + return SlotUtil.transferStackInSlot(inventorySlots, player, slotIndex); } protected abstract boolean canAccess(EntityPlayer player); diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index f10da2e64..225bf9b48 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -18,9 +18,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.IFluidTank; -import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.tiles.ILiquidTankTile; -public abstract class ContainerLiquidTanks extends ContainerTile implements IContainerLiquidTanks { +public abstract class ContainerLiquidTanks extends ContainerTile implements IContainerLiquidTanks { private final ContainerLiquidTanksHelper helper; diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java b/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java index 3b04eafae..0af36ef78 100644 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java @@ -20,12 +20,12 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import forestry.api.core.IToolPipette; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.PacketId; import forestry.core.network.PacketSlotClick; import forestry.core.proxy.Proxies; +import forestry.core.tiles.ILiquidTankTile; -public class ContainerLiquidTanksHelper implements IContainerLiquidTanks { +public class ContainerLiquidTanksHelper implements IContainerLiquidTanks { private final T tile; diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanksSocketed.java b/src/main/java/forestry/core/gui/ContainerLiquidTanksSocketed.java index aa13df26a..f6a2521ef 100644 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanksSocketed.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanksSocketed.java @@ -20,9 +20,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.IFluidTank; import forestry.core.circuits.ISocketable; -import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.tiles.ILiquidTankTile; -public abstract class ContainerLiquidTanksSocketed extends ContainerTile implements IContainerSocketed, IContainerLiquidTanks { +public abstract class ContainerLiquidTanksSocketed extends ContainerTile implements IContainerSocketed, IContainerLiquidTanks { private final ContainerSocketedHelper socketedHelper; private final ContainerLiquidTanksHelper tanksHelper; diff --git a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java index 2c1134918..fdaeaa298 100755 --- a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java @@ -13,9 +13,9 @@ package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.gadgets.TileNaturalistChest; import forestry.core.gui.slots.SlotFiltered; import forestry.core.network.PacketGuiSelect; +import forestry.core.tiles.TileNaturalistChest; public class ContainerNaturalistInventory extends ContainerTile implements IGuiSelectable { diff --git a/src/main/java/forestry/core/gui/ContainerSocketedHelper.java b/src/main/java/forestry/core/gui/ContainerSocketedHelper.java index 4981211d2..c28f66a61 100644 --- a/src/main/java/forestry/core/gui/ContainerSocketedHelper.java +++ b/src/main/java/forestry/core/gui/ContainerSocketedHelper.java @@ -19,7 +19,7 @@ import forestry.core.network.PacketId; import forestry.core.network.PacketSlotClick; import forestry.core.network.PacketSocketUpdate; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; +import forestry.core.utils.InventoryUtil; public class ContainerSocketedHelper implements IContainerSocketed { @@ -69,7 +69,7 @@ public class ContainerSocketedHelper impleme return; } - StackUtils.stowInInventory(socket, player.inventory, true); + InventoryUtil.stowInInventory(socket, player.inventory, true); // Not sufficient space in player's inventory. failed to stow. if (socket.stackSize > 0) { return; diff --git a/src/main/java/forestry/core/gui/ContainerTile.java b/src/main/java/forestry/core/gui/ContainerTile.java index a402aa6b5..5de1f4a79 100644 --- a/src/main/java/forestry/core/gui/ContainerTile.java +++ b/src/main/java/forestry/core/gui/ContainerTile.java @@ -18,16 +18,16 @@ import net.minecraft.tileentity.TileEntity; import forestry.api.core.IErrorLogicSource; import forestry.api.core.IErrorState; -import forestry.core.delegates.FakeAccessHandler; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.interfaces.IPowerHandler; -import forestry.core.interfaces.IRestrictedAccessTile; +import forestry.core.access.EnumAccess; +import forestry.core.access.FakeAccessHandler; +import forestry.core.access.IAccessHandler; import forestry.core.network.PacketErrorUpdate; import forestry.core.network.PacketGuiEnergy; import forestry.core.network.PacketGuiUpdate; -import forestry.core.utils.EnumAccess; -import forestry.core.utils.Utils; +import forestry.core.tiles.IPowerHandler; +import forestry.core.tiles.IRestrictedAccessTile; +import forestry.core.tiles.TilePowered; +import forestry.core.tiles.TileUtil; import forestry.energy.EnergyManager; public abstract class ContainerTile extends ContainerForestry { @@ -58,7 +58,7 @@ public abstract class ContainerTile extends ContainerFores @Override public final boolean canInteractWith(EntityPlayer entityplayer) { - return Utils.isUseableByPlayer(entityplayer, tile) && accessHandler.allowsViewing(entityplayer); + return TileUtil.isUsableByPlayer(entityplayer, tile) && accessHandler.allowsViewing(entityplayer); } private ImmutableSet previousErrorStates; diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index ef3cc43e0..914a38428 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -38,8 +38,8 @@ import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import forestry.core.config.Defaults; -import forestry.core.genetics.EnumMutateChance; +import forestry.core.config.Constants; +import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; @@ -57,7 +57,7 @@ public abstract class GuiAlyzer extends GuiForestry protected final Map iconStacks = new HashMap(); protected GuiAlyzer(String speciesRoot, EntityPlayer player, ContainerAlyzer container, IInventory inventory, String guiName) { - super(Defaults.TEXTURE_PATH_GUI + "/beealyzer2.png", container, inventory); + super(Constants.TEXTURE_PATH_GUI + "/beealyzer2.png", container, inventory); this.xSize = 246; this.ySize = 238; diff --git a/src/main/java/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java index c4bf93c83..371fd4353 100755 --- a/src/main/java/forestry/core/gui/GuiAnalyzer.java +++ b/src/main/java/forestry/core/gui/GuiAnalyzer.java @@ -12,16 +12,15 @@ package forestry.core.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TileAnalyzer; +import forestry.core.config.Constants; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.TileAnalyzer; public class GuiAnalyzer extends GuiForestryTitled { public GuiAnalyzer(InventoryPlayer inventory, TileAnalyzer tile) { - super(Defaults.TEXTURE_PATH_GUI + "/alyzer.png", new ContainerAnalyzer(inventory, tile), tile); + super(Constants.TEXTURE_PATH_GUI + "/alyzer.png", new ContainerAnalyzer(inventory, tile), tile); ySize = 176; widgetManager.add(new TankWidget(this.widgetManager, 95, 24, 0)); } @@ -29,9 +28,7 @@ public class GuiAnalyzer extends GuiForestryTitled { @@ -177,7 +177,7 @@ public class GuiEscritoire extends GuiForestry= NaturalistGame.BOUNTY_MAX) { + if (bounty >= EscritoireGame.BOUNTY_MAX) { researchNote = getRandomNote(researchNotes.get(Notes.level1)); - } else if (bounty > NaturalistGame.BOUNTY_MAX / 2) { + } else if (bounty > EscritoireGame.BOUNTY_MAX / 2) { researchNote = getRandomNote(researchNotes.get(Notes.level2)); - } else if (bounty > NaturalistGame.BOUNTY_MAX / 4) { + } else if (bounty > EscritoireGame.BOUNTY_MAX / 4) { researchNote = getRandomNote(researchNotes.get(Notes.level3)); } else { researchNote = getRandomNote(researchNotes.get(Notes.level4)); diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 140054e7c..824840e2a 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -37,7 +37,6 @@ import org.lwjgl.opengl.GL12; import forestry.api.core.IErrorLogicSource; import forestry.api.core.IErrorSource; import forestry.core.config.Config; -import forestry.core.gadgets.TileForestry; import forestry.core.gui.ledgers.ClimateLedger; import forestry.core.gui.ledgers.HintLedger; import forestry.core.gui.ledgers.LedgerManager; @@ -48,11 +47,11 @@ import forestry.core.gui.tooltips.ToolTip; import forestry.core.gui.tooltips.ToolTipLine; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; -import forestry.core.interfaces.IClimatised; -import forestry.core.interfaces.IHintSource; -import forestry.core.interfaces.IPowerHandler; import forestry.core.proxy.Proxies; -import forestry.core.utils.FontColour; +import forestry.core.render.FontColour; +import forestry.core.tiles.IClimatised; +import forestry.core.tiles.IPowerHandler; +import forestry.core.tiles.TileForestry; import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; diff --git a/src/main/java/forestry/core/gui/GuiForestryTitled.java b/src/main/java/forestry/core/gui/GuiForestryTitled.java index 57b016c97..569877981 100644 --- a/src/main/java/forestry/core/gui/GuiForestryTitled.java +++ b/src/main/java/forestry/core/gui/GuiForestryTitled.java @@ -13,7 +13,7 @@ package forestry.core.gui; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import forestry.core.interfaces.ITitled; +import forestry.core.tiles.ITitled; import forestry.core.utils.StringUtil; public abstract class GuiForestryTitled extends GuiForestry { diff --git a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java index 84240b72f..2de682ed1 100755 --- a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java @@ -26,8 +26,8 @@ import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import forestry.core.config.Defaults; -import forestry.core.genetics.EnumMutateChance; +import forestry.core.config.Constants; +import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.gui.buttons.GuiBetterButton; import forestry.core.gui.buttons.StandardButtonTextureSets; import forestry.core.network.ForestryPacket; @@ -43,7 +43,7 @@ public class GuiNaturalistInventory extends GuiForestry */ public final class AdjacentInventoryCache implements AdjacentTileCache.ICacheListener { + public interface ITileFilter { + boolean matches(TileEntity tile); + } + private final AdjacentTileCache cache; private boolean changed = true; private final List invs = new LinkedList(); @@ -80,7 +85,7 @@ public final class AdjacentInventoryCache implements AdjacentTileCache.ICacheLis for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { TileEntity tile = cache.getTileOnSide(side); if (tile != null && (filter == null || filter.matches(tile))) { - IInventory inv = InvTools.getInventoryFromTile(tile, side.getOpposite()); + IInventory inv = TileUtil.getInventoryFromTile(tile, side.getOpposite()); if (inv != null) { sides[side.ordinal()] = inv; invs.add(inv); diff --git a/src/main/java/forestry/core/inventory/AlyzerInventory.java b/src/main/java/forestry/core/inventory/AlyzerInventory.java deleted file mode 100644 index 89d2f1367..000000000 --- a/src/main/java/forestry/core/inventory/AlyzerInventory.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.inventory; - -import com.google.common.collect.ImmutableSet; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.api.core.IErrorSource; -import forestry.api.core.IErrorState; -import forestry.core.EnumErrorCode; -import forestry.core.config.ForestryItem; - -public abstract class AlyzerInventory extends ItemInventory implements IErrorSource { - - public static final int SLOT_SPECIMEN = 0; - public static final int SLOT_ANALYZE_1 = 1; - public static final int SLOT_ANALYZE_2 = 2; - public static final int SLOT_ANALYZE_3 = 3; - public static final int SLOT_ANALYZE_4 = 4; - public static final int SLOT_ANALYZE_5 = 6; - public static final int SLOT_ENERGY = 5; - - public AlyzerInventory(EntityPlayer player, int size, ItemStack itemstack) { - super(player, size, itemstack); - } - - protected static boolean isEnergy(ItemStack itemstack) { - if (itemstack == null || itemstack.stackSize <= 0) { - return false; - } - - return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); - } - - private boolean hasSpecimen() { - for (int i = SLOT_SPECIMEN; i <= SLOT_ANALYZE_5; i++) { - if (i == SLOT_ENERGY) { - continue; - } - - ItemStack itemStack = getStackInSlot(i); - if (itemStack != null) { - return true; - } - } - return false; - } - - protected abstract boolean isSpecimen(ItemStack itemStack); - - @Override - public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (slotIndex == SLOT_ENERGY) { - return isEnergy(itemStack); - } else { - return !hasSpecimen() && isSpecimen(itemStack); - } - } - - @Override - public final ImmutableSet getErrorStates() { - ImmutableSet.Builder errorStates = ImmutableSet.builder(); - - if (!hasSpecimen()) { - errorStates.add(EnumErrorCode.NOTHINGANALYZE); - } - - if (!isEnergy(getStackInSlot(SLOT_ENERGY))) { - errorStates.add(EnumErrorCode.NOHONEY); - } - - return errorStates.build(); - } -} diff --git a/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java index 056202182..842fdef40 100644 --- a/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java @@ -14,7 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class FakeInventoryAdapter implements IInventoryAdapter { @@ -43,7 +43,7 @@ public class FakeInventoryAdapter implements IInventoryAdapter { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return Defaults.SLOTS_NONE; + return Constants.SLOTS_NONE; } @Override diff --git a/src/main/java/forestry/core/inventory/IInventoryAdapter.java b/src/main/java/forestry/core/inventory/IInventoryAdapter.java index 4edff5e26..33af8dcc2 100644 --- a/src/main/java/forestry/core/inventory/IInventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/IInventoryAdapter.java @@ -3,7 +3,7 @@ package forestry.core.inventory; import net.minecraft.inventory.ISidedInventory; import forestry.api.core.INBTTagable; -import forestry.core.interfaces.IFilterSlotDelegate; +import forestry.core.tiles.IFilterSlotDelegate; public interface IInventoryAdapter extends ISidedInventory, IFilterSlotDelegate, INBTTagable { diff --git a/src/main/java/forestry/core/inventory/ITileFilter.java b/src/main/java/forestry/core/inventory/ITileFilter.java deleted file mode 100755 index 06ee9ada6..000000000 --- a/src/main/java/forestry/core/inventory/ITileFilter.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.inventory; - -import net.minecraft.tileentity.TileEntity; - -/** - * @author CovertJaguar - */ -public interface ITileFilter { - - boolean matches(TileEntity tile); - -} diff --git a/src/main/java/forestry/core/inventory/InventoryAdapter.java b/src/main/java/forestry/core/inventory/InventoryAdapter.java index ea1ebc624..80969c6e1 100755 --- a/src/main/java/forestry/core/inventory/InventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapter.java @@ -18,11 +18,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; -import forestry.core.utils.PlainInventory; /** * With permission from Krapht. @@ -39,7 +38,7 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { } public InventoryAdapter(int size, String name, int stackLimit) { - this(new PlainInventory(size, name, stackLimit)); + this(new InventoryPlain(size, name, stackLimit)); } public InventoryAdapter(IInventory inventory) { @@ -155,7 +154,7 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { if (allowAutomation) { return slotMap[side]; } - return Defaults.SLOTS_NONE; + return Constants.SLOTS_NONE; } private void configureSided() { @@ -167,7 +166,7 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { slots[i] = i; } - for (int side : Defaults.FACINGS) { + for (int side : Constants.FACINGS) { slotMap[side] = slots; } } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java b/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java index e7061b515..082879831 100644 --- a/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java @@ -13,8 +13,8 @@ package forestry.core.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.core.config.Defaults; -import forestry.core.interfaces.IAccessHandler; +import forestry.core.access.IAccessHandler; +import forestry.core.config.Constants; public class InventoryAdapterRestricted extends InventoryAdapter { private final IAccessHandler accessHandler; @@ -46,7 +46,7 @@ public class InventoryAdapterRestricted extends InventoryAdapter { @Override public int[] getAccessibleSlotsFromSide(int side) { if (!accessHandler.allowsPipeConnections()) { - return Defaults.SLOTS_NONE; + return Constants.SLOTS_NONE; } return super.getAccessibleSlotsFromSide(side); } diff --git a/src/main/java/forestry/core/utils/PlainInventory.java b/src/main/java/forestry/core/inventory/InventoryPlain.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/forestry/core/utils/PlainInventory.java rename to src/main/java/forestry/core/inventory/InventoryPlain.java index c3f2b168a..6154c4259 --- a/src/main/java/forestry/core/utils/PlainInventory.java +++ b/src/main/java/forestry/core/inventory/InventoryPlain.java @@ -8,29 +8,29 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class PlainInventory implements IInventory { +public class InventoryPlain implements IInventory { private final ItemStack[] contents; private final String name; private final int stackLimit; - public PlainInventory(int size, String name) { + public InventoryPlain(int size, String name) { this(size, name, 64); } - public PlainInventory(int size, String name, int stackLimit) { + public InventoryPlain(int size, String name, int stackLimit) { this.contents = new ItemStack[size]; this.name = name; this.stackLimit = stackLimit; } - public PlainInventory(IInventory tocopy) { + public InventoryPlain(IInventory tocopy) { this(tocopy.getSizeInventory(), tocopy.getInventoryName(), tocopy.getInventoryStackLimit()); for (int i = 0; i < tocopy.getSizeInventory(); i++) { if (tocopy.getStackInSlot(i) != null) { diff --git a/src/main/java/forestry/core/inventory/InventorySorter.java b/src/main/java/forestry/core/inventory/InventorySorter.java deleted file mode 100755 index b20aabb8c..000000000 --- a/src/main/java/forestry/core/inventory/InventorySorter.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.inventory; - -import java.util.Comparator; - -import net.minecraft.inventory.IInventory; - -/** - * @author CovertJaguar - */ -public enum InventorySorter implements Comparator { - - SIZE_DECENDING { - @Override - public int compare(IInventory inv1, IInventory inv2) { - return inv2.getSizeInventory() - inv1.getSizeInventory(); - } - - } -} diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index 1b13c1aa4..55ba0ebaa 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -10,20 +10,22 @@ ******************************************************************************/ package forestry.core.inventory; +import java.util.Random; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import forestry.core.interfaces.IFilterSlotDelegate; -import forestry.core.utils.Utils; +import forestry.core.tiles.IFilterSlotDelegate; public abstract class ItemInventory implements IInventory, IFilterSlotDelegate { private static final String KEY_ITEMS = "Items"; // legacy private static final String KEY_SLOTS = "Slots"; private static final String KEY_UID = "UID"; + private static final Random rand = new Random(); private final EntityPlayer player; private final ItemStack parent; @@ -74,7 +76,7 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate { NBTTagCompound nbt = parent.getTagCompound(); if (!nbt.hasKey(KEY_UID)) { - nbt.setInteger(KEY_UID, Utils.getUID()); + nbt.setInteger(KEY_UID, rand.nextInt()); } } diff --git a/src/main/java/forestry/core/inventory/TileInventoryAdapter.java b/src/main/java/forestry/core/inventory/TileInventoryAdapter.java index b086e1c47..7d3668fed 100755 --- a/src/main/java/forestry/core/inventory/TileInventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/TileInventoryAdapter.java @@ -13,7 +13,7 @@ package forestry.core.inventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import forestry.core.interfaces.IRestrictedAccessTile; +import forestry.core.tiles.IRestrictedAccessTile; public class TileInventoryAdapter extends InventoryAdapterRestricted { diff --git a/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java b/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java index f64a1c08f..c218fb093 100755 --- a/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java +++ b/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java @@ -12,7 +12,7 @@ package forestry.core.inventory.filters; import net.minecraft.item.ItemStack; -import forestry.core.inventory.InvTools; +import forestry.core.utils.InventoryUtil; /** * @author CovertJaguar @@ -30,7 +30,7 @@ public class ArrayStackFilter implements IStackFilter { if (stacks.length == 0 || !hasFilter()) { return true; } - return InvTools.isItemEqual(stack, stacks); + return InventoryUtil.isItemEqual(stack, stacks); } public ItemStack[] getStacks() { diff --git a/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java index 48398105c..651e136bc 100755 --- a/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java +++ b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java @@ -16,10 +16,10 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import forestry.core.inventory.InvTools; import forestry.core.inventory.filters.IStackFilter; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; +import forestry.core.utils.InventoryUtil; /** * @author CovertJaguar @@ -90,7 +90,7 @@ public class InventoryManipulator { } for (IInvSlot slot : slots) { ItemStack stackInSlot = slot.getStackInSlot(); - if (stackInSlot == null || InvTools.isItemEqual(stackInSlot, stack)) { + if (stackInSlot == null || InventoryUtil.isItemEqual(stackInSlot, stack)) { int used = addToSlot(slot, stack, stack.stackSize - injected, doAdd); if (used > 0) { injected += used; @@ -121,7 +121,7 @@ public class InventoryManipulator { return wanted; } - if (!InvTools.isItemEqual(stack, stackInSlot)) { + if (!InventoryUtil.isItemEqual(stack, stackInSlot)) { return 0; } diff --git a/src/main/java/forestry/core/interfaces/ICraftingPlan.java b/src/main/java/forestry/core/items/ICraftingPlan.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/interfaces/ICraftingPlan.java rename to src/main/java/forestry/core/items/ICraftingPlan.java index 16e6fdd67..7f793474d --- a/src/main/java/forestry/core/interfaces/ICraftingPlan.java +++ b/src/main/java/forestry/core/items/ICraftingPlan.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/interfaces/IInventoriedItem.java b/src/main/java/forestry/core/items/IInventoriedItem.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/core/interfaces/IInventoriedItem.java rename to src/main/java/forestry/core/items/IInventoriedItem.java index ce618c9cc..45301873e --- a/src/main/java/forestry/core/interfaces/IInventoriedItem.java +++ b/src/main/java/forestry/core/items/IInventoriedItem.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.items; public interface IInventoriedItem { diff --git a/src/main/java/forestry/core/gadgets/IStructureBlockItem.java b/src/main/java/forestry/core/items/IStructureBlockItem.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/gadgets/IStructureBlockItem.java rename to src/main/java/forestry/core/items/IStructureBlockItem.java index 55b57256b..cf876b788 --- a/src/main/java/forestry/core/gadgets/IStructureBlockItem.java +++ b/src/main/java/forestry/core/items/IStructureBlockItem.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.items; /** * @author CovertJaguar diff --git a/src/main/java/forestry/core/items/ItemAlyzer.java b/src/main/java/forestry/core/items/ItemAlyzer.java new file mode 100644 index 000000000..148c1fceb --- /dev/null +++ b/src/main/java/forestry/core/items/ItemAlyzer.java @@ -0,0 +1,88 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.items; + +import com.google.common.collect.ImmutableSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import forestry.api.core.IErrorSource; +import forestry.api.core.IErrorState; +import forestry.core.config.ForestryItem; +import forestry.core.errors.EnumErrorCode; +import forestry.core.inventory.ItemInventory; + +public abstract class ItemAlyzer extends ItemInventoried { + + public abstract static class AlyzerInventory extends ItemInventory implements IErrorSource { + public static final int SLOT_SPECIMEN = 0; + public static final int SLOT_ANALYZE_1 = 1; + public static final int SLOT_ANALYZE_2 = 2; + public static final int SLOT_ANALYZE_3 = 3; + public static final int SLOT_ANALYZE_4 = 4; + public static final int SLOT_ANALYZE_5 = 6; + public static final int SLOT_ENERGY = 5; + + public AlyzerInventory(EntityPlayer player, int size, ItemStack itemstack) { + super(player, size, itemstack); + } + + protected static boolean isEnergy(ItemStack itemstack) { + if (itemstack == null || itemstack.stackSize <= 0) { + return false; + } + + return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); + } + + private boolean hasSpecimen() { + for (int i = SLOT_SPECIMEN; i <= SLOT_ANALYZE_5; i++) { + if (i == SLOT_ENERGY) { + continue; + } + + ItemStack itemStack = getStackInSlot(i); + if (itemStack != null) { + return true; + } + } + return false; + } + + protected abstract boolean isSpecimen(ItemStack itemStack); + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_ENERGY) { + return isEnergy(itemStack); + } else { + return !hasSpecimen() && isSpecimen(itemStack); + } + } + + @Override + public final ImmutableSet getErrorStates() { + ImmutableSet.Builder errorStates = ImmutableSet.builder(); + + if (!hasSpecimen()) { + errorStates.add(EnumErrorCode.NOTHINGANALYZE); + } + + if (!isEnergy(getStackInSlot(SLOT_ENERGY))) { + errorStates.add(EnumErrorCode.NOHONEY); + } + + return errorStates.build(); + } + } + +} diff --git a/src/main/java/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java index e5809aad3..ec3cbc079 100755 --- a/src/main/java/forestry/core/items/ItemArmorNaturalist.java +++ b/src/main/java/forestry/core/items/ItemArmorNaturalist.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.IArmorNaturalist; import forestry.core.CreativeTabForestry; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; @@ -36,7 +36,7 @@ public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist { @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return Defaults.ID + ":" + Defaults.TEXTURE_NATURALIST_ARMOR_PRIMARY; + return Constants.ID + ":" + Constants.TEXTURE_NATURALIST_ARMOR_PRIMARY; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/core/items/ItemForestryBlock.java b/src/main/java/forestry/core/items/ItemBlockForestry.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/core/items/ItemForestryBlock.java rename to src/main/java/forestry/core/items/ItemBlockForestry.java index 76198ba33..4251c06f5 --- a/src/main/java/forestry/core/items/ItemForestryBlock.java +++ b/src/main/java/forestry/core/items/ItemBlockForestry.java @@ -18,9 +18,9 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemForestryBlock extends ItemBlock { +public class ItemBlockForestry extends ItemBlock { - public ItemForestryBlock(Block block) { + public ItemBlockForestry(Block block) { super(block); setMaxDamage(0); setHasSubtypes(true); diff --git a/src/main/java/forestry/core/items/ItemNBTTile.java b/src/main/java/forestry/core/items/ItemBlockNBT.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/forestry/core/items/ItemNBTTile.java rename to src/main/java/forestry/core/items/ItemBlockNBT.java index 787bb2ef1..b446aed33 --- a/src/main/java/forestry/core/items/ItemNBTTile.java +++ b/src/main/java/forestry/core/items/ItemBlockNBT.java @@ -16,9 +16,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public class ItemNBTTile extends ItemForestryBlock { +public class ItemBlockNBT extends ItemBlockForestry { - public ItemNBTTile(Block block) { + public ItemBlockNBT(Block block) { super(block); } diff --git a/src/main/java/forestry/core/items/ItemTypedBlock.java b/src/main/java/forestry/core/items/ItemBlockTyped.java similarity index 50% rename from src/main/java/forestry/core/items/ItemTypedBlock.java rename to src/main/java/forestry/core/items/ItemBlockTyped.java index 2eea302ab..9271a9128 100644 --- a/src/main/java/forestry/core/items/ItemTypedBlock.java +++ b/src/main/java/forestry/core/items/ItemBlockTyped.java @@ -1,17 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.core.items; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import forestry.core.IItemTyped; +import forestry.core.blocks.IItemTyped; /** * For blocks whose type depends on metadata. * This allows control over which localized name maps to which meta value. */ -public class ItemTypedBlock extends ItemForestryBlock { +public class ItemBlockTyped extends ItemBlockForestry { - public ItemTypedBlock(Block block) { + public ItemBlockTyped(Block block) { super(block); } diff --git a/src/main/java/forestry/core/items/ItemInventoried.java b/src/main/java/forestry/core/items/ItemInventoried.java index 152146409..51b3de31d 100755 --- a/src/main/java/forestry/core/items/ItemInventoried.java +++ b/src/main/java/forestry/core/items/ItemInventoried.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import forestry.core.gui.ContainerItemInventory; -import forestry.core.interfaces.IInventoriedItem; public abstract class ItemInventoried extends ItemForestry implements IInventoriedItem { diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java index a983b2d28..bfb73de51 100755 --- a/src/main/java/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -25,7 +25,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.INBTTagable; import forestry.api.core.IToolPipette; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; @@ -201,6 +201,6 @@ public class ItemPipette extends ItemForestry implements IToolPipette { @Override public int getCapacity(ItemStack pipette) { - return Defaults.BUCKET_VOLUME; + return Constants.BUCKET_VOLUME; } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java index 4d732e4f5..1e87e8801 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -24,15 +24,15 @@ import com.mojang.authlib.GameProfile; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; -import forestry.core.delegates.AccessHandler; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.interfaces.IOwnable; -import forestry.core.interfaces.IRestrictedAccessTile; +import forestry.core.access.AccessHandler; +import forestry.core.access.IAccessHandler; +import forestry.core.access.IOwnable; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.proxy.Proxies; +import forestry.core.tiles.IRestrictedAccessTile; +import forestry.core.utils.Log; import forestry.core.utils.StringUtil; /** @@ -148,7 +148,7 @@ public abstract class MultiblockControllerBase implements ISidedInventory, IRest CoordTriplet coord = part.getWorldLocation(); if (!connectedParts.add(part)) { - Proxies.log.warning("[%s] Controller %s is double-adding part %d @ %s. This is unusual. If you encounter odd behavior, please tear down the machine and rebuild it.", (worldObj.isRemote ? "CLIENT" : "SERVER"), hashCode(), part.hashCode(), coord); + Log.warning("[%s] Controller %s is double-adding part %d @ %s. This is unusual. If you encounter odd behavior, please tear down the machine and rebuild it.", (worldObj.isRemote ? "CLIENT" : "SERVER"), hashCode(), part.hashCode(), coord); } part.onAttached(this); @@ -310,7 +310,7 @@ public abstract class MultiblockControllerBase implements ISidedInventory, IRest // Strip out this part onDetachBlock(part); if (!connectedParts.remove(part)) { - Proxies.log.warning("[%s] Double-removing part (%d) @ %d, %d, %d, this is unexpected and may cause problems. If you encounter anomalies, please tear down the reactor and rebuild it.", worldObj.isRemote ? "CLIENT" : "SERVER", part.hashCode(), part.xCoord, part.yCoord, part.zCoord); + Log.warning("[%s] Double-removing part (%d) @ %d, %d, %d, this is unexpected and may cause problems. If you encounter anomalies, please tear down the reactor and rebuild it.", worldObj.isRemote ? "CLIENT" : "SERVER", part.hashCode(), part.xCoord, part.yCoord, part.zCoord); } if (connectedParts.isEmpty()) { @@ -757,7 +757,7 @@ public abstract class MultiblockControllerBase implements ISidedInventory, IRest return false; } else { // Strip dead parts from both and retry - Proxies.log.warning("[%s] Encountered two controllers with the same reference coordinate. Auditing connected parts and retrying.", worldObj.isRemote ? "CLIENT" : "SERVER"); + Log.warning("[%s] Encountered two controllers with the same reference coordinate. Auditing connected parts and retrying.", worldObj.isRemote ? "CLIENT" : "SERVER"); auditParts(); otherController.auditParts(); @@ -767,8 +767,8 @@ public abstract class MultiblockControllerBase implements ISidedInventory, IRest } else if (res > 0) { return false; } else { - Proxies.log.severe("My Controller (%d): size (%d), parts: %s", hashCode(), connectedParts.size(), getPartsListString()); - Proxies.log.severe("Other Controller (%d): size (%d), coords: %s", otherController.hashCode(), otherController.connectedParts.size(), otherController.getPartsListString()); + Log.severe("My Controller (%d): size (%d), parts: %s", hashCode(), connectedParts.size(), getPartsListString()); + Log.severe("Other Controller (%d): size (%d), coords: %s", otherController.hashCode(), otherController.connectedParts.size(), otherController.getPartsListString()); throw new IllegalArgumentException("[" + (worldObj.isRemote ? "CLIENT" : "SERVER") + "] Two controllers with the same reference coord that somehow both have valid parts - this should never happen!"); } @@ -814,7 +814,7 @@ public abstract class MultiblockControllerBase implements ISidedInventory, IRest } connectedParts.removeAll(deadParts); - Proxies.log.warning("[%s] Controller found %d dead parts during an audit, %d parts remain attached", worldObj.isRemote ? "CLIENT" : "SERVER", deadParts.size(), connectedParts.size()); + Log.warning("[%s] Controller found %d dead parts during an audit, %d parts remain attached", worldObj.isRemote ? "CLIENT" : "SERVER", deadParts.size(), connectedParts.size()); } /** diff --git a/src/main/java/forestry/core/multiblock/MultiblockRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockRegistry.java index 472fefcf7..ad3bc7efe 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockRegistry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockRegistry.java @@ -6,7 +6,7 @@ import java.util.Set; import net.minecraft.world.World; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; /** * This is a very static singleton registry class which directs incoming events to sub-objects, which @@ -99,7 +99,7 @@ public class MultiblockRegistry { if (registries.containsKey(world)) { registries.get(world).addDeadController(controller); } else { - Proxies.log.warning("Controller %d in world %s marked as dead, but that world is not tracked! Controller is being ignored.", controller.hashCode(), world); + Log.warning("Controller %d in world %s marked as dead, but that world is not tracked! Controller is being ignored.", controller.hashCode(), world); } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockTileEntityBase.java b/src/main/java/forestry/core/multiblock/MultiblockTileEntityBase.java index 74398ba5f..6b550dbc1 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockTileEntityBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockTileEntityBase.java @@ -18,12 +18,12 @@ import net.minecraft.world.chunk.IChunkProvider; import com.mojang.authlib.GameProfile; -import forestry.core.config.Defaults; -import forestry.core.interfaces.IFilterSlotDelegate; -import forestry.core.interfaces.IOwnable; +import forestry.core.access.IOwnable; +import forestry.core.config.Constants; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.proxy.Proxies; +import forestry.core.tiles.IFilterSlotDelegate; +import forestry.core.utils.Log; import forestry.core.utils.PlayerUtil; /** @@ -89,7 +89,7 @@ public abstract class MultiblockTileEntityBase extends IMultiblockPart implement @Override public final void assertDetached() { if (this.controller != null) { - Proxies.log.info("[assert] Part @ (%d, %d, %d) should be detached already, but detected that it was not. This is not a fatal error, and will be repaired, but is unusual.", xCoord, yCoord, zCoord); + Log.info("[assert] Part @ (%d, %d, %d) should be detached already, but detected that it was not. This is not a fatal error, and will be repaired, but is unusual.", xCoord, yCoord, zCoord); this.controller = null; } } @@ -481,7 +481,7 @@ public abstract class MultiblockTileEntityBase extends IMultiblockPart implement if (allowsAutomation()) { return getInternalInventory().getAccessibleSlotsFromSide(side); } else { - return Defaults.SLOTS_NONE; + return Constants.SLOTS_NONE; } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java index 863905dfb..6a7641206 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java @@ -12,7 +12,7 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; /** * This class manages all the multiblock controllers that exist in a given world, @@ -188,7 +188,7 @@ public class MultiblockWorldRegistry { } if (newMaster == null) { - Proxies.log.severe("Multiblock system checked a merge pool of size %d, found no master candidates. This should never happen.", mergePool.size()); + Log.severe("Multiblock system checked a merge pool of size %d, found no master candidates. This should never happen.", mergePool.size()); } else { // Merge all the other machines into the master machine, then unregister them addDirtyController(newMaster); @@ -239,7 +239,7 @@ public class MultiblockWorldRegistry { // Go through any controllers which have marked themselves as potentially dead. // Validate that they are empty/dead, then unregister them. if (!controller.isEmpty()) { - Proxies.log.severe("Found a non-empty controller. Forcing it to shed its blocks and die. This should never happen!"); + Log.severe("Found a non-empty controller. Forcing it to shed its blocks and die. This should never happen!"); detachedParts.addAll(controller.detachAllBlocks()); } diff --git a/src/main/java/forestry/core/network/DataInputStreamForestry.java b/src/main/java/forestry/core/network/DataInputStreamForestry.java index 1eb33e183..1906fe078 100644 --- a/src/main/java/forestry/core/network/DataInputStreamForestry.java +++ b/src/main/java/forestry/core/network/DataInputStreamForestry.java @@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.registry.GameData; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; public class DataInputStreamForestry extends DataInputStream { @@ -68,7 +68,7 @@ public class DataInputStreamForestry extends DataInputStream { streamable.readData(this); return streamable; } catch (ReflectiveOperationException e) { - Proxies.log.severe("Failed to read Streamable for class " + streamableClass + " with error " + e); + Log.severe("Failed to read Streamable for class " + streamableClass + " with error " + e); } } return null; diff --git a/src/main/java/forestry/core/network/GuiId.java b/src/main/java/forestry/core/network/GuiId.java index 0bd99d2fd..ee5b3c23a 100755 --- a/src/main/java/forestry/core/network/GuiId.java +++ b/src/main/java/forestry/core/network/GuiId.java @@ -45,11 +45,11 @@ public enum GuiId { CentrifugeGUI, - EngineBronzeGUI, + EngineBiogasGUI, - EngineCopperGUI, + EnginePeatGUI, - EngineTinGUI, + EngineElectricGUI, FabricatorGUI, diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index 8c4b821bd..ee2aeaf42 100644 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -43,10 +43,10 @@ import forestry.core.genetics.BreedingTracker; import forestry.core.gui.IContainerLiquidTanks; import forestry.core.gui.IContainerSocketed; import forestry.core.gui.IGuiSelectable; -import forestry.core.interfaces.IRestrictedAccessTile; import forestry.core.proxy.Proxies; +import forestry.core.tiles.IRestrictedAccessTile; import forestry.farming.multiblock.IFarmController; -import forestry.farming.multiblock.TileFarm; +import forestry.farming.tiles.TileFarm; import forestry.plugins.PluginManager; import io.netty.buffer.ByteBufInputStream; diff --git a/src/main/java/forestry/core/network/PacketItemStackDisplay.java b/src/main/java/forestry/core/network/PacketItemStackDisplay.java index f1ed1fec5..03f6da713 100644 --- a/src/main/java/forestry/core/network/PacketItemStackDisplay.java +++ b/src/main/java/forestry/core/network/PacketItemStackDisplay.java @@ -15,9 +15,9 @@ import java.io.IOException; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import forestry.core.gadgets.TileForestry; -import forestry.core.interfaces.IItemStackDisplay; import forestry.core.proxy.Proxies; +import forestry.core.tiles.IItemStackDisplay; +import forestry.core.tiles.TileForestry; public class PacketItemStackDisplay extends PacketCoordinates { diff --git a/src/main/java/forestry/core/proxy/Proxies.java b/src/main/java/forestry/core/proxy/Proxies.java index db198f577..be643d819 100755 --- a/src/main/java/forestry/core/proxy/Proxies.java +++ b/src/main/java/forestry/core/proxy/Proxies.java @@ -13,12 +13,10 @@ package forestry.core.proxy; import cpw.mods.fml.common.SidedProxy; public class Proxies { - @SidedProxy(clientSide = "forestry.core.proxy.ClientProxyCommon", serverSide = "forestry.core.proxy.ProxyCommon") + @SidedProxy(clientSide = "forestry.core.proxy.ProxyCommonClient", serverSide = "forestry.core.proxy.ProxyCommon") public static ProxyCommon common; - @SidedProxy(clientSide = "forestry.core.proxy.ClientProxyNetwork", serverSide = "forestry.core.proxy.ProxyNetwork") + @SidedProxy(clientSide = "forestry.core.proxy.ProxyNetworkClient", serverSide = "forestry.core.proxy.ProxyNetwork") public static ProxyNetwork net; - @SidedProxy(clientSide = "forestry.core.proxy.ClientProxyRender", serverSide = "forestry.core.proxy.ProxyRender") + @SidedProxy(clientSide = "forestry.core.proxy.ProxyRenderClient", serverSide = "forestry.core.proxy.ProxyRender") public static ProxyRender render; - - public static final ProxyLog log = new ProxyLog(); } diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 6f8a20a70..e3f9a1354 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -51,8 +51,7 @@ import cpw.mods.fml.common.versioning.VersionRange; import forestry.Forestry; import forestry.core.TickHandlerCoreServer; -import forestry.core.WorldGenerator; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.multiblock.MultiblockServerTickHandler; @@ -60,7 +59,9 @@ import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketFXSignal; import forestry.core.network.PacketId; import forestry.core.render.SpriteSheet; +import forestry.core.utils.Log; import forestry.core.utils.StringUtil; +import forestry.core.worldgen.WorldGenerator; import forestry.plugins.PluginManager; public class ProxyCommon { @@ -217,7 +218,7 @@ public class ProxyCommon { } public boolean setBlockWithNotify(World world, int x, int y, int z, Block block) { - return world.setBlock(x, y, z, block, 0, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } public void playSoundFX(World world, int x, int y, int z, Block block) { @@ -345,7 +346,7 @@ public class ProxyCommon { Class clas = Class.forName(className, true, Loader.instance().getModClassLoader()); return clas.newInstance(); } catch (Exception ex) { - Proxies.log.severe("Failed to load " + className + " even though mod " + modname + " was available."); + Log.severe("Failed to load " + className + " even though mod " + modname + " was available."); return null; } } else { diff --git a/src/main/java/forestry/core/proxy/ClientProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommonClient.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/core/proxy/ClientProxyCommon.java rename to src/main/java/forestry/core/proxy/ProxyCommonClient.java index 900879942..c7c34486c --- a/src/main/java/forestry/core/proxy/ClientProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommonClient.java @@ -36,14 +36,14 @@ import org.lwjgl.input.Keyboard; import forestry.apiculture.render.TextureHabitatLocator; import forestry.core.ForestryClient; import forestry.core.TickHandlerCoreClient; -import forestry.core.WorldGenerator; +import forestry.core.entities.EntityFXHoneydust; +import forestry.core.entities.EntityFXIgnition; +import forestry.core.entities.EntityFXSnow; import forestry.core.multiblock.MultiblockClientTickHandler; -import forestry.core.render.EntityHoneydustFX; -import forestry.core.render.EntityIgnitionFX; -import forestry.core.render.EntitySnowFX; import forestry.core.render.SpriteSheet; +import forestry.core.worldgen.WorldGenerator; -public class ClientProxyCommon extends ProxyCommon { +public class ProxyCommonClient extends ProxyCommon { @Override public void bindTexture(ResourceLocation location) { @@ -166,16 +166,16 @@ public class ClientProxyCommon extends ProxyCommon { @Override public void addEntitySwarmFX(World world, double d1, double d2, double d3) { - if (!ClientProxyRender.shouldSpawnParticle(world)) { + if (!ProxyRenderClient.shouldSpawnParticle(world)) { return; } - getClientInstance().effectRenderer.addEffect(new EntityHoneydustFX(world, d1, d2, d3, 0, 0, 0)); + getClientInstance().effectRenderer.addEffect(new EntityFXHoneydust(world, d1, d2, d3, 0, 0, 0)); } @Override public void addEntityExplodeFX(World world, double d1, double d2, double d3) { - if (!ClientProxyRender.shouldSpawnParticle(world)) { + if (!ProxyRenderClient.shouldSpawnParticle(world)) { return; } @@ -184,25 +184,25 @@ public class ClientProxyCommon extends ProxyCommon { @Override public void addEntitySnowFX(World world, double d1, double d2, double d3) { - if (!ClientProxyRender.shouldSpawnParticle(world)) { + if (!ProxyRenderClient.shouldSpawnParticle(world)) { return; } - getClientInstance().effectRenderer.addEffect(new EntitySnowFX(world, d1 + world.rand.nextGaussian(), d2, d3 + world.rand.nextGaussian())); + getClientInstance().effectRenderer.addEffect(new EntityFXSnow(world, d1 + world.rand.nextGaussian(), d2, d3 + world.rand.nextGaussian())); } @Override public void addEntityIgnitionFX(World world, double d1, double d2, double d3) { - if (!ClientProxyRender.shouldSpawnParticle(world)) { + if (!ProxyRenderClient.shouldSpawnParticle(world)) { return; } - getClientInstance().effectRenderer.addEffect(new EntityIgnitionFX(world, d1, d2, d3)); + getClientInstance().effectRenderer.addEffect(new EntityFXIgnition(world, d1, d2, d3)); } @Override public void addEntityPotionFX(World world, double d1, double d2, double d3, int color) { - if (!ClientProxyRender.shouldSpawnParticle(world)) { + if (!ProxyRenderClient.shouldSpawnParticle(world)) { return; } diff --git a/src/main/java/forestry/core/proxy/ClientProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/core/proxy/ClientProxyNetwork.java rename to src/main/java/forestry/core/proxy/ProxyNetworkClient.java index 02afe98f8..d57c36515 --- a/src/main/java/forestry/core/proxy/ClientProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java @@ -14,7 +14,7 @@ import net.minecraft.client.network.NetHandlerPlayClient; import forestry.core.network.ForestryPacket; -public class ClientProxyNetwork extends ProxyNetwork { +public class ProxyNetworkClient extends ProxyNetwork { @Override public void sendToServer(ForestryPacket packet) { diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 9d47db1ea..b4aeb5744 100755 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -12,8 +12,8 @@ package forestry.core.proxy; import net.minecraft.client.renderer.texture.IIconRegister; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.interfaces.IBlockRenderer; +import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.MachineDefinition; public class ProxyRender { diff --git a/src/main/java/forestry/core/proxy/ClientProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/forestry/core/proxy/ClientProxyRender.java rename to src/main/java/forestry/core/proxy/ProxyRenderClient.java index 4dda19f88..f8674d2ba --- a/src/main/java/forestry/core/proxy/ClientProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -21,17 +21,17 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; import forestry.core.config.Config; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.render.BlockRenderingHandler; +import forestry.core.render.ForestryResource; +import forestry.core.render.IBlockRenderer; +import forestry.core.render.RenderBlock; import forestry.core.render.RenderEscritoire; import forestry.core.render.RenderMachine; import forestry.core.render.RenderMill; import forestry.core.render.TextureManager; import forestry.core.render.TileRendererIndex; -import forestry.core.utils.ForestryResource; +import forestry.core.tiles.MachineDefinition; -public class ClientProxyRender extends ProxyRender { +public class ProxyRenderClient extends ProxyRender { @Override public int getNextAvailableRenderId() { @@ -50,7 +50,7 @@ public class ClientProxyRender extends ProxyRender { @Override public void registerTESR(MachineDefinition definition) { - BlockRenderingHandler.byBlockRenderer.put(new TileRendererIndex(definition.getBlock(), definition.getMeta()), definition.renderer); + RenderBlock.byBlockRenderer.put(new TileRendererIndex(definition.getBlock(), definition.getMeta()), definition.renderer); ClientRegistry.bindTileEntitySpecialRenderer(definition.teClass, (TileEntitySpecialRenderer) definition.renderer); } diff --git a/src/main/java/forestry/core/interfaces/IDescriptiveRecipe.java b/src/main/java/forestry/core/recipes/IDescriptiveRecipe.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/interfaces/IDescriptiveRecipe.java rename to src/main/java/forestry/core/recipes/IDescriptiveRecipe.java index a57316179..02160ab0d --- a/src/main/java/forestry/core/interfaces/IDescriptiveRecipe.java +++ b/src/main/java/forestry/core/recipes/IDescriptiveRecipe.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.recipes; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/forestry/core/utils/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/forestry/core/utils/RecipeUtil.java rename to src/main/java/forestry/core/recipes/RecipeUtil.java index d522c1a27..259c202bd --- a/src/main/java/forestry/core/utils/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.recipes; import java.util.ArrayList; import java.util.Collections; @@ -30,14 +30,14 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.recipes.RecipeManagers; import forestry.core.fluids.Fluids; import forestry.core.gui.ContainerDummy; -import forestry.core.interfaces.IDescriptiveRecipe; -import forestry.core.proxy.Proxies; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Log; -public class RecipeUtil { +public abstract class RecipeUtil { private static final Container DUMMY_CONTAINER = new ContainerDummy(); - public static void injectLeveledRecipe(ItemStack resource, int fermentationValue, Fluids output) { + public static void addFermenterRecipes(ItemStack resource, int fermentationValue, Fluids output) { if (RecipeManagers.fermenterManager == null) { return; } @@ -103,8 +103,8 @@ public class RecipeUtil { } } catch (Exception ex) { - Proxies.log.warning("Exception while trying to parse an ItemStack[10] from an IRecipe:"); - Proxies.log.warning(ex.getMessage()); + Log.warning("Exception while trying to parse an ItemStack[10] from an IRecipe:"); + Log.warning(ex.getMessage()); } return null; @@ -123,7 +123,7 @@ public class RecipeUtil { public static boolean canCraftRecipe(World world, ItemStack[] recipeItems, ItemStack recipeOutput, ItemStack[] availableItems) { // Need at least one matched set - if (StackUtils.containsSets(recipeItems, availableItems, true, true) == 0) { + if (ItemStackUtil.containsSets(recipeItems, availableItems, true, true) == 0) { return false; } @@ -137,7 +137,7 @@ public class RecipeUtil { // in place of the ones in the saved crafting inventory. // Check that the recipe it makes is the same as the currentRecipe. InventoryCrafting crafting = new InventoryCrafting(DUMMY_CONTAINER, 3, 3); - ItemStack[] stockCopy = StackUtils.condenseStacks(availableItems); + ItemStack[] stockCopy = ItemStackUtil.condenseStacks(availableItems); for (int slot = 0; slot < recipeItems.length; slot++) { ItemStack recipeStack = recipeItems[slot]; @@ -147,8 +147,8 @@ public class RecipeUtil { // Use crafting equivalent (not oredict) items first for (ItemStack stockStack : stockCopy) { - if (stockStack.stackSize > 0 && StackUtils.isCraftingEquivalent(recipeStack, stockStack, false, false)) { - ItemStack stack = StackUtils.createSplitStack(stockStack, 1); + if (stockStack.stackSize > 0 && ItemStackUtil.isCraftingEquivalent(recipeStack, stockStack, false, false)) { + ItemStack stack = ItemStackUtil.createSplitStack(stockStack, 1); stockStack.stackSize--; crafting.setInventorySlotContents(slot, stack); break; @@ -158,8 +158,8 @@ public class RecipeUtil { // Use oredict items if crafting equivalent items aren't available if (crafting.getStackInSlot(slot) == null) { for (ItemStack stockStack : stockCopy) { - if (stockStack.stackSize > 0 && StackUtils.isCraftingEquivalent(recipeStack, stockStack, true, true)) { - ItemStack stack = StackUtils.createSplitStack(stockStack, 1); + if (stockStack.stackSize > 0 && ItemStackUtil.isCraftingEquivalent(recipeStack, stockStack, true, true)) { + ItemStack stack = ItemStackUtil.createSplitStack(stockStack, 1); stockStack.stackSize--; crafting.setInventorySlotContents(slot, stack); break; diff --git a/src/main/java/forestry/core/utils/ShapedRecipeCustom.java b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/utils/ShapedRecipeCustom.java rename to src/main/java/forestry/core/recipes/ShapedRecipeCustom.java index 9903846d1..8c4617388 --- a/src/main/java/forestry/core/utils/ShapedRecipeCustom.java +++ b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.recipes; import java.util.ArrayList; import java.util.HashMap; @@ -24,10 +24,9 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; -import forestry.core.interfaces.IDescriptiveRecipe; public class ShapedRecipeCustom implements IDescriptiveRecipe { @@ -176,7 +175,7 @@ public class ShapedRecipeCustom implements IDescriptiveRecipe { return false; } - if (compare.getItemDamage() != Defaults.WILDCARD && compare.getItemDamage() != resource.getItemDamage()) { + if (compare.getItemDamage() != Constants.WILDCARD && compare.getItemDamage() != resource.getItemDamage()) { return false; } @@ -269,7 +268,7 @@ public class ShapedRecipeCustom implements IDescriptiveRecipe { } else if (materials[index + 1] instanceof ForestryBlock) { hashmap.put(character, ((ForestryBlock) materials[index + 1]).getItemStack()); } else if (materials[index + 1] instanceof Block) { - hashmap.put(character, new ItemStack((Block) materials[index + 1], 1, Defaults.WILDCARD)); + hashmap.put(character, new ItemStack((Block) materials[index + 1], 1, Constants.WILDCARD)); } else if (materials[index + 1] instanceof ItemStack) { hashmap.put(character, materials[index + 1]); } else if (materials[index + 1] instanceof String) { diff --git a/src/main/java/forestry/core/utils/ShapelessRecipeCustom.java b/src/main/java/forestry/core/recipes/ShapelessRecipeCustom.java similarity index 95% rename from src/main/java/forestry/core/utils/ShapelessRecipeCustom.java rename to src/main/java/forestry/core/recipes/ShapelessRecipeCustom.java index f5fb241c8..006f7bc71 100644 --- a/src/main/java/forestry/core/utils/ShapelessRecipeCustom.java +++ b/src/main/java/forestry/core/recipes/ShapelessRecipeCustom.java @@ -1,4 +1,4 @@ -package forestry.core.utils; +package forestry.core.recipes; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCustomRecipes.java b/src/main/java/forestry/core/recipes/craftguide/CraftGuideCustomRecipes.java similarity index 93% rename from src/main/java/forestry/factory/recipes/craftguide/CraftGuideCustomRecipes.java rename to src/main/java/forestry/core/recipes/craftguide/CraftGuideCustomRecipes.java index 84322eef5..f156a4298 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCustomRecipes.java +++ b/src/main/java/forestry/core/recipes/craftguide/CraftGuideCustomRecipes.java @@ -8,14 +8,14 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.craftguide; +package forestry.core.recipes.craftguide; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import forestry.core.interfaces.IDescriptiveRecipe; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.IDescriptiveRecipe; +import forestry.core.recipes.RecipeUtil; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideIntegration.java b/src/main/java/forestry/core/recipes/craftguide/CraftGuideIntegration.java similarity index 56% rename from src/main/java/forestry/factory/recipes/craftguide/CraftGuideIntegration.java rename to src/main/java/forestry/core/recipes/craftguide/CraftGuideIntegration.java index 275f05f66..db9339524 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideIntegration.java +++ b/src/main/java/forestry/core/recipes/craftguide/CraftGuideIntegration.java @@ -8,11 +8,18 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.craftguide; +package forestry.core.recipes.craftguide; import java.lang.reflect.Method; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; +import forestry.factory.recipes.craftguide.CraftGuideBottler; +import forestry.factory.recipes.craftguide.CraftGuideCarpenter; +import forestry.factory.recipes.craftguide.CraftGuideCentrifuge; +import forestry.factory.recipes.craftguide.CraftGuideFabricator; +import forestry.factory.recipes.craftguide.CraftGuideFermenter; +import forestry.factory.recipes.craftguide.CraftGuideSqueezer; +import forestry.factory.recipes.craftguide.CraftGuideStill; public class CraftGuideIntegration { @@ -22,26 +29,26 @@ public class CraftGuideIntegration { private static void registerRecipeProviders() { - Proxies.log.info("Registering CraftGuide integration."); + Log.info("Registering CraftGuide integration."); try { Class c = Class.forName("uristqwerty.CraftGuide.ReflectionAPI"); Method m = c.getMethod("registerAPIObject", Object.class); - Proxies.log.fine("Adding crafting handler custom recipes."); + Log.fine("Adding crafting handler custom recipes."); m.invoke(null, new CraftGuideCustomRecipes()); - Proxies.log.fine("Adding crafting handler for the carpenter."); + Log.fine("Adding crafting handler for the carpenter."); m.invoke(null, new CraftGuideCarpenter()); - Proxies.log.fine("Adding crafting handler for the thermionic fabricator."); + Log.fine("Adding crafting handler for the thermionic fabricator."); m.invoke(null, new CraftGuideFabricator()); - Proxies.log.fine("Adding crafting handler for the centrifuge."); + Log.fine("Adding crafting handler for the centrifuge."); m.invoke(null, new CraftGuideCentrifuge()); - Proxies.log.fine("Adding crafting handler for the squeezer."); + Log.fine("Adding crafting handler for the squeezer."); m.invoke(null, new CraftGuideSqueezer()); - Proxies.log.fine("Adding crafting handler for the fermenter."); + Log.fine("Adding crafting handler for the fermenter."); m.invoke(null, new CraftGuideFermenter()); - Proxies.log.fine("Adding crafting handler for the still."); + Log.fine("Adding crafting handler for the still."); m.invoke(null, new CraftGuideStill()); - Proxies.log.fine("Adding crafting handler for the bottler."); + Log.fine("Adding crafting handler for the bottler."); m.invoke(null, new CraftGuideBottler()); } catch (Exception ex) { ex.printStackTrace(); diff --git a/src/main/java/forestry/factory/recipes/nei/INBTMatchingCachedRecipe.java b/src/main/java/forestry/core/recipes/nei/INBTMatchingCachedRecipe.java similarity index 92% rename from src/main/java/forestry/factory/recipes/nei/INBTMatchingCachedRecipe.java rename to src/main/java/forestry/core/recipes/nei/INBTMatchingCachedRecipe.java index 034480fad..436d5a0a1 100644 --- a/src/main/java/forestry/factory/recipes/nei/INBTMatchingCachedRecipe.java +++ b/src/main/java/forestry/core/recipes/nei/INBTMatchingCachedRecipe.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import codechicken.nei.PositionedStack; diff --git a/src/main/java/forestry/factory/recipes/nei/IRecipeHandlerBase.java b/src/main/java/forestry/core/recipes/nei/IRecipeHandlerBase.java similarity index 95% rename from src/main/java/forestry/factory/recipes/nei/IRecipeHandlerBase.java rename to src/main/java/forestry/core/recipes/nei/IRecipeHandlerBase.java index d64122d35..be645c0c3 100644 --- a/src/main/java/forestry/factory/recipes/nei/IRecipeHandlerBase.java +++ b/src/main/java/forestry/core/recipes/nei/IRecipeHandlerBase.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.IUsageHandler; diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerShapedCustom.java b/src/main/java/forestry/core/recipes/nei/NEIHandlerShapedCustom.java similarity index 97% rename from src/main/java/forestry/factory/recipes/nei/NEIHandlerShapedCustom.java rename to src/main/java/forestry/core/recipes/nei/NEIHandlerShapedCustom.java index 55fb47de5..3f768237c 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerShapedCustom.java +++ b/src/main/java/forestry/core/recipes/nei/NEIHandlerShapedCustom.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import java.util.ArrayList; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import forestry.core.utils.ShapedRecipeCustom; +import forestry.core.recipes.ShapedRecipeCustom; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerShapelessCustom.java b/src/main/java/forestry/core/recipes/nei/NEIHandlerShapelessCustom.java similarity index 94% rename from src/main/java/forestry/factory/recipes/nei/NEIHandlerShapelessCustom.java rename to src/main/java/forestry/core/recipes/nei/NEIHandlerShapelessCustom.java index 9a40601f1..5d8fbc3a3 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerShapelessCustom.java +++ b/src/main/java/forestry/core/recipes/nei/NEIHandlerShapelessCustom.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import java.util.ArrayList; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import forestry.core.utils.ShapelessRecipeCustom; +import forestry.core.recipes.ShapelessRecipeCustom; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/src/main/java/forestry/factory/recipes/nei/NEIIntegrationConfig.java b/src/main/java/forestry/core/recipes/nei/NEIIntegrationConfig.java similarity index 73% rename from src/main/java/forestry/factory/recipes/nei/NEIIntegrationConfig.java rename to src/main/java/forestry/core/recipes/nei/NEIIntegrationConfig.java index 9d2aaa1be..dbcbdd1c5 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIIntegrationConfig.java +++ b/src/main/java/forestry/core/recipes/nei/NEIIntegrationConfig.java @@ -8,9 +8,17 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; +import forestry.factory.recipes.nei.NEIHandlerBottler; +import forestry.factory.recipes.nei.NEIHandlerCarpenter; +import forestry.factory.recipes.nei.NEIHandlerCentrifuge; +import forestry.factory.recipes.nei.NEIHandlerFabricator; +import forestry.factory.recipes.nei.NEIHandlerFermenter; +import forestry.factory.recipes.nei.NEIHandlerMoistener; +import forestry.factory.recipes.nei.NEIHandlerSqueezer; +import forestry.factory.recipes.nei.NEIHandlerStill; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; @@ -19,7 +27,7 @@ public class NEIIntegrationConfig implements IConfigureNEI { @Override public void loadConfig() { - Proxies.log.info("Loading: " + getName()); + Log.info("Loading: " + getName()); registerHandler(new NEIHandlerShapedCustom()); registerHandler(new NEIHandlerShapelessCustom()); diff --git a/src/main/java/forestry/factory/recipes/nei/NEIUtils.java b/src/main/java/forestry/core/recipes/nei/NEIUtils.java similarity index 99% rename from src/main/java/forestry/factory/recipes/nei/NEIUtils.java rename to src/main/java/forestry/core/recipes/nei/NEIUtils.java index 37e5a5c9a..4da40fca6 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIUtils.java +++ b/src/main/java/forestry/core/recipes/nei/NEIUtils.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/forestry/factory/recipes/nei/PositionedFluidTank.java b/src/main/java/forestry/core/recipes/nei/PositionedFluidTank.java similarity index 99% rename from src/main/java/forestry/factory/recipes/nei/PositionedFluidTank.java rename to src/main/java/forestry/core/recipes/nei/PositionedFluidTank.java index d8fafd417..b0bf469d8 100644 --- a/src/main/java/forestry/factory/recipes/nei/PositionedFluidTank.java +++ b/src/main/java/forestry/core/recipes/nei/PositionedFluidTank.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import java.awt.Point; import java.awt.Rectangle; diff --git a/src/main/java/forestry/factory/recipes/nei/PositionedStackAdv.java b/src/main/java/forestry/core/recipes/nei/PositionedStackAdv.java similarity index 95% rename from src/main/java/forestry/factory/recipes/nei/PositionedStackAdv.java rename to src/main/java/forestry/core/recipes/nei/PositionedStackAdv.java index d298c34bc..881321cd5 100644 --- a/src/main/java/forestry/factory/recipes/nei/PositionedStackAdv.java +++ b/src/main/java/forestry/core/recipes/nei/PositionedStackAdv.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import java.awt.Rectangle; import java.text.NumberFormat; @@ -22,7 +22,7 @@ import codechicken.nei.recipe.GuiRecipe; public class PositionedStackAdv extends PositionedStack { - private List tooltip = new ArrayList(); + private final List tooltip = new ArrayList(); public PositionedStackAdv(Object object, int x, int y) { super(object, x, y); diff --git a/src/main/java/forestry/factory/recipes/nei/RecipeHandlerBase.java b/src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java similarity index 99% rename from src/main/java/forestry/factory/recipes/nei/RecipeHandlerBase.java rename to src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java index 90a3fff2b..a06f7fd7d 100644 --- a/src/main/java/forestry/factory/recipes/nei/RecipeHandlerBase.java +++ b/src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.recipes.nei; +package forestry.core.recipes.nei; import java.awt.Point; import java.awt.Rectangle; diff --git a/src/main/java/forestry/core/utils/EnumTankLevel.java b/src/main/java/forestry/core/render/EnumTankLevel.java old mode 100755 new mode 100644 similarity index 67% rename from src/main/java/forestry/core/utils/EnumTankLevel.java rename to src/main/java/forestry/core/render/EnumTankLevel.java index 96c67f8f2..d370ad863 --- a/src/main/java/forestry/core/utils/EnumTankLevel.java +++ b/src/main/java/forestry/core/render/EnumTankLevel.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.render; public enum EnumTankLevel { @@ -20,5 +20,20 @@ public enum EnumTankLevel { HIGH, - MAXIMUM + MAXIMUM; + + public static EnumTankLevel rateTankLevel(int scaled) { + + if (scaled < 5) { + return EMPTY; + } else if (scaled < 30) { + return LOW; + } else if (scaled < 60) { + return MEDIUM; + } else if (scaled < 90) { + return HIGH; + } else { + return MAXIMUM; + } + } } diff --git a/src/main/java/forestry/core/utils/FontColour.java b/src/main/java/forestry/core/render/FontColour.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/core/utils/FontColour.java rename to src/main/java/forestry/core/render/FontColour.java index c7c05914e..b9e75f0b4 --- a/src/main/java/forestry/core/utils/FontColour.java +++ b/src/main/java/forestry/core/render/FontColour.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.render; import java.io.InputStream; import java.util.Properties; diff --git a/src/main/java/forestry/core/utils/ForestryResource.java b/src/main/java/forestry/core/render/ForestryResource.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/forestry/core/utils/ForestryResource.java rename to src/main/java/forestry/core/render/ForestryResource.java index 4e81bf62a..62b42af06 --- a/src/main/java/forestry/core/utils/ForestryResource.java +++ b/src/main/java/forestry/core/render/ForestryResource.java @@ -8,16 +8,16 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.render; import net.minecraft.util.ResourceLocation; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class ForestryResource extends ResourceLocation { public ForestryResource(String path) { - super(Defaults.ID, path); + super(Constants.ID, path); } } diff --git a/src/main/java/forestry/core/interfaces/IBlockRenderer.java b/src/main/java/forestry/core/render/IBlockRenderer.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/interfaces/IBlockRenderer.java rename to src/main/java/forestry/core/render/IBlockRenderer.java index eff2b7cd3..ea488f715 --- a/src/main/java/forestry/core/interfaces/IBlockRenderer.java +++ b/src/main/java/forestry/core/render/IBlockRenderer.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.render; public interface IBlockRenderer { void inventoryRender(double x, double y, double z); diff --git a/src/main/java/forestry/core/render/ParticleHelper.java b/src/main/java/forestry/core/render/ParticleHelper.java index cbbf897c6..9eacd00f4 100644 --- a/src/main/java/forestry/core/render/ParticleHelper.java +++ b/src/main/java/forestry/core/render/ParticleHelper.java @@ -29,7 +29,7 @@ public class ParticleHelper { private static final Random rand = new Random(); @SideOnly(Side.CLIENT) - public static boolean addHitEffects(World world, Block block, MovingObjectPosition target, EffectRenderer effectRenderer, ParticleHelperCallback callback) { + public static boolean addHitEffects(World world, Block block, MovingObjectPosition target, EffectRenderer effectRenderer, Callback callback) { int x = target.blockX; int y = target.blockY; int z = target.blockZ; @@ -100,7 +100,7 @@ public class ParticleHelper { * @return True to prevent vanilla break particles from spawning. */ @SideOnly(Side.CLIENT) - public static boolean addDestroyEffects(World world, Block block, int x, int y, int z, int meta, EffectRenderer effectRenderer, ParticleHelperCallback callback) { + public static boolean addDestroyEffects(World world, Block block, int x, int y, int z, int meta, EffectRenderer effectRenderer, Callback callback) { if (block != world.getBlock(x, y, z)) { return true; } @@ -129,4 +129,12 @@ public class ParticleHelper { return true; } + public interface Callback { + + @SideOnly(Side.CLIENT) + void addHitEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta); + + @SideOnly(Side.CLIENT) + void addDestroyEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta); + } } diff --git a/src/main/java/forestry/core/render/ParticleHelperCallback.java b/src/main/java/forestry/core/render/ParticleHelperCallback.java deleted file mode 100644 index 73a921eac..000000000 --- a/src/main/java/forestry/core/render/ParticleHelperCallback.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.render; - -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * @author CovertJaguar - */ -public interface ParticleHelperCallback { - - @SideOnly(Side.CLIENT) - void addHitEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta); - - @SideOnly(Side.CLIENT) - void addDestroyEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta); -} diff --git a/src/main/java/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java index 9c12acbc7..d7b707cad 100755 --- a/src/main/java/forestry/core/render/RenderAnalyzer.java +++ b/src/main/java/forestry/core/render/RenderAnalyzer.java @@ -23,8 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import forestry.apiculture.render.ModelAnalyzer; -import forestry.core.gadgets.TileAnalyzer; -import forestry.core.interfaces.IBlockRenderer; +import forestry.core.tiles.TileAnalyzer; public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockRenderer { diff --git a/src/main/java/forestry/core/render/BlockRenderingHandler.java b/src/main/java/forestry/core/render/RenderBlock.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/core/render/BlockRenderingHandler.java rename to src/main/java/forestry/core/render/RenderBlock.java index 0d69f045b..30055bc70 --- a/src/main/java/forestry/core/render/BlockRenderingHandler.java +++ b/src/main/java/forestry/core/render/RenderBlock.java @@ -19,9 +19,8 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import forestry.core.ForestryClient; -import forestry.core.interfaces.IBlockRenderer; -public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { +public class RenderBlock implements ISimpleBlockRenderingHandler { public static final HashMap byBlockRenderer = new HashMap(); diff --git a/src/main/java/forestry/core/render/CrateRenderingHandler.java b/src/main/java/forestry/core/render/RenderCrateItem.java similarity index 96% rename from src/main/java/forestry/core/render/CrateRenderingHandler.java rename to src/main/java/forestry/core/render/RenderCrateItem.java index 0dc9ede64..1f77c47d9 100644 --- a/src/main/java/forestry/core/render/CrateRenderingHandler.java +++ b/src/main/java/forestry/core/render/RenderCrateItem.java @@ -34,7 +34,7 @@ import forestry.core.items.ItemCrated; /** * Adapted from RenderTankCartItem by CovertJaguar */ -public class CrateRenderingHandler implements IItemRenderer { +public class RenderCrateItem implements IItemRenderer { private static final ResourceLocation BLOCK_TEXTURE = TextureMap.locationBlocksTexture; private static final ResourceLocation ITEM_TEXTURE = TextureMap.locationItemsTexture; diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index 70bce67e1..76df4dbb1 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -21,15 +21,13 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TileEscritoire; -import forestry.core.interfaces.IBlockRenderer; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; +import forestry.core.tiles.TileEscritoire; public class RenderEscritoire extends TileEntitySpecialRenderer implements IBlockRenderer { - private static final ResourceLocation texture = new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/escritoire.png"); + private static final ResourceLocation texture = new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/escritoire.png"); private final ModelEscritoire modelEscritoire; public RenderEscritoire() { diff --git a/src/main/java/forestry/core/render/RenderMachine.java b/src/main/java/forestry/core/render/RenderMachine.java index 09c909c7c..be678ec1a 100755 --- a/src/main/java/forestry/core/render/RenderMachine.java +++ b/src/main/java/forestry/core/render/RenderMachine.java @@ -20,11 +20,8 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.interfaces.IRenderableMachine; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryResource; +import forestry.core.tiles.IRenderableTile; public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRenderer { @@ -100,7 +97,7 @@ public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRe @Override public void renderTileEntityAt(TileEntity tileentity, double d, double d1, double d2, float f) { - IRenderableMachine generator = (IRenderableMachine) tileentity; + IRenderableTile generator = (IRenderableTile) tileentity; render(generator.getPrimaryLevel(), generator.getSecondaryLevel(), generator.getOrientation(), d, d1, d2); } diff --git a/src/main/java/forestry/core/render/RenderMill.java b/src/main/java/forestry/core/render/RenderMill.java index bf54eba86..7f564d1d7 100755 --- a/src/main/java/forestry/core/render/RenderMill.java +++ b/src/main/java/forestry/core/render/RenderMill.java @@ -20,10 +20,8 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import forestry.core.gadgets.Mill; -import forestry.core.interfaces.IBlockRenderer; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; +import forestry.core.tiles.TileMill; public class RenderMill extends TileEntitySpecialRenderer implements IBlockRenderer { @@ -100,7 +98,7 @@ public class RenderMill extends TileEntitySpecialRenderer implements IBlockRende @Override public void renderTileEntityAt(TileEntity tileentity, double d, double d1, double d2, float f) { - Mill tile = (Mill) tileentity; + TileMill tile = (TileMill) tileentity; render(tile.progress, tile.charge, ForgeDirection.WEST, d, d1, d2); } diff --git a/src/main/java/forestry/core/render/RenderNaturalistChest.java b/src/main/java/forestry/core/render/RenderNaturalistChest.java index ebae8d53b..4f5d0b399 100644 --- a/src/main/java/forestry/core/render/RenderNaturalistChest.java +++ b/src/main/java/forestry/core/render/RenderNaturalistChest.java @@ -14,14 +14,13 @@ import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TileNaturalistChest; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.utils.ForestryResource; +import forestry.core.config.Constants; +import forestry.core.tiles.TileNaturalistChest; public class RenderNaturalistChest extends TileEntitySpecialRenderer implements IBlockRenderer { @@ -29,7 +28,7 @@ public class RenderNaturalistChest extends TileEntitySpecialRenderer implements private final ResourceLocation texture; public RenderNaturalistChest(String textureName) { - texture = new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/" + textureName + ".png"); + texture = new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/" + textureName + ".png"); } @Override diff --git a/src/main/java/forestry/core/render/OverlayRenderingHandler.java b/src/main/java/forestry/core/render/RenderOverlayBlock.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/core/render/OverlayRenderingHandler.java rename to src/main/java/forestry/core/render/RenderOverlayBlock.java index f189e5612..85fc20c76 --- a/src/main/java/forestry/core/render/OverlayRenderingHandler.java +++ b/src/main/java/forestry/core/render/RenderOverlayBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -public abstract class OverlayRenderingHandler implements ISimpleBlockRenderingHandler { +public abstract class RenderOverlayBlock implements ISimpleBlockRenderingHandler { protected static final double OVERLAY_SHIFT = 0.001; diff --git a/src/main/java/forestry/core/utils/AdjacentTileCache.java b/src/main/java/forestry/core/tiles/AdjacentTileCache.java similarity index 89% rename from src/main/java/forestry/core/utils/AdjacentTileCache.java rename to src/main/java/forestry/core/tiles/AdjacentTileCache.java index dfa0bbae7..5ad273f95 100644 --- a/src/main/java/forestry/core/utils/AdjacentTileCache.java +++ b/src/main/java/forestry/core/tiles/AdjacentTileCache.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.tiles; import java.util.Arrays; import java.util.LinkedHashSet; @@ -137,4 +137,22 @@ public final class AdjacentTileCache { return source; } + private static class Timer { + + private long startTime = Long.MIN_VALUE; + + public boolean hasTriggered(World world, int ticks) { + long currentTime = world.getTotalWorldTime(); + if (currentTime >= (ticks + startTime) || startTime > currentTime) { + startTime = currentTime; + return true; + } + return false; + } + + public void reset() { + startTime = Long.MIN_VALUE; + } + + } } diff --git a/src/main/java/forestry/core/gadgets/NaturalistGame.java b/src/main/java/forestry/core/tiles/EscritoireGame.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/core/gadgets/NaturalistGame.java rename to src/main/java/forestry/core/tiles/EscritoireGame.java index ad5e2864c..f282b285d --- a/src/main/java/forestry/core/gadgets/NaturalistGame.java +++ b/src/main/java/forestry/core/tiles/EscritoireGame.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; import java.util.ArrayList; @@ -29,10 +29,10 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; +import forestry.core.utils.ColourUtil; import forestry.core.utils.StringUtil; -import forestry.core.utils.Utils; -public class NaturalistGame implements INBTTagable, IStreamable { +public class EscritoireGame implements INBTTagable, IStreamable { public static final int BOUNTY_MAX = 16; @@ -110,7 +110,7 @@ public class NaturalistGame implements INBTTagable, IStreamable { } if (isProbed) { - return Utils.multiplyRGBComponents(AlleleManager.alleleRegistry.getIndividual(tokenStack).getGenome().getPrimary().getIconColour(0), 0.7f); + return ColourUtil.multiplyRGBComponents(AlleleManager.alleleRegistry.getIndividual(tokenStack).getGenome().getPrimary().getIconColour(0), 0.7f); } else { return AlleleManager.alleleRegistry.getIndividual(tokenStack).getGenome().getPrimary().getIconColour(0); } diff --git a/src/main/java/forestry/core/interfaces/IActivatable.java b/src/main/java/forestry/core/tiles/IActivatable.java similarity index 93% rename from src/main/java/forestry/core/interfaces/IActivatable.java rename to src/main/java/forestry/core/tiles/IActivatable.java index 9e5d3b6b8..b4a7e4630 100644 --- a/src/main/java/forestry/core/interfaces/IActivatable.java +++ b/src/main/java/forestry/core/tiles/IActivatable.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import net.minecraft.util.ChunkCoordinates; diff --git a/src/main/java/forestry/core/interfaces/IClimatised.java b/src/main/java/forestry/core/tiles/IClimatised.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/interfaces/IClimatised.java rename to src/main/java/forestry/core/tiles/IClimatised.java index 4eafc10ff..3200b617e --- a/src/main/java/forestry/core/interfaces/IClimatised.java +++ b/src/main/java/forestry/core/tiles/IClimatised.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; diff --git a/src/main/java/forestry/core/interfaces/ICrafter.java b/src/main/java/forestry/core/tiles/ICrafter.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/interfaces/ICrafter.java rename to src/main/java/forestry/core/tiles/ICrafter.java index 62828d1e9..7f576e239 --- a/src/main/java/forestry/core/interfaces/ICrafter.java +++ b/src/main/java/forestry/core/tiles/ICrafter.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/interfaces/IFilterSlotDelegate.java b/src/main/java/forestry/core/tiles/IFilterSlotDelegate.java similarity index 94% rename from src/main/java/forestry/core/interfaces/IFilterSlotDelegate.java rename to src/main/java/forestry/core/tiles/IFilterSlotDelegate.java index ccacaf29b..98bb16796 100644 --- a/src/main/java/forestry/core/interfaces/IFilterSlotDelegate.java +++ b/src/main/java/forestry/core/tiles/IFilterSlotDelegate.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/interfaces/IItemStackDisplay.java b/src/main/java/forestry/core/tiles/IItemStackDisplay.java similarity index 93% rename from src/main/java/forestry/core/interfaces/IItemStackDisplay.java rename to src/main/java/forestry/core/tiles/IItemStackDisplay.java index f6d108567..a4f515d42 100644 --- a/src/main/java/forestry/core/interfaces/IItemStackDisplay.java +++ b/src/main/java/forestry/core/tiles/IItemStackDisplay.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java b/src/main/java/forestry/core/tiles/ILiquidTankTile.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/core/interfaces/ILiquidTankContainer.java rename to src/main/java/forestry/core/tiles/ILiquidTankTile.java index ba345a11a..619fb270d --- a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java +++ b/src/main/java/forestry/core/tiles/ILiquidTankTile.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.IFluidHandler; import forestry.core.fluids.ITankManager; -public interface ILiquidTankContainer extends IFluidHandler { +public interface ILiquidTankTile extends IFluidHandler { ITankManager getTankManager(); diff --git a/src/main/java/forestry/core/interfaces/IPowerHandler.java b/src/main/java/forestry/core/tiles/IPowerHandler.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/interfaces/IPowerHandler.java rename to src/main/java/forestry/core/tiles/IPowerHandler.java index 231f30796..7bbf7ef83 --- a/src/main/java/forestry/core/interfaces/IPowerHandler.java +++ b/src/main/java/forestry/core/tiles/IPowerHandler.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import forestry.energy.EnergyManager; diff --git a/src/main/java/forestry/core/interfaces/IRenderableMachine.java b/src/main/java/forestry/core/tiles/IRenderableTile.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/forestry/core/interfaces/IRenderableMachine.java rename to src/main/java/forestry/core/tiles/IRenderableTile.java index 20979f6de..44ff1f37f --- a/src/main/java/forestry/core/interfaces/IRenderableMachine.java +++ b/src/main/java/forestry/core/tiles/IRenderableTile.java @@ -8,13 +8,13 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.utils.EnumTankLevel; +import forestry.core.render.EnumTankLevel; -public interface IRenderableMachine { +public interface IRenderableTile { ForgeDirection getOrientation(); diff --git a/src/main/java/forestry/core/interfaces/IRestrictedAccessTile.java b/src/main/java/forestry/core/tiles/IRestrictedAccessTile.java similarity index 86% rename from src/main/java/forestry/core/interfaces/IRestrictedAccessTile.java rename to src/main/java/forestry/core/tiles/IRestrictedAccessTile.java index 6395cfb61..036d22a49 100644 --- a/src/main/java/forestry/core/interfaces/IRestrictedAccessTile.java +++ b/src/main/java/forestry/core/tiles/IRestrictedAccessTile.java @@ -8,12 +8,13 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.interfaces; +package forestry.core.tiles; import net.minecraft.util.ChunkCoordinates; +import forestry.core.access.EnumAccess; +import forestry.core.access.IAccessHandler; import forestry.core.network.IStreamableGui; -import forestry.core.utils.EnumAccess; public interface IRestrictedAccessTile extends IStreamableGui { IAccessHandler getAccessHandler(); diff --git a/src/main/java/forestry/core/interfaces/ITitled.java b/src/main/java/forestry/core/tiles/ITitled.java similarity index 61% rename from src/main/java/forestry/core/interfaces/ITitled.java rename to src/main/java/forestry/core/tiles/ITitled.java index b1f333d24..6518a4d16 100644 --- a/src/main/java/forestry/core/interfaces/ITitled.java +++ b/src/main/java/forestry/core/tiles/ITitled.java @@ -1,4 +1,4 @@ -package forestry.core.interfaces; +package forestry.core.tiles; public interface ITitled { String getUnlocalizedTitle(); diff --git a/src/main/java/forestry/core/gadgets/MachineDefinition.java b/src/main/java/forestry/core/tiles/MachineDefinition.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/core/gadgets/MachineDefinition.java rename to src/main/java/forestry/core/tiles/MachineDefinition.java index 654bf5bf2..8de7bd57d --- a/src/main/java/forestry/core/gadgets/MachineDefinition.java +++ b/src/main/java/forestry/core/tiles/MachineDefinition.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.util.List; import java.util.Locale; @@ -33,8 +33,8 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.interfaces.IBlockRenderer; import forestry.core.proxy.Proxies; +import forestry.core.render.IBlockRenderer; import forestry.core.render.TextureManager; public class MachineDefinition { diff --git a/src/main/java/forestry/core/TemperatureState.java b/src/main/java/forestry/core/tiles/TemperatureState.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/core/TemperatureState.java rename to src/main/java/forestry/core/tiles/TemperatureState.java index 155af83ea..f06968ad1 --- a/src/main/java/forestry/core/TemperatureState.java +++ b/src/main/java/forestry/core/tiles/TemperatureState.java @@ -8,22 +8,16 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core; +package forestry.core.tiles; public enum TemperatureState { UNKNOWN, - COOL, - WARMED_UP, - OPERATING_TEMPERATURE, - RUNNING_HOT, - OVERHEATING, - MELTING; public static TemperatureState getState(double heat, double maxHeat) { diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/tiles/TileAnalyzer.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/forestry/core/gadgets/TileAnalyzer.java rename to src/main/java/forestry/core/tiles/TileAnalyzer.java index 06062014b..263aed1b7 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/tiles/TileAnalyzer.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; import java.util.HashSet; @@ -31,15 +31,12 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorState; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import forestry.core.EnumErrorCode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.interfaces.IItemStackDisplay; -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; @@ -50,9 +47,10 @@ import forestry.core.network.GuiId; import forestry.core.network.PacketItemStackDisplay; import forestry.core.proxy.Proxies; import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.Utils; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.SlotUtil; -public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankContainer, IItemStackDisplay { +public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankTile, IItemStackDisplay { /* CONSTANTS */ private static final int TIME_TO_ANALYZE = 125; @@ -77,9 +75,9 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui /* CONSTRUCTOR */ public TileAnalyzer() { - super(800, Defaults.MACHINE_MAX_ENERGY, 160); + super(800, Constants.MACHINE_MAX_ENERGY, 160); setInternalInventory(new AnalyzerInventoryAdapter(this)); - resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, Fluids.HONEY.getFluid()); + resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, Fluids.HONEY.getFluid()); tankManager = new TankManager(resourceTank); invInput = new InventoryMapper(getInternalInventory(), SLOT_INPUT_1, SLOT_INPUT_COUNT); invOutput = new InventoryMapper(getInternalInventory(), SLOT_OUTPUT_1, SLOT_OUTPUT_COUNT); @@ -145,7 +143,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui stackToAnalyze.setTagCompound(nbttagcompound); } - boolean added = InvTools.tryAddStack(invOutput, stackToAnalyze, true); + boolean added = InventoryUtil.tryAddStack(invOutput, stackToAnalyze, true); if (added) { setInventorySlotContents(SLOT_ANALYZE, null); @@ -252,7 +250,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui return getStackInSlot(SLOT_ANALYZE); } - /* ILiquidTankContainer */ + /* ILiquidTankTile */ @Override public void getGUINetworkData(int i, int j) { i -= tankManager.maxMessageId() + 1; @@ -313,7 +311,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (Utils.isIndexInRange(slotIndex, SLOT_INPUT_1, SLOT_INPUT_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_INPUT_1, SLOT_INPUT_COUNT)) { return AlleleManager.alleleRegistry.isIndividual(itemStack) || GeneticsUtil.getGeneticEquivalent(itemStack) != null; } else if (slotIndex == SLOT_CAN) { Fluid fluid = FluidHelper.getFluidInContainer(itemStack); @@ -325,7 +323,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui @Override public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { - return Utils.isIndexInRange(slotIndex, SLOT_OUTPUT_1, SLOT_OUTPUT_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_OUTPUT_1, SLOT_OUTPUT_COUNT); } } } diff --git a/src/main/java/forestry/core/gadgets/TileBase.java b/src/main/java/forestry/core/tiles/TileBase.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/core/gadgets/TileBase.java rename to src/main/java/forestry/core/tiles/TileBase.java index daa9391db..0e3ae518f --- a/src/main/java/forestry/core/gadgets/TileBase.java +++ b/src/main/java/forestry/core/tiles/TileBase.java @@ -8,11 +8,11 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import net.minecraft.entity.player.EntityPlayer; -import forestry.core.interfaces.IHintSource; +import forestry.core.gui.IHintSource; public abstract class TileBase extends TileForestry implements IHintSource { diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/tiles/TileEngine.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/gadgets/Engine.java rename to src/main/java/forestry/core/tiles/TileEngine.java index 38994a40a..9d95aee71 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/tiles/TileEngine.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; @@ -22,10 +22,8 @@ import net.minecraftforge.common.util.ForgeDirection; import forestry.api.core.IErrorLogic; import forestry.apiculture.network.PacketActiveUpdate; -import forestry.core.EnumErrorCode; -import forestry.core.TemperatureState; -import forestry.core.config.Defaults; -import forestry.core.interfaces.IActivatable; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.proxy.Proxies; @@ -34,7 +32,7 @@ import forestry.energy.EnergyManager; import cofh.api.energy.IEnergyConnection; -public abstract class Engine extends TileBase implements IEnergyConnection, IActivatable { +public abstract class TileEngine extends TileBase implements IEnergyConnection, IActivatable { private boolean active = false; // Used for smp. /** @@ -54,7 +52,7 @@ public abstract class Engine extends TileBase implements IEnergyConnection, IAct public float progress; protected final EnergyManager energyManager; - protected Engine(int maxHeat, int maxEnergy) { + protected TileEngine(int maxHeat, int maxEnergy) { this.maxHeat = maxHeat; energyManager = new EnergyManager(2000, maxEnergy); @@ -237,7 +235,7 @@ public abstract class Engine extends TileBase implements IEnergyConnection, IAct case OVERHEATING: return 0.07f; case MELTING: - return Defaults.ENGINE_PISTON_SPEED_MAX; + return Constants.ENGINE_PISTON_SPEED_MAX; default: return 0; } diff --git a/src/main/java/forestry/core/gadgets/TileEscritoire.java b/src/main/java/forestry/core/tiles/TileEscritoire.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/core/gadgets/TileEscritoire.java rename to src/main/java/forestry/core/tiles/TileEscritoire.java index fab063813..766e7db56 --- a/src/main/java/forestry/core/gadgets/TileEscritoire.java +++ b/src/main/java/forestry/core/tiles/TileEscritoire.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; @@ -22,20 +22,18 @@ import com.mojang.authlib.GameProfile; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import forestry.core.interfaces.ICrafter; -import forestry.core.interfaces.IRenderableMachine; -import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.network.PacketTileStream; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumTankLevel; +import forestry.core.render.EnumTankLevel; import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.Utils; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.SlotUtil; -public class TileEscritoire extends TileBase implements ISidedInventory, IRenderableMachine, ICrafter { +public class TileEscritoire extends TileBase implements ISidedInventory, IRenderableTile, ICrafter { public static final short SLOT_ANALYZE = 0; public static final short SLOT_RESULTS_1 = 1; @@ -44,7 +42,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender public static final short SLOTS_INPUT_COUNT = 5; /* MEMBER */ - private final NaturalistGame game = new NaturalistGame(); + private final EscritoireGame game = new EscritoireGame(); public TileEscritoire() { setInternalInventory(new EscritoireInventoryAdapter(this)); @@ -72,7 +70,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender } /* GAME */ - public NaturalistGame getGame() { + public EscritoireGame getGame() { return game; } @@ -87,7 +85,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender } for (ItemStack itemstack : individual.getGenome().getPrimary().getResearchBounty(worldObj, gameProfile, individual, game.getBountyLevel())) { - InvTools.addStack(getInternalInventory(), itemstack, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT, true); + InventoryUtil.addStack(getInternalInventory(), itemstack, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT, true); } } @@ -188,7 +186,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender return true; } - if (Utils.isIndexInRange(slotIndex, SLOT_INPUT_1, SLOTS_INPUT_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_INPUT_1, SLOTS_INPUT_COUNT)) { if (slotIndex >= SLOT_INPUT_1 + tile.game.getSampleSize()) { return true; } @@ -199,7 +197,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender @Override public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - return Utils.isIndexInRange(slotIndex, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT); } @Override diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/gadgets/TileForestry.java rename to src/main/java/forestry/core/tiles/TileForestry.java index 2f05658f5..3203c1378 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; import java.util.Collection; @@ -31,12 +31,10 @@ import cpw.mods.fml.common.Optional; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; -import forestry.core.delegates.AccessHandler; -import forestry.core.delegates.ErrorLogic; -import forestry.core.interfaces.IAccessHandler; -import forestry.core.interfaces.IFilterSlotDelegate; -import forestry.core.interfaces.IRestrictedAccessTile; -import forestry.core.interfaces.ITitled; +import forestry.core.access.AccessHandler; +import forestry.core.access.EnumAccess; +import forestry.core.access.IAccessHandler; +import forestry.core.errors.ErrorLogic; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.DataInputStreamForestry; @@ -44,8 +42,6 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.network.PacketTileStream; import forestry.core.proxy.Proxies; -import forestry.core.utils.AdjacentTileCache; -import forestry.core.utils.EnumAccess; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/src/main/java/forestry/core/gadgets/Mill.java b/src/main/java/forestry/core/tiles/TileMill.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/core/gadgets/Mill.java rename to src/main/java/forestry/core/tiles/TileMill.java index 639e5f0cb..be88354ea --- a/src/main/java/forestry/core/gadgets/Mill.java +++ b/src/main/java/forestry/core/tiles/TileMill.java @@ -8,21 +8,21 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -public abstract class Mill extends TileBase { +public abstract class TileMill extends TileBase { protected float speed; protected int stage = 0; public int charge = 0; public float progress; - protected Mill() { + protected TileMill() { speed = 0.01F; } diff --git a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java b/src/main/java/forestry/core/tiles/TileNaturalistChest.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/forestry/core/gadgets/TileNaturalistChest.java rename to src/main/java/forestry/core/tiles/TileNaturalistChest.java index 9545e8ba3..fb786b9d2 --- a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java +++ b/src/main/java/forestry/core/tiles/TileNaturalistChest.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; diff --git a/src/main/java/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/tiles/TilePowered.java similarity index 94% rename from src/main/java/forestry/core/gadgets/TilePowered.java rename to src/main/java/forestry/core/tiles/TilePowered.java index e52af16ca..af9dba077 100644 --- a/src/main/java/forestry/core/gadgets/TilePowered.java +++ b/src/main/java/forestry/core/tiles/TilePowered.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.gadgets; +package forestry.core.tiles; import java.io.IOException; @@ -19,19 +19,17 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional; import forestry.api.core.IErrorLogic; -import forestry.core.EnumErrorCode; import forestry.core.circuits.ISpeedUpgradable; -import forestry.core.interfaces.IPowerHandler; -import forestry.core.interfaces.IRenderableMachine; +import forestry.core.errors.EnumErrorCode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.utils.EnumTankLevel; +import forestry.core.render.EnumTankLevel; import forestry.energy.EnergyManager; import buildcraft.api.tiles.IHasWork; @Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraftAPI|tiles") -public abstract class TilePowered extends TileBase implements IRenderableMachine, IPowerHandler, IHasWork, ISpeedUpgradable { +public abstract class TilePowered extends TileBase implements IRenderableTile, IPowerHandler, IHasWork, ISpeedUpgradable { private final EnergyManager energyManager; @@ -42,7 +40,7 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine protected float speedMultiplier = 1.0f; protected float powerMultiplier = 1.0f; - // the number of work ticks that this machine has had no power + // the number of work ticks that this tile has had no power private int noPowerTime = 0; protected TilePowered(int maxTransfer, int capacity, int energyPerWorkCycle) { diff --git a/src/main/java/forestry/core/tiles/TileUtil.java b/src/main/java/forestry/core/tiles/TileUtil.java new file mode 100644 index 000000000..cd90ff816 --- /dev/null +++ b/src/main/java/forestry/core/tiles/TileUtil.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.tiles; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; + +import forestry.core.inventory.wrappers.ChestWrapper; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.Log; + +public abstract class TileUtil { + + public static boolean isUsableByPlayer(EntityPlayer player, TileEntity tile) { + int x = tile.xCoord; + int y = tile.yCoord; + int z = tile.zCoord; + World world = tile.getWorldObj(); + + if (tile.isInvalid()) { + return false; + } + + if (world.getTileEntity(x, y, z) != tile) { + return false; + } + + return player.getDistanceSq(x + 0.5D, y + 0.5D, z + 0.5D) <= 64.0D; + + } + + public static T getTile(IBlockAccess world, int x, int y, int z, Class tileClass) { + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (tileClass.isInstance(tileEntity)) { + return tileClass.cast(tileEntity); + } else { + Log.warning("Failed to cast a tile entity {" + tileEntity + "} to a {" + tileClass.getName() + "} at " + x + '/' + y + '/' + z); + return null; + } + } + + public static IInventory getInventoryFromTile(TileEntity tile, ForgeDirection side) { + if (tile == null || !(tile instanceof IInventory)) { + return null; + } + + if (tile instanceof TileEntityChest) { + TileEntityChest chest = (TileEntityChest) tile; + return new ChestWrapper(chest); + } + return InventoryUtil.getInventory((IInventory) tile, side); + } +} diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index a1f4ff8b9..a11f38cbe 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -22,15 +22,18 @@ import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.oredict.OreDictionary; -import forestry.core.config.Defaults; -import forestry.core.gadgets.Engine; -import forestry.core.vect.Vect; +import forestry.core.config.Constants; +import forestry.core.tiles.TileEngine; +import forestry.core.utils.vect.Vect; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyReceiver; -public class BlockUtil { +public abstract class BlockUtil { + + private static final int slabWoodId = OreDictionary.getOreID("slabWood"); public static ArrayList getBlockDrops(World world, Vect posBlock) { Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z); @@ -41,7 +44,7 @@ public class BlockUtil { } public static boolean isEnergyReceiverOrEngine(ForgeDirection side, TileEntity tile) { - if (!(tile instanceof IEnergyReceiver) && !(tile instanceof Engine)) { + if (!(tile instanceof IEnergyReceiver) && !(tile instanceof TileEngine)) { return false; } @@ -56,7 +59,7 @@ public class BlockUtil { return false; } - world.setBlock(x, y, z, block, direction, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + world.setBlock(x, y, z, block, direction, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); return true; } @@ -84,4 +87,26 @@ public class BlockUtil { public static int getMaturityPod(int metadata) { return BlockCocoa.func_149987_c(metadata); } + + public static boolean isWoodSlabBlock(Block block) { + int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block)); + for (int oreId : oreIds) { + if (oreId == slabWoodId) { + return true; + } + } + + return false; + } + + public static boolean isReplaceableBlock(World world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); + + return isReplaceableBlock(block); + } + + public static boolean isReplaceableBlock(Block block) { + return block == Blocks.vine || block == Blocks.tallgrass || block == Blocks.deadbush || block == Blocks.snow_layer + || block.getMaterial().isReplaceable(); + } } diff --git a/src/main/java/forestry/core/utils/ChunkCoords.java b/src/main/java/forestry/core/utils/ChunkCoords.java deleted file mode 100644 index 73160839a..000000000 --- a/src/main/java/forestry/core/utils/ChunkCoords.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.utils; - -import net.minecraft.world.chunk.Chunk; - -public class ChunkCoords { - public final int dimension; - public final int xCoord; - public final int zCoord; - - public ChunkCoords(Chunk chunk) { - this.dimension = chunk.worldObj.provider.dimensionId; - this.xCoord = chunk.xPosition; - this.zCoord = chunk.zPosition; - } -} diff --git a/src/main/java/forestry/core/genetics/ClimateHelper.java b/src/main/java/forestry/core/utils/ClimateUtil.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/core/genetics/ClimateHelper.java rename to src/main/java/forestry/core/utils/ClimateUtil.java index 8245a2eba..f04643297 --- a/src/main/java/forestry/core/genetics/ClimateHelper.java +++ b/src/main/java/forestry/core/utils/ClimateUtil.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.genetics; +package forestry.core.utils; import java.util.ArrayList; import java.util.Locale; @@ -17,9 +17,8 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IClimateHelper; -import forestry.core.utils.StringUtil; -public class ClimateHelper implements IClimateHelper { +public class ClimateUtil implements IClimateHelper { public boolean isWithinLimits(EnumTemperature temperature, EnumHumidity humidity, EnumTemperature baseTemp, EnumTolerance tolTemp, diff --git a/src/main/java/forestry/core/utils/ColourUtil.java b/src/main/java/forestry/core/utils/ColourUtil.java new file mode 100644 index 000000000..192f11def --- /dev/null +++ b/src/main/java/forestry/core/utils/ColourUtil.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.utils; + +public class ColourUtil { + + public static int addRGBComponents(int colour, int r, int g, int b) { + r = ((colour & 0xff0000) >> 16) + r; + g = ((colour & 0xff00) >> 8) + g; + b = ((colour & 0xff)) + b; + + r = r <= 255 ? r : 255; + g = g <= 255 ? g : 255; + b = b <= 255 ? b : 255; + + return ((r & 0x0ff) << 16) | ((g & 0x0ff) << 8) | (b & 0x0ff); + } + + public static int multiplyRGBComponents(int colour, float factor) { + int r = (int) (((colour & 0xff0000) >> 16) * factor); + int g = (int) (((colour & 0xff00) >> 8) * factor); + int b = (int) (((colour & 0xff)) * factor); + + r = r <= 255 ? r : 255; + g = g <= 255 ? g : 255; + b = b <= 255 ? b : 255; + + return ((r & 0x0ff) << 16) | ((g & 0x0ff) << 8) | (b & 0x0ff); + } +} diff --git a/src/main/java/forestry/core/utils/EntityUtil.java b/src/main/java/forestry/core/utils/EntityUtil.java new file mode 100644 index 000000000..f38ebadc6 --- /dev/null +++ b/src/main/java/forestry/core/utils/EntityUtil.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.utils; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +import cpw.mods.fml.common.registry.EntityRegistry; + +import forestry.api.core.ForestryAPI; + +public abstract class EntityUtil { + public static E spawnEntity(World world, Class entityClass, double x, double y, double z) { + E entityLiving = createEntity(world, entityClass); + if (entityLiving == null) { + return null; + } + return spawnEntity(world, entityLiving, x, y, z); + } + + public static E spawnEntity(World world, E living, double x, double y, double z) { + if (living == null) { + return null; + } + + living.setLocationAndAngles(x, y, z, MathHelper.wrapAngleTo180_float(world.rand.nextFloat() * 360.0f), 0.0f); + living.rotationYawHead = living.rotationYaw; + living.renderYawOffset = living.rotationYaw; + living.onSpawnWithEgg(null); + world.spawnEntityInWorld(living); + living.playLivingSound(); + return living; + } + + public static void registerEntity(Class entityClass, String ident, int id, int eggForeground, int eggBackground, int trackingRange, int updateFrequency, boolean sendVelocity) { + EntityRegistry.registerModEntity(entityClass, ident, id, ForestryAPI.instance, trackingRange, updateFrequency, sendVelocity); + Log.finer("Registered entity %s (%s) with id %s.", ident, entityClass.toString(), id); + } + + private static E createEntity(World world, Class entityClass) { + if (!EntityList.classToStringMapping.containsKey(entityClass)) { + return null; + } + + String entityString = (String) EntityList.classToStringMapping.get(entityClass); + if (entityString == null) { + return null; + } + + Entity entity = EntityList.createEntityByName(entityString, world); + return entityClass.cast(entity); + } +} diff --git a/src/main/java/forestry/core/utils/FluidStackMap.java b/src/main/java/forestry/core/utils/FluidStackMap.java deleted file mode 100755 index 00ecea518..000000000 --- a/src/main/java/forestry/core/utils/FluidStackMap.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.utils; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class FluidStackMap extends StackMap { - private static final long serialVersionUID = -3314134471346370713L; - - @Override - protected boolean areEqual(FluidStack a, Object b) { - - if (b instanceof FluidStack) { - return a.isFluidEqual((FluidStack) b); - } - if (b instanceof Fluid) { - return ((Fluid) b).getID() == a.getFluid().getID(); - } - if (b instanceof String) { - return b.equals(a.getFluid().getName()); - } - return false; - } - - @Override - protected boolean isValidKey(Object key) { - return key instanceof FluidStack || key instanceof Fluid || key instanceof String; - } - - @Override - protected FluidStack getStack(Object key) { - if (key instanceof FluidStack) { - return (FluidStack) key; - } - if (key instanceof Fluid) { - return FluidRegistry.getFluidStack(((Fluid) key).getName(), 1); - } - if (key instanceof String) { - return FluidRegistry.getFluidStack((String) key, 1); - } - return null; - } - -} diff --git a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java index 416da76f4..bac8ff280 100755 --- a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java +++ b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java @@ -19,7 +19,7 @@ import cpw.mods.fml.common.ICrashCallable; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.plugins.PluginManager; /** @@ -91,7 +91,7 @@ public class ForestryModEnvWarningCallable implements ICrashCallable { @Override public String getLabel() { - return Defaults.MOD + " "; + return Constants.MOD + " "; } } diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index ef6cc3e72..16f1dc954 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -36,9 +36,9 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; -import forestry.arboriculture.genetics.CheckPollinatable; -import forestry.arboriculture.genetics.CheckPollinatableTree; -import forestry.arboriculture.genetics.ICheckPollinatable; +import forestry.arboriculture.genetics.pollination.CheckPollinatable; +import forestry.arboriculture.genetics.pollination.CheckPollinatableTree; +import forestry.arboriculture.genetics.pollination.ICheckPollinatable; import forestry.core.config.Config; import forestry.core.genetics.ItemGE; @@ -50,7 +50,7 @@ public class GeneticsUtil { if (ersatzSpecimenBlocks == null) { ersatzSpecimenBlocks = new HashSet(); for (ItemStack ersatzSpecimen : AlleleManager.ersatzSpecimen.keySet()) { - Block ersatzBlock = StackUtils.getBlock(ersatzSpecimen); + Block ersatzBlock = ItemStackUtil.getBlock(ersatzSpecimen); if (ersatzBlock != null) { ersatzSpecimenBlocks.add(ersatzBlock); } @@ -165,7 +165,7 @@ public class GeneticsUtil { } for (Map.Entry entry : AlleleManager.ersatzSaplings.entrySet()) { - if (StackUtils.isIdenticalItem(itemStack, entry.getKey())) { + if (ItemStackUtil.isIdenticalItem(itemStack, entry.getKey())) { return entry.getValue().copy(); } } diff --git a/src/main/java/forestry/core/inventory/InvTools.java b/src/main/java/forestry/core/utils/InventoryUtil.java old mode 100755 new mode 100644 similarity index 77% rename from src/main/java/forestry/core/inventory/InvTools.java rename to src/main/java/forestry/core/utils/InventoryUtil.java index da2d450ab..f37bbe164 --- a/src/main/java/forestry/core/inventory/InvTools.java +++ b/src/main/java/forestry/core/utils/InventoryUtil.java @@ -8,53 +8,43 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.inventory; +package forestry.core.utils; import java.util.AbstractMap; import java.util.ArrayList; import java.util.List; import java.util.Map; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.Optional; +import forestry.core.circuits.ISocketable; import forestry.core.inventory.filters.ArrayStackFilter; import forestry.core.inventory.filters.IStackFilter; import forestry.core.inventory.filters.StackFilter; import forestry.core.inventory.manipulators.InventoryManipulator; -import forestry.core.inventory.wrappers.ChestWrapper; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryCopy; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.inventory.wrappers.SidedInventoryMapper; -import forestry.core.utils.AdjacentTileCache; -import forestry.core.utils.StackUtils; +import forestry.core.tiles.AdjacentTileCache; import forestry.plugins.PluginManager; import buildcraft.api.transport.IPipeTile; -public abstract class InvTools { - - public static IInventory getInventoryFromTile(TileEntity tile, ForgeDirection side) { - if (tile == null || !(tile instanceof IInventory)) { - return null; - } - - if (tile instanceof TileEntityChest) { - TileEntityChest chest = (TileEntityChest) tile; - return new ChestWrapper(chest); - } - return getInventory((IInventory) tile, side); - } +public abstract class InventoryUtil { public static IInventory getInventory(IInventory inv, ForgeDirection side) { if (inv == null) { @@ -329,7 +319,7 @@ public abstract class InvTools { ItemStack[] removed = new ItemStack[set.length]; ItemStack[] stock = getStacks(inventory, firstSlotIndex, slotCount); - if (StackUtils.containsSets(set, stock, oreDictionary, craftingTools) < count) { + if (ItemStackUtil.containsSets(set, stock, oreDictionary, craftingTools) < count) { return null; } @@ -362,7 +352,7 @@ public abstract class InvTools { continue; } - if (!StackUtils.isCraftingEquivalent(stackToRemove, stackInSlot, oreDictionary, craftingTools)) { + if (!ItemStackUtil.isCraftingEquivalent(stackToRemove, stackInSlot, oreDictionary, craftingTools)) { continue; } @@ -370,7 +360,7 @@ public abstract class InvTools { stackToRemove.stackSize -= removed.stackSize; if (stowContainer && stackToRemove.getItem().hasContainerItem(stackToRemove)) { - StackUtils.stowContainerItem(removed, inventory, j, player); + stowContainerItem(removed, inventory, j, player); } if (stackToRemove.stackSize == 0) { @@ -388,7 +378,7 @@ public abstract class InvTools { public static boolean contains(IInventory inventory, ItemStack[] query, int startSlot, int slots) { ItemStack[] stock = getStacks(inventory, startSlot, slots); - return StackUtils.containsSets(query, stock) > 0; + return ItemStackUtil.containsSets(query, stock) > 0; } public static boolean containsPercent(IInventory inventory, float percent) { @@ -545,4 +535,137 @@ public abstract class InvTools { return added; } + + public static boolean stowInInventory(ItemStack itemstack, IInventory inventory, boolean doAdd) { + return stowInInventory(itemstack, inventory, doAdd, 0, inventory.getSizeInventory()); + } + + public static boolean stowInInventory(ItemStack itemstack, IInventory inventory, boolean doAdd, int slot1, int count) { + + boolean added = false; + + for (int i = slot1; i < slot1 + count; i++) { + ItemStack inventoryStack = inventory.getStackInSlot(i); + + // Grab those free slots + if (inventoryStack == null) { + if (doAdd) { + inventory.setInventorySlotContents(i, itemstack.copy()); + itemstack.stackSize = 0; + } + return true; + } + + // Already full + if (inventoryStack.stackSize >= inventoryStack.getMaxStackSize()) { + continue; + } + + // Not same type + if (!inventoryStack.isItemEqual(itemstack)) { + continue; + } + if (!ItemStack.areItemStackTagsEqual(inventoryStack, itemstack)) { + continue; + } + + int space = inventoryStack.getMaxStackSize() - inventoryStack.stackSize; + + // Enough space to add all + if (space > itemstack.stackSize) { + if (doAdd) { + inventoryStack.stackSize += itemstack.stackSize; + itemstack.stackSize = 0; + } + return true; + // Only part can be added + } else { + if (doAdd) { + inventoryStack.stackSize = inventoryStack.getMaxStackSize(); + itemstack.stackSize -= space; + } + added = true; + } + + } + + return added; + } + + public static void stowContainerItem(ItemStack itemstack, IInventory stowing, int slotIndex, EntityPlayer player) { + if (!itemstack.getItem().hasContainerItem(itemstack)) { + return; + } + + ItemStack container = itemstack.getItem().getContainerItem(itemstack); + + if (container.isItemStackDamageable() && container.getItemDamage() > container.getMaxDamage()) { + if (player != null) { + MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(player, container)); + } + container = null; + } + + if (container != null) { + + if (itemstack.getItem().doesContainerItemLeaveCraftingGrid(itemstack)) { + if (!tryAddStack(stowing, container, true)) { + if (player != null && !player.inventory.addItemStackToInventory(container)) { + player.dropPlayerItemWithRandomChoice(container, true); + } + } + } else { + if (!tryAddStack(stowing, container, slotIndex, 1, true)) { + if (!tryAddStack(stowing, container, true) && player != null) { + player.dropPlayerItemWithRandomChoice(container, true); + } + } + } + } + } + + public static void dropInventory(IInventory inventory, World world, int x, int y, int z) { + if (inventory == null) { + return; + } + + // Release inventory + for (int slot = 0; slot < inventory.getSizeInventory(); slot++) { + ItemStack itemstack = inventory.getStackInSlot(slot); + dropItemStackFromInventory(itemstack, world, x, y, z); + inventory.setInventorySlotContents(slot, null); + } + } + + public static void dropSockets(ISocketable socketable, World world, int x, int y, int z) { + for (int slot = 0; slot < socketable.getSocketCount(); slot++) { + ItemStack itemstack = socketable.getSocket(slot); + dropItemStackFromInventory(itemstack, world, x, y, z); + socketable.setSocket(slot, null); + } + } + + public static void dropItemStackFromInventory(ItemStack itemStack, World world, int x, int y, int z) { + if (itemStack == null) { + return; + } + + float f = world.rand.nextFloat() * 0.8F + 0.1F; + float f1 = world.rand.nextFloat() * 0.8F + 0.1F; + float f2 = world.rand.nextFloat() * 0.8F + 0.1F; + + while (itemStack.stackSize > 0) { + int stackPartial = world.rand.nextInt(21) + 10; + if (stackPartial > itemStack.stackSize) { + stackPartial = itemStack.stackSize; + } + ItemStack drop = itemStack.splitStack(stackPartial); + EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, drop); + float accel = 0.05F; + entityitem.motionX = (float) world.rand.nextGaussian() * accel; + entityitem.motionY = (float) world.rand.nextGaussian() * accel + 0.2F; + entityitem.motionZ = (float) world.rand.nextGaussian() * accel; + world.spawnEntityInWorld(entityitem); + } + } } diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/ItemStackUtil.java old mode 100755 new mode 100644 similarity index 60% rename from src/main/java/forestry/core/utils/StackUtils.java rename to src/main/java/forestry/core/utils/ItemStackUtil.java index 7e432fa58..c51a98c6f --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/ItemStackUtil.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.utils; -import java.text.NumberFormat; -import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -19,25 +17,17 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameData; +import forestry.core.config.Constants; -import forestry.core.config.Defaults; -import forestry.core.inventory.InvTools; -import forestry.core.proxy.Proxies; - -public class StackUtils { +public abstract class ItemStackUtil { public static final ItemStack[] EMPTY_STACK_ARRAY = new ItemStack[0]; @@ -53,7 +43,7 @@ public class StackUtils { return false; } - if (lhs.getItemDamage() != Defaults.WILDCARD) { + if (lhs.getItemDamage() != Constants.WILDCARD) { if (lhs.getItemDamage() != rhs.getItemDamage()) { return false; } @@ -62,62 +52,6 @@ public class StackUtils { return ItemStack.areItemStackTagsEqual(lhs, rhs); } - public static boolean stowInInventory(ItemStack itemstack, IInventory inventory, boolean doAdd) { - return stowInInventory(itemstack, inventory, doAdd, 0, inventory.getSizeInventory()); - } - - public static boolean stowInInventory(ItemStack itemstack, IInventory inventory, boolean doAdd, int slot1, int count) { - - boolean added = false; - - for (int i = slot1; i < slot1 + count; i++) { - ItemStack inventoryStack = inventory.getStackInSlot(i); - - // Grab those free slots - if (inventoryStack == null) { - if (doAdd) { - inventory.setInventorySlotContents(i, itemstack.copy()); - itemstack.stackSize = 0; - } - return true; - } - - // Already full - if (inventoryStack.stackSize >= inventoryStack.getMaxStackSize()) { - continue; - } - - // Not same type - if (!inventoryStack.isItemEqual(itemstack)) { - continue; - } - if (!ItemStack.areItemStackTagsEqual(inventoryStack, itemstack)) { - continue; - } - - int space = inventoryStack.getMaxStackSize() - inventoryStack.stackSize; - - // Enough space to add all - if (space > itemstack.stackSize) { - if (doAdd) { - inventoryStack.stackSize += itemstack.stackSize; - itemstack.stackSize = 0; - } - return true; - // Only part can be added - } else { - if (doAdd) { - inventoryStack.stackSize = inventoryStack.getMaxStackSize(); - itemstack.stackSize -= space; - } - added = true; - } - - } - - return added; - } - /** * Merges the giving stack into the receiving stack as far as possible */ @@ -207,8 +141,8 @@ public class StackUtils { public static int containsSets(ItemStack[] set, ItemStack[] stock, boolean oreDictionary, boolean craftingTools) { int totalSets = 0; - ItemStack[] condensedRequired = StackUtils.condenseStacks(set); - ItemStack[] condensedOffered = StackUtils.condenseStacks(stock); + ItemStack[] condensedRequired = ItemStackUtil.condenseStacks(set); + ItemStack[] condensedOffered = ItemStackUtil.condenseStacks(stock); for (ItemStack req : condensedRequired) { @@ -244,7 +178,7 @@ public class StackUtils { return false; } - if (base.getItemDamage() != Defaults.WILDCARD) { + if (base.getItemDamage() != Constants.WILDCARD) { if (base.getItemDamage() != comparison.getItemDamage()) { return false; } @@ -318,38 +252,6 @@ public class StackUtils { return false; } - public static void stowContainerItem(ItemStack itemstack, IInventory stowing, int slotIndex, EntityPlayer player) { - if (!itemstack.getItem().hasContainerItem(itemstack)) { - return; - } - - ItemStack container = itemstack.getItem().getContainerItem(itemstack); - - if (container.isItemStackDamageable() && container.getItemDamage() > container.getMaxDamage()) { - if (player != null) { - MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(player, container)); - } - container = null; - } - - if (container != null) { - - if (itemstack.getItem().doesContainerItemLeaveCraftingGrid(itemstack)) { - if (!InvTools.tryAddStack(stowing, container, true)) { - if (player != null && !player.inventory.addItemStackToInventory(container)) { - player.dropPlayerItemWithRandomChoice(container, true); - } - } - } else { - if (!InvTools.tryAddStack(stowing, container, slotIndex, 1, true)) { - if (!InvTools.tryAddStack(stowing, container, true) && player != null) { - player.dropPlayerItemWithRandomChoice(container, true); - } - } - } - } - } - public static void dropItemStackAsEntity(ItemStack items, World world, double x, double y, double z) { if (items.stackSize <= 0) { return; @@ -391,43 +293,13 @@ public class StackUtils { return block == getBlock(stack) && meta == stack.getItemDamage(); } - public static class Stack { - private final String name; - private final int meta; - - public Stack(String name, int meta) { - this.name = name; - this.meta = meta; - } - - public Item getItem() { - Item item = GameData.getItemRegistry().getRaw(name); - if (item == null) { - Proxies.log.warning("Failed to find item for (" + name + ") in the Forge registry."); - } - return item; - } - - public Block getBlock() { - Block block = GameData.getBlockRegistry().getRaw(name); - if (block == null) { - Proxies.log.warning("Failed to find block for (" + name + ") in the Forge registry."); - } - return block; - } - - public int getMeta() { - return meta; - } - } - public static List parseItemStackStrings(String[] itemStackStrings, int missingMetaValue) { - List stacks = parseStackStrings(itemStackStrings, missingMetaValue); + List stacks = Stack.parseStackStrings(itemStackStrings, missingMetaValue); return getItemStacks(stacks); } public static List parseItemStackStrings(String itemStackStrings, int missingMetaValue) { - List stacks = parseStackStrings(itemStackStrings, missingMetaValue); + List stacks = Stack.parseStackStrings(itemStackStrings, missingMetaValue); return getItemStacks(stacks); } @@ -444,56 +316,4 @@ public class StackUtils { return itemStacks; } - public static List parseStackStrings(String itemStackStrings, int missingMetaValue) { - String[] parts = itemStackStrings.split("(\\s*;\\s*)+"); - return parseStackStrings(parts, missingMetaValue); - } - - public static List parseStackStrings(String[] parts, int missingMetaValue) { - - List stacks = new ArrayList(); - - for (String itemStackString : parts) { - Stack stack = parseStackString(itemStackString, missingMetaValue); - if (stack != null) { - stacks.add(stack); - } - } - - return stacks; - } - - public static Stack parseStackString(String stackString, int missingMetaValue) { - if (stackString == null) { - return null; - } - - stackString = stackString.trim(); - if (stackString.isEmpty()) { - return null; - } - - String[] parts = stackString.split(":+"); - - if (parts.length != 2 && parts.length != 3) { - Proxies.log.warning("Stack string (" + stackString + ") isn't formatted properly. Suitable formats are :, :: or ::*, e.g. IC2:blockWall:*"); - return null; - } - - String name = parts[0] + ':' + parts[1]; - int meta; - - if (parts.length == 2) { - meta = missingMetaValue; - } else { - try { - meta = parts[2].equals("*") ? OreDictionary.WILDCARD_VALUE : NumberFormat.getIntegerInstance().parse(parts[2]).intValue(); - } catch (ParseException e) { - Proxies.log.warning("ItemStack string (" + stackString + ") has improperly formatted metadata. Suitable metadata are integer values or *."); - return null; - } - } - - return new Stack(name, meta); - } } diff --git a/src/main/java/forestry/core/proxy/ProxyLog.java b/src/main/java/forestry/core/utils/Log.java old mode 100755 new mode 100644 similarity index 55% rename from src/main/java/forestry/core/proxy/ProxyLog.java rename to src/main/java/forestry/core/utils/Log.java index 997a540a9..d6114e8ac --- a/src/main/java/forestry/core/proxy/ProxyLog.java +++ b/src/main/java/forestry/core/utils/Log.java @@ -8,123 +8,123 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.proxy; +package forestry.core.utils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.message.MessageFormatMessage; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; -public class ProxyLog { +public abstract class Log { /* FINEST */ - public void finest(String message) { + public static void finest(String message) { log(Level.TRACE, message); } - public void finest(String message, Object param) { + public static void finest(String message, Object param) { log(Level.TRACE, message, param); } - public void finest(String message, Object... params) { + public static void finest(String message, Object... params) { log(Level.TRACE, message, params); } /* FINER */ - public void finer(String message) { + public static void finer(String message) { log(Level.TRACE, message); } - public void finer(String message, Object param) { + public static void finer(String message, Object param) { log(Level.TRACE, message, param); } - public void finer(String message, Object... params) { + public static void finer(String message, Object... params) { log(Level.TRACE, message, params); } /* FINE */ - public void fine(String message) { + public static void fine(String message) { log(Level.DEBUG, message); } - public void fine(String message, Object param) { + public static void fine(String message, Object param) { log(Level.DEBUG, message, param); } - public void fine(String message, Object... params) { + public static void fine(String message, Object... params) { log(Level.DEBUG, message, params); } /* INFO */ - public void info(String message) { + public static void info(String message) { log(Level.INFO, message); } - public void info(String message, Object param) { + public static void info(String message, Object param) { log(Level.INFO, message, param); } - public void info(String message, Object... params) { + public static void info(String message, Object... params) { log(Level.INFO, message, params); } /* WARNING */ - public void warning(String message) { + public static void warning(String message) { log(Level.WARN, message); } - public void warning(String message, Object param) { + public static void warning(String message, Object param) { log(Level.WARN, message, param); } - public void warning(String message, Object... params) { + public static void warning(String message, Object... params) { log(Level.WARN, message, params); } /* SEVERE */ - public void severe(String message) { + public static void severe(String message) { log(Level.FATAL, message); } - public void severe(String message, Object param) { + public static void severe(String message, Object param) { log(Level.FATAL, message, param); } - public void severe(String message, Object... params) { + public static void severe(String message, Object... params) { log(Level.FATAL, message, params); } /* GENERIC */ - private void log(Level logLevel, String message) { - LogManager.getLogger(Defaults.MOD).log(logLevel, message); + private static void log(Level logLevel, String message) { + LogManager.getLogger(Constants.MOD).log(logLevel, message); } - private void log(Level logLevel, String message, Object... params) { - LogManager.getLogger(Defaults.MOD).log(logLevel, new MessageFormatMessage(String.format(message, params), params)); + private static void log(Level logLevel, String message, Object... params) { + LogManager.getLogger(Constants.MOD).log(logLevel, new MessageFormatMessage(String.format(message, params), params)); } /* EXCEPTIONS */ - public void logThrowable(String msg, Throwable error, Object... args) { + public static void logThrowable(String msg, Throwable error, Object... args) { logThrowable(Level.ERROR, msg, 3, error, args); } - public void logThrowable(String msg, int lines, Throwable error, Object... args) { + public static void logThrowable(String msg, int lines, Throwable error, Object... args) { logThrowable(Level.ERROR, msg, lines, error, args); } - public void logThrowable(Level level, String msg, int lines, Throwable error, Object... args) { + public static void logThrowable(Level level, String msg, int lines, Throwable error, Object... args) { StackTraceElement[] oldtrace = error.getStackTrace(); if (lines < oldtrace.length) { StackTraceElement[] newtrace = new StackTraceElement[lines]; System.arraycopy(oldtrace, 0, newtrace, 0, newtrace.length); error.setStackTrace(newtrace); } - LogManager.getLogger(Defaults.MOD).log(level, new MessageFormatMessage(msg, args), error); + LogManager.getLogger(Constants.MOD).log(level, new MessageFormatMessage(msg, args), error); } - public void logErrorAPI(String mod, Throwable error, Class classFile) { + public static void logErrorAPI(String mod, Throwable error, Class classFile) { StringBuilder msg = new StringBuilder(mod); msg.append(" API error, please update your mods. Error: ").append(error); logThrowable(Level.ERROR, msg.toString(), 2, error); diff --git a/src/main/java/forestry/core/utils/NBTUtil.java b/src/main/java/forestry/core/utils/NBTUtil.java index de742d4cb..3a5d36163 100644 --- a/src/main/java/forestry/core/utils/NBTUtil.java +++ b/src/main/java/forestry/core/utils/NBTUtil.java @@ -34,7 +34,7 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper; /** * @author CovertJaguar */ -public class NBTUtil { +public abstract class NBTUtil { public enum EnumNBTType { diff --git a/src/main/java/forestry/core/utils/PlayerUtil.java b/src/main/java/forestry/core/utils/PlayerUtil.java index 6d91b70ef..e191030a6 100644 --- a/src/main/java/forestry/core/utils/PlayerUtil.java +++ b/src/main/java/forestry/core/utils/PlayerUtil.java @@ -1,12 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.core.utils; import java.util.UUID; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import com.mojang.authlib.GameProfile; -import forestry.core.interfaces.IOwnable; +import forestry.core.access.IOwnable; -public class PlayerUtil { +import buildcraft.api.tools.IToolWrench; + +public abstract class PlayerUtil { //TODO: use null everywhere instead of an emptyUUID private static final UUID emptyUUID = new UUID(0, 0); @@ -34,4 +49,32 @@ public class PlayerUtil { } } + public static boolean canWrench(EntityPlayer player, int x, int y, int z) { + ItemStack itemstack = player.getCurrentEquippedItem(); + if (itemstack == null) { + return false; + } + + if (!(itemstack.getItem() instanceof IToolWrench)) { + return false; + } + + IToolWrench wrench = (IToolWrench) itemstack.getItem(); + return wrench.canWrench(player, x, y, z); + } + + public static void useWrench(EntityPlayer player, int x, int y, int z) { + ItemStack itemstack = player.getCurrentEquippedItem(); + + if (itemstack == null) { + return; + } + + if (!(itemstack.getItem() instanceof IToolWrench)) { + return; + } + + IToolWrench wrench = (IToolWrench) itemstack.getItem(); + wrench.wrenchUsed(player, x, y, z); + } } diff --git a/src/main/java/forestry/core/utils/SlotHelper.java b/src/main/java/forestry/core/utils/SlotUtil.java similarity index 85% rename from src/main/java/forestry/core/utils/SlotHelper.java rename to src/main/java/forestry/core/utils/SlotUtil.java index e84b345fc..c3afcf452 100644 --- a/src/main/java/forestry/core/utils/SlotHelper.java +++ b/src/main/java/forestry/core/utils/SlotUtil.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.core.utils; import java.util.List; @@ -9,7 +19,11 @@ import net.minecraft.item.ItemStack; import forestry.core.gui.slots.SlotForestry; -public class SlotHelper { +public abstract class SlotUtil { + + public static boolean isSlotInRange(int slotIndex, int start, int count) { + return (slotIndex >= start) && (slotIndex < start + count); + } public static ItemStack slotClickPhantom(Slot slot, int mouseButton, int modifier, EntityPlayer player) { ItemStack stack = null; @@ -33,7 +47,7 @@ public class SlotHelper { } else if (stackHeld == null) { adjustPhantomSlot(slot, mouseButton, modifier); } else if (slot.isItemValid(stackHeld)) { - if (StackUtils.isIdenticalItem(stackSlot, stackHeld)) { + if (ItemStackUtil.isIdenticalItem(stackSlot, stackHeld)) { adjustPhantomSlot(slot, mouseButton, modifier); } else { fillPhantomSlot(slot, stackHeld, mouseButton); @@ -149,7 +163,7 @@ public class SlotHelper { for (int slotIndex = start; stackToShift.stackSize > 0 && slotIndex < start + count; slotIndex++) { Slot slot = (Slot) inventorySlots.get(slotIndex); ItemStack stackInSlot = slot.getStack(); - if (stackInSlot != null && StackUtils.isIdenticalItem(stackInSlot, stackToShift)) { + if (stackInSlot != null && ItemStackUtil.isIdenticalItem(stackInSlot, stackToShift)) { int resultingStackSize = stackInSlot.stackSize + stackToShift.stackSize; int max = Math.min(stackToShift.getMaxStackSize(), slot.getSlotStackLimit()); if (resultingStackSize <= max) { @@ -192,7 +206,7 @@ public class SlotHelper { } private static boolean isInPlayerHotbar(int slotIndex) { - return Utils.isIndexInRange(slotIndex, playerInventorySize - playerHotbarSize, playerInventorySize); + return SlotUtil.isSlotInRange(slotIndex, playerInventorySize - playerHotbarSize, playerInventorySize); } private static boolean shiftToPlayerInventoryNoHotbar(List inventorySlots, ItemStack stackInSlot) { diff --git a/src/main/java/forestry/core/utils/Stack.java b/src/main/java/forestry/core/utils/Stack.java new file mode 100644 index 000000000..246ab5bc1 --- /dev/null +++ b/src/main/java/forestry/core/utils/Stack.java @@ -0,0 +1,106 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.utils; + +import java.text.NumberFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; + +import net.minecraftforge.oredict.OreDictionary; + +import cpw.mods.fml.common.registry.GameData; + +public class Stack { + private final String name; + private final int meta; + + public Stack(String name, int meta) { + this.name = name; + this.meta = meta; + } + + public static List parseStackStrings(String itemStackStrings, int missingMetaValue) { + String[] parts = itemStackStrings.split("(\\s*;\\s*)+"); + return parseStackStrings(parts, missingMetaValue); + } + + public static List parseStackStrings(String[] parts, int missingMetaValue) { + + List stacks = new ArrayList(); + + for (String itemStackString : parts) { + Stack stack = parseStackString(itemStackString, missingMetaValue); + if (stack != null) { + stacks.add(stack); + } + } + + return stacks; + } + + public static Stack parseStackString(String stackString, int missingMetaValue) { + if (stackString == null) { + return null; + } + + stackString = stackString.trim(); + if (stackString.isEmpty()) { + return null; + } + + String[] parts = stackString.split(":+"); + + if (parts.length != 2 && parts.length != 3) { + Log.warning("Stack string (" + stackString + ") isn't formatted properly. Suitable formats are :, :: or ::*, e.g. IC2:blockWall:*"); + return null; + } + + String name = parts[0] + ':' + parts[1]; + int meta; + + if (parts.length == 2) { + meta = missingMetaValue; + } else { + try { + meta = parts[2].equals("*") ? OreDictionary.WILDCARD_VALUE : NumberFormat.getIntegerInstance().parse(parts[2]).intValue(); + } catch (ParseException e) { + Log.warning("ItemStack string (" + stackString + ") has improperly formatted metadata. Suitable metadata are integer values or *."); + return null; + } + } + + return new Stack(name, meta); + } + + public Item getItem() { + Item item = GameData.getItemRegistry().getRaw(name); + if (item == null) { + Log.warning("Failed to find item for (" + name + ") in the Forge registry."); + } + return item; + } + + public Block getBlock() { + Block block = GameData.getBlockRegistry().getRaw(name); + if (block == null) { + Log.warning("Failed to find block for (" + name + ") in the Forge registry."); + } + return block; + } + + public int getMeta() { + return meta; + } +} diff --git a/src/main/java/forestry/core/utils/Timer.java b/src/main/java/forestry/core/utils/Timer.java deleted file mode 100644 index 4486e4026..000000000 --- a/src/main/java/forestry/core/utils/Timer.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.utils; - -import net.minecraft.world.World; - -/** - * @author CovertJaguar - */ -public class Timer { - - private long startTime = Long.MIN_VALUE; - - public boolean hasTriggered(World world, int ticks) { - long currentTime = world.getTotalWorldTime(); - if (currentTime >= (ticks + startTime) || startTime > currentTime) { - startTime = currentTime; - return true; - } - return false; - } - - public void reset() { - startTime = Long.MIN_VALUE; - } - -} diff --git a/src/main/java/forestry/core/utils/Utils.java b/src/main/java/forestry/core/utils/Utils.java deleted file mode 100755 index b4756bb23..000000000 --- a/src/main/java/forestry/core/utils/Utils.java +++ /dev/null @@ -1,255 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.utils; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.common.registry.EntityRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.core.circuits.ISocketable; -import forestry.core.proxy.Proxies; - -import buildcraft.api.tools.IToolWrench; - -public abstract class Utils { - - private static final int slabWoodId = OreDictionary.getOreID("slabWood"); - private static final Random rand = new Random(); - - public static int getUID() { - return rand.nextInt(); - } - - public static void dropInventory(IInventory inventory, World world, int x, int y, int z) { - if (inventory == null) { - return; - } - - // Release inventory - for (int slot = 0; slot < inventory.getSizeInventory(); slot++) { - ItemStack itemstack = inventory.getStackInSlot(slot); - dropItemStackFromInventory(itemstack, world, x, y, z); - inventory.setInventorySlotContents(slot, null); - } - } - - public static void dropSockets(ISocketable socketable, World world, int x, int y, int z) { - for (int slot = 0; slot < socketable.getSocketCount(); slot++) { - ItemStack itemstack = socketable.getSocket(slot); - dropItemStackFromInventory(itemstack, world, x, y, z); - socketable.setSocket(slot, null); - } - } - - public static void dropItemStackFromInventory(ItemStack itemStack, World world, int x, int y, int z) { - if (itemStack == null) { - return; - } - - float f = world.rand.nextFloat() * 0.8F + 0.1F; - float f1 = world.rand.nextFloat() * 0.8F + 0.1F; - float f2 = world.rand.nextFloat() * 0.8F + 0.1F; - - while (itemStack.stackSize > 0) { - int stackPartial = world.rand.nextInt(21) + 10; - if (stackPartial > itemStack.stackSize) { - stackPartial = itemStack.stackSize; - } - ItemStack drop = itemStack.splitStack(stackPartial); - EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, drop); - float accel = 0.05F; - entityitem.motionX = (float) world.rand.nextGaussian() * accel; - entityitem.motionY = (float) world.rand.nextGaussian() * accel + 0.2F; - entityitem.motionZ = (float) world.rand.nextGaussian() * accel; - world.spawnEntityInWorld(entityitem); - } - } - - public static boolean canWrench(EntityPlayer player, int x, int y, int z) { - - ItemStack itemstack = player.getCurrentEquippedItem(); - if (itemstack == null) { - return false; - } - - if (!(itemstack.getItem() instanceof IToolWrench)) { - return false; - } - - IToolWrench wrench = (IToolWrench) itemstack.getItem(); - return wrench.canWrench(player, x, y, z); - } - - public static void useWrench(EntityPlayer player, int x, int y, int z) { - ItemStack itemstack = player.getCurrentEquippedItem(); - - if (itemstack == null) { - return; - } - - if (!(itemstack.getItem() instanceof IToolWrench)) { - return; - } - - ((IToolWrench) itemstack.getItem()).wrenchUsed(player, x, y, z); - } - - public static EnumTankLevel rateTankLevel(int scaled) { - - if (scaled < 5) { - return EnumTankLevel.EMPTY; - } else if (scaled < 30) { - return EnumTankLevel.LOW; - } else if (scaled < 60) { - return EnumTankLevel.MEDIUM; - } else if (scaled < 90) { - return EnumTankLevel.HIGH; - } else { - return EnumTankLevel.MAXIMUM; - } - } - - public static boolean isWoodSlabBlock(Block block) { - int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block)); - for (int oreId : oreIds) { - if (oreId == slabWoodId) { - return true; - } - } - - return false; - } - - public static boolean isReplaceableBlock(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - - return isReplaceableBlock(block); - } - - public static boolean isReplaceableBlock(Block block) { - return block == Blocks.vine || block == Blocks.tallgrass || block == Blocks.deadbush || block == Blocks.snow_layer - || block.getMaterial().isReplaceable(); - } - - public static boolean isUseableByPlayer(EntityPlayer player, TileEntity tile) { - int x = tile.xCoord; - int y = tile.yCoord; - int z = tile.zCoord; - World world = tile.getWorldObj(); - - if (tile.isInvalid()) { - return false; - } - - if (world.getTileEntity(x, y, z) != tile) { - return false; - } - - return player.getDistanceSq(x + 0.5D, y + 0.5D, z + 0.5D) <= 64.0D; - - } - - private static E createEntity(World world, Class entityClass) { - if (!EntityList.classToStringMapping.containsKey(entityClass)) { - return null; - } - - String entityString = (String) EntityList.classToStringMapping.get(entityClass); - if (entityString == null) { - return null; - } - - Entity entity = EntityList.createEntityByName(entityString, world); - return entityClass.cast(entity); - } - - public static E spawnEntity(World world, Class entityClass, double x, double y, double z) { - E entityLiving = createEntity(world, entityClass); - if (entityLiving == null) { - return null; - } - return spawnEntity(world, entityLiving, x, y, z); - } - - public static E spawnEntity(World world, E living, double x, double y, double z) { - if (living == null) { - return null; - } - - living.setLocationAndAngles(x, y, z, MathHelper.wrapAngleTo180_float(world.rand.nextFloat() * 360.0f), 0.0f); - living.rotationYawHead = living.rotationYaw; - living.renderYawOffset = living.rotationYaw; - living.onSpawnWithEgg(null); - world.spawnEntityInWorld(living); - living.playLivingSound(); - return living; - } - - public static void registerEntity(Class entityClass, String ident, int id, int eggForeground, int eggBackground, int trackingRange, int updateFrequency, boolean sendVelocity) { - EntityRegistry.registerModEntity(entityClass, ident, id, ForestryAPI.instance, trackingRange, updateFrequency, sendVelocity); - Proxies.log.finer("Registered entity %s (%s) with id %s.", ident, entityClass.toString(), id); - } - - public static T getTile(IBlockAccess world, int x, int y, int z, Class tileClass) { - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileClass.isInstance(tileEntity)) { - return tileClass.cast(tileEntity); - } else { - Proxies.log.warning("Failed to cast a tile entity {" + tileEntity + "} to a {" + tileClass.getName() + "} at " + x + '/' + y + '/' + z); - return null; - } - } - - public static boolean isIndexInRange(int index, int start, int count) { - return (index >= start) && (index < start + count); - } - - public static int addRGBComponents(int colour, int r, int g, int b) { - r = ((colour & 0xff0000) >> 16) + r; - g = ((colour & 0xff00) >> 8) + g; - b = ((colour & 0xff)) + b; - - r = r <= 255 ? r : 255; - g = g <= 255 ? g : 255; - b = b <= 255 ? b : 255; - - return ((r & 0x0ff) << 16) | ((g & 0x0ff) << 8) | (b & 0x0ff); - } - - public static int multiplyRGBComponents(int colour, float factor) { - int r = (int) (((colour & 0xff0000) >> 16) * factor); - int g = (int) (((colour & 0xff00) >> 8) * factor); - int b = (int) (((colour & 0xff)) * factor); - - r = r <= 255 ? r : 255; - g = g <= 255 ? g : 255; - b = b <= 255 ? b : 255; - - return ((r & 0x0ff) << 16) | ((g & 0x0ff) << 8) | (b & 0x0ff); - } -} diff --git a/src/main/java/forestry/core/utils/FluidMap.java b/src/main/java/forestry/core/utils/datastructures/FluidMap.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/core/utils/FluidMap.java rename to src/main/java/forestry/core/utils/datastructures/FluidMap.java index 522dfd959..6b02f95be --- a/src/main/java/forestry/core/utils/FluidMap.java +++ b/src/main/java/forestry/core/utils/datastructures/FluidMap.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.utils.datastructures; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/forestry/core/utils/ItemStackMap.java b/src/main/java/forestry/core/utils/datastructures/ItemStackMap.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/core/utils/ItemStackMap.java rename to src/main/java/forestry/core/utils/datastructures/ItemStackMap.java index 008b33b77..578af5186 --- a/src/main/java/forestry/core/utils/ItemStackMap.java +++ b/src/main/java/forestry/core/utils/datastructures/ItemStackMap.java @@ -8,8 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; - +package forestry.core.utils.datastructures; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/utils/RevolvingList.java b/src/main/java/forestry/core/utils/datastructures/RevolvingList.java similarity index 97% rename from src/main/java/forestry/core/utils/RevolvingList.java rename to src/main/java/forestry/core/utils/datastructures/RevolvingList.java index b17217b95..633d1859e 100644 --- a/src/main/java/forestry/core/utils/RevolvingList.java +++ b/src/main/java/forestry/core/utils/datastructures/RevolvingList.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.utils.datastructures; import com.google.common.collect.ForwardingCollection; diff --git a/src/main/java/forestry/core/utils/StackMap.java b/src/main/java/forestry/core/utils/datastructures/StackMap.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/core/utils/StackMap.java rename to src/main/java/forestry/core/utils/datastructures/StackMap.java index bad395513..5fdd3ca6a --- a/src/main/java/forestry/core/utils/StackMap.java +++ b/src/main/java/forestry/core/utils/datastructures/StackMap.java @@ -8,12 +8,11 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.utils; +package forestry.core.utils.datastructures; import java.util.HashMap; import java.util.Map; - /** * Map for fluids and items. Can add things like ore dictionary strings etc. * diff --git a/src/main/java/forestry/core/vect/IVect.java b/src/main/java/forestry/core/utils/vect/IVect.java similarity index 93% rename from src/main/java/forestry/core/vect/IVect.java rename to src/main/java/forestry/core/utils/vect/IVect.java index 4365de2d3..5cb86d085 100644 --- a/src/main/java/forestry/core/vect/IVect.java +++ b/src/main/java/forestry/core/utils/vect/IVect.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.vect; +package forestry.core.utils.vect; import net.minecraft.util.ChunkCoordinates; diff --git a/src/main/java/forestry/core/vect/MutableVect.java b/src/main/java/forestry/core/utils/vect/MutableVect.java similarity index 94% rename from src/main/java/forestry/core/vect/MutableVect.java rename to src/main/java/forestry/core/utils/vect/MutableVect.java index 4b6c64bc6..02f0b227a 100644 --- a/src/main/java/forestry/core/vect/MutableVect.java +++ b/src/main/java/forestry/core/utils/vect/MutableVect.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.vect; +package forestry.core.utils.vect; import net.minecraft.util.ChunkCoordinates; diff --git a/src/main/java/forestry/core/vect/Vect.java b/src/main/java/forestry/core/utils/vect/Vect.java similarity index 94% rename from src/main/java/forestry/core/vect/Vect.java rename to src/main/java/forestry/core/utils/vect/Vect.java index 0f1cbb26f..323ba1c03 100644 --- a/src/main/java/forestry/core/vect/Vect.java +++ b/src/main/java/forestry/core/utils/vect/Vect.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.vect; +package forestry.core.utils.vect; import java.util.Random; diff --git a/src/main/java/forestry/core/vect/VectUtil.java b/src/main/java/forestry/core/utils/vect/VectUtil.java similarity index 95% rename from src/main/java/forestry/core/vect/VectUtil.java rename to src/main/java/forestry/core/utils/vect/VectUtil.java index 71dd7c23c..c435dd36f 100644 --- a/src/main/java/forestry/core/vect/VectUtil.java +++ b/src/main/java/forestry/core/utils/vect/VectUtil.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.vect; +package forestry.core.utils.vect; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/worldgen/BlockType.java b/src/main/java/forestry/core/worldgen/BlockType.java index ff5556b18..607f96038 100755 --- a/src/main/java/forestry/core/worldgen/BlockType.java +++ b/src/main/java/forestry/core/worldgen/BlockType.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class BlockType implements IBlockType { @@ -35,7 +35,7 @@ public class BlockType implements IBlockType { @Override public void setBlock(World world, int x, int y, int z) { - world.setBlock(x, y, z, block, meta, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + world.setBlock(x, y, z, block, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } @Override diff --git a/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java b/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java index e17f9432c..ae27f2bf8 100644 --- a/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java +++ b/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java @@ -17,9 +17,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.gadgets.TileForestry; +import forestry.core.tiles.TileForestry; public class BlockTypeTileForestry implements IBlockType { @@ -39,7 +39,7 @@ public class BlockTypeTileForestry implements IBlockType { @Override public void setBlock(World world, int x, int y, int z) { - boolean placed = world.setBlock(x, y, z, block, meta, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + boolean placed = world.setBlock(x, y, z, block, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return; } diff --git a/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java b/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java index ee80ebd9c..17f156e9b 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java +++ b/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java @@ -18,7 +18,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; public class WorldGenMinableMeta extends WorldGenerator { @@ -75,7 +75,7 @@ public class WorldGenMinableMeta extends WorldGenerator { for (int targetZ = zStart; targetZ <= zEnd; targetZ++) { double d14 = ((targetZ + 0.5D) - d8) / (d10 / 2D); if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D && world.getBlock(targetX, targetY, targetZ) == Blocks.stone) { - world.setBlock(targetX, targetY, targetZ, mineableBlock, mineableBlockMeta, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(targetX, targetY, targetZ, mineableBlock, mineableBlockMeta, Constants.FLAG_BLOCK_SYNCH); hasGenerated = true; } } diff --git a/src/main/java/forestry/core/WorldGenerator.java b/src/main/java/forestry/core/worldgen/WorldGenerator.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/forestry/core/WorldGenerator.java rename to src/main/java/forestry/core/worldgen/WorldGenerator.java index 9e7a1c47f..365dfb73d --- a/src/main/java/forestry/core/WorldGenerator.java +++ b/src/main/java/forestry/core/worldgen/WorldGenerator.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core; +package forestry.core.worldgen; import java.util.Random; @@ -23,7 +23,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import forestry.core.config.Config; import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.WorldGenMinableMeta; import forestry.plugins.PluginManager; public class WorldGenerator implements IWorldGenerator { diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index 01ce948d6..2ce73888b 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -7,11 +7,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.GameMode; -import forestry.core.gadgets.Engine; +import forestry.core.config.GameMode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; +import forestry.core.tiles.TileEngine; import forestry.core.utils.BlockUtil; import cofh.api.energy.EnergyStorage; @@ -194,8 +194,8 @@ public class EnergyManager implements IEnergyHandler, IStreamable { if (tile instanceof IEnergyReceiver) { IEnergyReceiver receptor = (IEnergyReceiver) tile; sent = receptor.receiveEnergy(orientation.getOpposite(), extractable, simulate); - } else if (tile instanceof Engine) { - Engine receptor = (Engine) tile; + } else if (tile instanceof TileEngine) { + TileEngine receptor = (TileEngine) tile; sent = receptor.getEnergyManager().receiveEnergy(orientation.getOpposite(), extractable, simulate); } diff --git a/src/main/java/forestry/energy/GuiHandlerEnergy.java b/src/main/java/forestry/energy/GuiHandlerEnergy.java index 291226a32..c59ece9a8 100755 --- a/src/main/java/forestry/energy/GuiHandlerEnergy.java +++ b/src/main/java/forestry/energy/GuiHandlerEnergy.java @@ -17,10 +17,6 @@ import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.core.network.PacketSocketUpdate; import forestry.core.proxy.Proxies; -import forestry.energy.gadgets.EngineBronze; -import forestry.energy.gadgets.EngineCopper; -import forestry.energy.gadgets.EngineTin; -import forestry.energy.gadgets.MachineGenerator; import forestry.energy.gui.ContainerEngineBronze; import forestry.energy.gui.ContainerEngineCopper; import forestry.energy.gui.ContainerEngineTin; @@ -29,6 +25,10 @@ import forestry.energy.gui.GuiEngineBronze; import forestry.energy.gui.GuiEngineCopper; import forestry.energy.gui.GuiEngineTin; import forestry.energy.gui.GuiGenerator; +import forestry.energy.tiles.TileEngineBiogas; +import forestry.energy.tiles.TileEngineElectric; +import forestry.energy.tiles.TileEnginePeat; +import forestry.energy.tiles.TileGenerator; public class GuiHandlerEnergy extends GuiHandlerBase { @@ -41,17 +41,17 @@ public class GuiHandlerEnergy extends GuiHandlerBase { switch (GuiId.values()[id]) { - case EngineBronzeGUI: - return new GuiEngineBronze(player.inventory, getTile(world, x, y, z, player, EngineBronze.class)); + case EngineBiogasGUI: + return new GuiEngineBronze(player.inventory, getTile(world, x, y, z, player, TileEngineBiogas.class)); - case EngineCopperGUI: - return new GuiEngineCopper(player.inventory, getTile(world, x, y, z, player, EngineCopper.class)); + case EnginePeatGUI: + return new GuiEngineCopper(player.inventory, getTile(world, x, y, z, player, TileEnginePeat.class)); - case EngineTinGUI: - return new GuiEngineTin(player.inventory, getTile(world, x, y, z, player, EngineTin.class)); + case EngineElectricGUI: + return new GuiEngineTin(player.inventory, getTile(world, x, y, z, player, TileEngineElectric.class)); case GeneratorGUI: - return new GuiGenerator(player.inventory, getTile(world, x, y, z, player, MachineGenerator.class)); + return new GuiGenerator(player.inventory, getTile(world, x, y, z, player, TileGenerator.class)); default: return null; @@ -67,19 +67,19 @@ public class GuiHandlerEnergy extends GuiHandlerBase { switch (GuiId.values()[id]) { - case EngineBronzeGUI: - return new ContainerEngineBronze(player.inventory, getTile(world, x, y, z, player, EngineBronze.class)); + case EngineBiogasGUI: + return new ContainerEngineBronze(player.inventory, getTile(world, x, y, z, player, TileEngineBiogas.class)); - case EngineCopperGUI: - return new ContainerEngineCopper(player.inventory, getTile(world, x, y, z, player, EngineCopper.class)); + case EnginePeatGUI: + return new ContainerEngineCopper(player.inventory, getTile(world, x, y, z, player, TileEnginePeat.class)); - case EngineTinGUI: - EngineTin tile = getTile(world, x, y, z, player, EngineTin.class); + case EngineElectricGUI: + TileEngineElectric tile = getTile(world, x, y, z, player, TileEngineElectric.class); Proxies.net.sendToPlayer(new PacketSocketUpdate(tile), player); return new ContainerEngineTin(player.inventory, tile); case GeneratorGUI: - return new ContainerGenerator(player.inventory, getTile(world, x, y, z, player, MachineGenerator.class)); + return new ContainerGenerator(player.inventory, getTile(world, x, y, z, player, TileGenerator.class)); default: return null; diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java index 9bd1ea2cf..cecb6f416 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java @@ -11,7 +11,7 @@ package forestry.energy.circuits; import forestry.core.circuits.Circuit; -import forestry.energy.gadgets.EngineTin; +import forestry.energy.tiles.TileEngineElectric; public abstract class CircuitElectricChange extends Circuit { @@ -29,7 +29,7 @@ public abstract class CircuitElectricChange extends Circuit { @Override public boolean isCircuitable(Object tile) { - return tile instanceof EngineTin; + return tile instanceof TileEngineElectric; } @Override @@ -38,7 +38,7 @@ public abstract class CircuitElectricChange extends Circuit { return; } - EngineTin engine = (EngineTin) tile; + TileEngineElectric engine = (TileEngineElectric) tile; engine.changeEnergyConfig(euChange, rfChange, 2 * euChange); } @@ -53,7 +53,7 @@ public abstract class CircuitElectricChange extends Circuit { return; } - EngineTin engine = (EngineTin) tile; + TileEngineElectric engine = (TileEngineElectric) tile; engine.changeEnergyConfig(-euChange, -rfChange, -(2 * euChange)); } diff --git a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java index 780d94038..931965f1e 100755 --- a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java +++ b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java @@ -11,7 +11,7 @@ package forestry.energy.circuits; import forestry.core.circuits.Circuit; -import forestry.energy.gadgets.EngineCopper; +import forestry.energy.tiles.TileEnginePeat; public class CircuitFireDampener extends Circuit { @@ -21,7 +21,7 @@ public class CircuitFireDampener extends Circuit { @Override public boolean isCircuitable(Object tile) { - return tile instanceof EngineCopper; + return tile instanceof TileEnginePeat; } @Override diff --git a/src/main/java/forestry/energy/gui/ContainerEngineBronze.java b/src/main/java/forestry/energy/gui/ContainerEngineBronze.java index 6b8d65d1f..20b8259a8 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineBronze.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineBronze.java @@ -14,14 +14,14 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotFiltered; -import forestry.energy.gadgets.EngineBronze; +import forestry.energy.tiles.TileEngineBiogas; -public class ContainerEngineBronze extends ContainerLiquidTanks { +public class ContainerEngineBronze extends ContainerLiquidTanks { - public ContainerEngineBronze(InventoryPlayer player, EngineBronze engine) { + public ContainerEngineBronze(InventoryPlayer player, TileEngineBiogas engine) { super(engine, player, 8, 84); - this.addSlotToContainer(new SlotFiltered(engine, EngineBronze.SLOT_CAN, 143, 40)); + this.addSlotToContainer(new SlotFiltered(engine, TileEngineBiogas.SLOT_CAN, 143, 40)); } } diff --git a/src/main/java/forestry/energy/gui/ContainerEngineCopper.java b/src/main/java/forestry/energy/gui/ContainerEngineCopper.java index 4d7442b55..7d4bd7868 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineCopper.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineCopper.java @@ -16,11 +16,11 @@ import net.minecraft.inventory.ICrafting; import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.energy.gadgets.EngineCopper; +import forestry.energy.tiles.TileEnginePeat; -public class ContainerEngineCopper extends ContainerTile { +public class ContainerEngineCopper extends ContainerTile { - public ContainerEngineCopper(InventoryPlayer player, EngineCopper tile) { + public ContainerEngineCopper(InventoryPlayer player, TileEnginePeat tile) { super(tile, player, 8, 84); this.addSlotToContainer(new SlotFiltered(tile, 0, 44, 46)); diff --git a/src/main/java/forestry/energy/gui/ContainerEngineTin.java b/src/main/java/forestry/energy/gui/ContainerEngineTin.java index 4861efc56..7eecbeb3c 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineTin.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineTin.java @@ -15,14 +15,14 @@ import net.minecraft.inventory.ICrafting; import forestry.core.gui.ContainerSocketed; import forestry.core.gui.slots.SlotFiltered; -import forestry.energy.gadgets.EngineTin; +import forestry.energy.tiles.TileEngineElectric; -public class ContainerEngineTin extends ContainerSocketed { +public class ContainerEngineTin extends ContainerSocketed { - public ContainerEngineTin(InventoryPlayer player, EngineTin tile) { + public ContainerEngineTin(InventoryPlayer player, TileEngineElectric tile) { super(tile, player, 8, 84); - this.addSlotToContainer(new SlotFiltered(tile, EngineTin.SLOT_BATTERY, 84, 53)); + this.addSlotToContainer(new SlotFiltered(tile, TileEngineElectric.SLOT_BATTERY, 84, 53)); } @Override diff --git a/src/main/java/forestry/energy/gui/ContainerGenerator.java b/src/main/java/forestry/energy/gui/ContainerGenerator.java index 451e4cbd3..07c03c8bf 100755 --- a/src/main/java/forestry/energy/gui/ContainerGenerator.java +++ b/src/main/java/forestry/energy/gui/ContainerGenerator.java @@ -14,13 +14,13 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotFiltered; -import forestry.energy.gadgets.MachineGenerator; +import forestry.energy.tiles.TileGenerator; -public class ContainerGenerator extends ContainerLiquidTanks { +public class ContainerGenerator extends ContainerLiquidTanks { - public ContainerGenerator(InventoryPlayer player, MachineGenerator tile) { + public ContainerGenerator(InventoryPlayer player, TileGenerator tile) { super(tile, player, 8, 84); - this.addSlotToContainer(new SlotFiltered(tile, MachineGenerator.SLOT_CAN, 22, 38)); + this.addSlotToContainer(new SlotFiltered(tile, TileGenerator.SLOT_CAN, 22, 38)); } } diff --git a/src/main/java/forestry/energy/gui/GuiEngine.java b/src/main/java/forestry/energy/gui/GuiEngine.java index c07b6356a..81ece3d74 100755 --- a/src/main/java/forestry/energy/gui/GuiEngine.java +++ b/src/main/java/forestry/energy/gui/GuiEngine.java @@ -12,13 +12,13 @@ package forestry.energy.gui; import net.minecraft.inventory.Container; -import forestry.core.gadgets.Engine; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.ledgers.Ledger; import forestry.core.render.TextureManager; +import forestry.core.tiles.TileEngine; import forestry.core.utils.StringUtil; -public abstract class GuiEngine extends GuiForestryTitled { +public abstract class GuiEngine extends GuiForestryTitled { protected GuiEngine(String texture, C container, I tile) { super(texture, container, tile); diff --git a/src/main/java/forestry/energy/gui/GuiEngineBronze.java b/src/main/java/forestry/energy/gui/GuiEngineBronze.java index 0a7da89a8..ee5ca02af 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineBronze.java +++ b/src/main/java/forestry/energy/gui/GuiEngineBronze.java @@ -20,16 +20,16 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.widgets.TankWidget; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; -import forestry.energy.gadgets.EngineBronze; +import forestry.energy.tiles.TileEngineBiogas; -public class GuiEngineBronze extends GuiEngine { +public class GuiEngineBronze extends GuiEngine { protected class BiogasSlot extends Widget { @@ -97,8 +97,8 @@ public class GuiEngineBronze extends GuiEngine { +public class GuiEngineCopper extends GuiEngine { - public GuiEngineCopper(InventoryPlayer inventory, EngineCopper tile) { - super(Defaults.TEXTURE_PATH_GUI + "/peatengine.png", new ContainerEngineCopper(inventory, tile), tile); + public GuiEngineCopper(InventoryPlayer inventory, TileEnginePeat tile) { + super(Constants.TEXTURE_PATH_GUI + "/peatengine.png", new ContainerEngineCopper(inventory, tile), tile); } @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - EngineCopper engine = inventory; + TileEnginePeat engine = inventory; int progress; if (engine.isBurning()) { progress = engine.getBurnTimeRemainingScaled(12); diff --git a/src/main/java/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java index ec49dae5e..964485bd6 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineTin.java +++ b/src/main/java/forestry/energy/gui/GuiEngineTin.java @@ -12,15 +12,15 @@ package forestry.energy.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.widgets.SocketWidget; -import forestry.core.utils.EnumTankLevel; -import forestry.energy.gadgets.EngineTin; +import forestry.core.render.EnumTankLevel; +import forestry.energy.tiles.TileEngineElectric; -public class GuiEngineTin extends GuiEngine { +public class GuiEngineTin extends GuiEngine { - public GuiEngineTin(InventoryPlayer inventory, EngineTin tile) { - super(Defaults.TEXTURE_PATH_GUI + "/electricalengine.png", new ContainerEngineTin(inventory, tile), tile); + public GuiEngineTin(InventoryPlayer inventory, TileEngineElectric tile) { + super(Constants.TEXTURE_PATH_GUI + "/electricalengine.png", new ContainerEngineTin(inventory, tile), tile); widgetManager.add(new SocketWidget(this.widgetManager, 30, 40, tile, 0)); } @@ -28,7 +28,7 @@ public class GuiEngineTin extends GuiEngine { protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - EngineTin engine = inventory; + TileEngineElectric engine = inventory; int storageHeight = engine.getStorageScaled(46); int storageMaxHeight = engine.getStorageScaled(100); EnumTankLevel rated = rateLevel(storageMaxHeight); diff --git a/src/main/java/forestry/energy/gui/GuiGenerator.java b/src/main/java/forestry/energy/gui/GuiGenerator.java index 6577c73f1..01b536bf7 100755 --- a/src/main/java/forestry/energy/gui/GuiGenerator.java +++ b/src/main/java/forestry/energy/gui/GuiGenerator.java @@ -12,15 +12,15 @@ package forestry.energy.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.energy.gadgets.MachineGenerator; +import forestry.energy.tiles.TileGenerator; -public class GuiGenerator extends GuiForestryTitled { +public class GuiGenerator extends GuiForestryTitled { - public GuiGenerator(InventoryPlayer inventory, MachineGenerator tile) { - super(Defaults.TEXTURE_PATH_GUI + "/generator.png", new ContainerGenerator(inventory, tile), tile); + public GuiGenerator(InventoryPlayer inventory, TileGenerator tile) { + super(Constants.TEXTURE_PATH_GUI + "/generator.png", new ContainerGenerator(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 49, 17, 0)); } diff --git a/src/main/java/forestry/energy/proxy/ProxyEnergy.java b/src/main/java/forestry/energy/proxy/ProxyEnergy.java index b8c255cf9..23ce67da2 100755 --- a/src/main/java/forestry/energy/proxy/ProxyEnergy.java +++ b/src/main/java/forestry/energy/proxy/ProxyEnergy.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.energy.proxy; -import forestry.core.interfaces.IBlockRenderer; +import forestry.core.render.IBlockRenderer; public class ProxyEnergy { public IBlockRenderer getRenderDefaultEngine(String gfxBase) { diff --git a/src/main/java/forestry/energy/proxy/ClientProxyEnergy.java b/src/main/java/forestry/energy/proxy/ProxyEnergyClient.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/forestry/energy/proxy/ClientProxyEnergy.java rename to src/main/java/forestry/energy/proxy/ProxyEnergyClient.java index 492ae0ab0..20e9fd89a --- a/src/main/java/forestry/energy/proxy/ClientProxyEnergy.java +++ b/src/main/java/forestry/energy/proxy/ProxyEnergyClient.java @@ -10,10 +10,10 @@ ******************************************************************************/ package forestry.energy.proxy; -import forestry.core.interfaces.IBlockRenderer; +import forestry.core.render.IBlockRenderer; import forestry.energy.render.RenderEngine; -public class ClientProxyEnergy extends ProxyEnergy { +public class ProxyEnergyClient extends ProxyEnergy { public IBlockRenderer getRenderDefaultEngine(String gfxBase) { return new RenderEngine(gfxBase); diff --git a/src/main/java/forestry/energy/render/RenderEngine.java b/src/main/java/forestry/energy/render/RenderEngine.java index 47d8e4d66..c11d7f50b 100755 --- a/src/main/java/forestry/energy/render/RenderEngine.java +++ b/src/main/java/forestry/energy/render/RenderEngine.java @@ -20,12 +20,12 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import forestry.core.TemperatureState; -import forestry.core.config.Defaults; -import forestry.core.gadgets.Engine; -import forestry.core.interfaces.IBlockRenderer; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; +import forestry.core.render.ForestryResource; +import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.TemperatureState; +import forestry.core.tiles.TileEngine; public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRenderer { @@ -86,11 +86,11 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRen new ForestryResource(baseTexture + "base.png"), new ForestryResource(baseTexture + "piston.png"), new ForestryResource(baseTexture + "extension.png"), - new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/engine_trunk_highest.png"), - new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/engine_trunk_higher.png"), - new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/engine_trunk_high.png"), - new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/engine_trunk_medium.png"), - new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/engine_trunk_low.png"),}; + new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_highest.png"), + new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_higher.png"), + new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_high.png"), + new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_medium.png"), + new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_low.png"),}; } @Override @@ -101,10 +101,10 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRen @Override public void renderTileEntityAt(TileEntity tile, double d, double d1, double d2, float f) { - Engine engine = (Engine) tile; + TileEngine tileEngine = (TileEngine) tile; - if (engine != null) { - render(engine.getTemperatureState(), engine.progress, engine.getOrientation(), d, d1, d2); + if (tileEngine != null) { + render(tileEngine.getTemperatureState(), tileEngine.progress, tileEngine.getOrientation(), d, d1, d2); } } diff --git a/src/main/java/forestry/energy/gadgets/EngineDefinition.java b/src/main/java/forestry/energy/tiles/EngineDefinition.java old mode 100755 new mode 100644 similarity index 75% rename from src/main/java/forestry/energy/gadgets/EngineDefinition.java rename to src/main/java/forestry/energy/tiles/EngineDefinition.java index d7f7e72c6..1d945c57c --- a/src/main/java/forestry/energy/gadgets/EngineDefinition.java +++ b/src/main/java/forestry/energy/tiles/EngineDefinition.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.energy.gadgets; +package forestry.energy.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.crafting.IRecipe; @@ -18,10 +18,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.gadgets.Engine; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.utils.Utils; +import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.MachineDefinition; +import forestry.core.tiles.TileEngine; +import forestry.core.utils.PlayerUtil; public class EngineDefinition extends MachineDefinition { @@ -32,8 +32,8 @@ public class EngineDefinition extends MachineDefinition { @Override public boolean isSolidOnSide(IBlockAccess world, int x, int y, int z, int side) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof Engine) { - return ((Engine) tile).getOrientation().getOpposite().ordinal() == side; + if (tile instanceof TileEngine) { + return ((TileEngine) tile).getOrientation().getOpposite().ordinal() == side; } return false; } @@ -45,10 +45,10 @@ public class EngineDefinition extends MachineDefinition { return false; } - Engine tile = (Engine) world.getTileEntity(x, y, z); - if (Utils.canWrench(player, x, y, z)) { + TileEngine tile = (TileEngine) world.getTileEntity(x, y, z); + if (PlayerUtil.canWrench(player, x, y, z)) { tile.rotateEngine(); - Utils.useWrench(player, x, y, z); + PlayerUtil.useWrench(player, x, y, z); return true; } @@ -57,7 +57,7 @@ public class EngineDefinition extends MachineDefinition { @Override public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { - Engine tile = (Engine) world.getTileEntity(x, y, z); + TileEngine tile = (TileEngine) world.getTileEntity(x, y, z); tile.rotateEngine(); return true; } diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/forestry/energy/gadgets/EngineBronze.java rename to src/main/java/forestry/energy/tiles/TileEngineBiogas.java index 337909116..ae1a061c9 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.energy.gadgets; +package forestry.energy.tiles; import java.io.IOException; @@ -29,23 +29,23 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.gadgets.Engine; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TileEngine; -public class EngineBronze extends Engine implements ISidedInventory, ILiquidTankContainer { +public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILiquidTankTile { /* CONSTANTS */ public static final short SLOT_CAN = 0; @@ -61,15 +61,15 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank */ private boolean shutdown; - public EngineBronze() { - super(Defaults.ENGINE_BRONZE_HEAT_MAX, 300000); + public TileEngineBiogas() { + super(Constants.ENGINE_BRONZE_HEAT_MAX, 300000); setHints(Config.hints.get("engine.bronze")); setInternalInventory(new EngineBronzeInventoryAdapter(this)); - fuelTank = new FilteredTank(Defaults.ENGINE_TANK_CAPACITY, FuelManager.bronzeEngineFuel.keySet()); + fuelTank = new FilteredTank(Constants.ENGINE_TANK_CAPACITY, FuelManager.bronzeEngineFuel.keySet()); fuelTank.tankMode = StandardTank.TankMode.DEFAULT; - heatingTank = new FilteredTank(Defaults.ENGINE_TANK_CAPACITY, FluidRegistry.LAVA); + heatingTank = new FilteredTank(Constants.ENGINE_TANK_CAPACITY, FluidRegistry.LAVA); heatingTank.tankMode = StandardTank.TankMode.INPUT; this.tankManager = new TankManager(fuelTank, heatingTank); } @@ -81,7 +81,7 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank @Override public void openGui(EntityPlayer player) { - player.openGui(ForestryAPI.instance, GuiId.EngineBronzeGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); + player.openGui(ForestryAPI.instance, GuiId.EngineBiogasGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); } @Override @@ -114,7 +114,7 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank currentOutput = 0; - if (isRedstoneActivated() && (fuelTank.getFluidAmount() >= Defaults.BUCKET_VOLUME || burnTime > 0)) { + if (isRedstoneActivated() && (fuelTank.getFluidAmount() >= Constants.BUCKET_VOLUME || burnTime > 0)) { double heatStage = getHeatLevel(); @@ -125,7 +125,7 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank { if (heatingTank.getFluidAmount() > 0 && Fluids.LAVA.is(heatingTank.getFluid())) { - addHeat(Defaults.ENGINE_HEAT_VALUE_LAVA); + addHeat(Constants.ENGINE_HEAT_VALUE_LAVA); heatingTank.drain(1, true); } } @@ -141,7 +141,7 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank } else { burnTime = totalTime = determineBurnTime(fuelTank.getFluid().getFluid()); currentFluidId = fuelTank.getFluid().getFluid().getID(); - fuelTank.drain(Defaults.BUCKET_VOLUME, true); + fuelTank.drain(Constants.BUCKET_VOLUME, true); } } else { shutdown(true); @@ -195,11 +195,11 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank if (isRedstoneActivated() && burnTime > 0) { double heatStage = getHeatLevel(); if (heatStage >= 0.75) { - generate += Defaults.ENGINE_BRONZE_HEAT_GENERATION_ENERGY * 3; + generate += Constants.ENGINE_BRONZE_HEAT_GENERATION_ENERGY * 3; } else if (heatStage > 0.24) { - generate += Defaults.ENGINE_BRONZE_HEAT_GENERATION_ENERGY * 2; + generate += Constants.ENGINE_BRONZE_HEAT_GENERATION_ENERGY * 2; } else if (heatStage > 0.2) { - generate += Defaults.ENGINE_BRONZE_HEAT_GENERATION_ENERGY; + generate += Constants.ENGINE_BRONZE_HEAT_GENERATION_ENERGY; } } @@ -366,8 +366,8 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank return tankManager.getTankInfo(from); } - private static class EngineBronzeInventoryAdapter extends TileInventoryAdapter { - public EngineBronzeInventoryAdapter(EngineBronze engineBronze) { + private static class EngineBronzeInventoryAdapter extends TileInventoryAdapter { + public EngineBronzeInventoryAdapter(TileEngineBiogas engineBronze) { super(engineBronze, 1, "Items"); } diff --git a/src/main/java/forestry/energy/gadgets/EngineClockwork.java b/src/main/java/forestry/energy/tiles/TileEngineClockwork.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/energy/gadgets/EngineClockwork.java rename to src/main/java/forestry/energy/tiles/TileEngineClockwork.java index f871db2cc..f8f52c7c1 --- a/src/main/java/forestry/energy/gadgets/EngineClockwork.java +++ b/src/main/java/forestry/energy/tiles/TileEngineClockwork.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.energy.gadgets; +package forestry.energy.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -18,12 +18,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.FakePlayer; -import forestry.core.TemperatureState; -import forestry.core.config.Defaults; -import forestry.core.gadgets.Engine; +import forestry.core.config.Constants; +import forestry.core.tiles.TemperatureState; +import forestry.core.tiles.TileEngine; import forestry.core.utils.DamageSourceForestry; -public class EngineClockwork extends Engine { +public class TileEngineClockwork extends TileEngine { private final static float WIND_EXHAUSTION = 0.05f; private final static float WIND_TENSION_BASE = 0.5f; @@ -38,7 +38,7 @@ public class EngineClockwork extends Engine { private float tension = 0.0f; private short delay = 0; - public EngineClockwork() { + public TileEngineClockwork() { super(ENGINE_CLOCKWORK_HEAT_MAX, 10000); } @@ -145,7 +145,7 @@ public class EngineClockwork extends Engine { return 0; } - float fromClockwork = (tension / ENGINE_CLOCKWORK_WIND_MAX) * Defaults.ENGINE_PISTON_SPEED_MAX; + float fromClockwork = (tension / ENGINE_CLOCKWORK_WIND_MAX) * Constants.ENGINE_PISTON_SPEED_MAX; fromClockwork = Math.round(fromClockwork * 100f) / 100f; diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/energy/gadgets/EngineTin.java rename to src/main/java/forestry/energy/tiles/TileEngineElectric.java index a4421a7e1..313d4cb8a --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.energy.gadgets; +package forestry.energy.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -21,21 +21,21 @@ import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; -import forestry.core.EnumErrorCode; -import forestry.core.TemperatureState; import forestry.core.circuits.ISocketable; import forestry.core.config.Config; -import forestry.core.config.Defaults; -import forestry.core.gadgets.Engine; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; +import forestry.core.tiles.TemperatureState; +import forestry.core.tiles.TileEngine; import forestry.plugins.PluginIC2; import ic2.api.energy.prefab.BasicSink; import ic2.api.item.ElectricItem; -public class EngineTin extends Engine implements ISocketable, IInventory { +public class TileEngineElectric extends TileEngine implements ISocketable, IInventory { protected static class EuConfig { @@ -44,9 +44,9 @@ public class EngineTin extends Engine implements ISocketable, IInventory { public int euStorage; public EuConfig() { - this.euForCycle = Defaults.ENGINE_TIN_EU_FOR_CYCLE; - this.rfPerCycle = Defaults.ENGINE_TIN_ENERGY_PER_CYCLE; - this.euStorage = Defaults.ENGINE_TIN_MAX_EU_STORED; + this.euForCycle = Constants.ENGINE_TIN_EU_FOR_CYCLE; + this.rfPerCycle = Constants.ENGINE_TIN_ENERGY_PER_CYCLE; + this.euStorage = Constants.ENGINE_TIN_MAX_EU_STORED; } } @@ -56,8 +56,8 @@ public class EngineTin extends Engine implements ISocketable, IInventory { private BasicSink ic2EnergySink; - public EngineTin() { - super(Defaults.ENGINE_TIN_HEAT_MAX, 100000); + public TileEngineElectric() { + super(Constants.ENGINE_ELECTRIC_HEAT_MAX, 100000); setHints(Config.hints.get("engine.tin")); setInternalInventory(new EngineTinInventoryAdapter(this)); @@ -69,7 +69,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { @Override public void openGui(EntityPlayer player) { - player.openGui(ForestryAPI.instance, GuiId.EngineTinGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); + player.openGui(ForestryAPI.instance, GuiId.EngineElectricGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); } // / SAVING / LOADING @@ -309,8 +309,8 @@ public class EngineTin extends Engine implements ISocketable, IInventory { } } - private static class EngineTinInventoryAdapter extends TileInventoryAdapter { - public EngineTinInventoryAdapter(EngineTin engineTin) { + private static class EngineTinInventoryAdapter extends TileInventoryAdapter { + public EngineTinInventoryAdapter(TileEngineElectric engineTin) { super(engineTin, 1, "electrical"); } diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/energy/gadgets/EngineCopper.java rename to src/main/java/forestry/energy/tiles/TileEnginePeat.java index e0ffaa7a1..39e8511f3 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.energy.gadgets; +package forestry.energy.tiles; import java.util.Collection; import java.util.LinkedList; @@ -30,24 +30,24 @@ import cpw.mods.fml.common.registry.GameData; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; -import forestry.core.EnumErrorCode; -import forestry.core.TemperatureState; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; -import forestry.core.gadgets.Engine; +import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.AdjacentInventoryCache; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.GuiId; -import forestry.core.utils.Utils; +import forestry.core.tiles.TemperatureState; +import forestry.core.tiles.TileEngine; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.SlotUtil; import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; -public class EngineCopper extends Engine implements ISidedInventory { +public class TileEnginePeat extends TileEngine implements ISidedInventory { /* CONSTANTS */ public static final short SLOT_FUEL = 0; @@ -63,17 +63,17 @@ public class EngineCopper extends Engine implements ISidedInventory { private final int ashForItem; private final AdjacentInventoryCache inventoryCache = new AdjacentInventoryCache(this, getTileCache()); - public EngineCopper() { - super(Defaults.ENGINE_COPPER_HEAT_MAX, 200000); + public TileEnginePeat() { + super(Constants.ENGINE_COPPER_HEAT_MAX, 200000); setHints(Config.hints.get("engine.copper")); - ashForItem = Defaults.ENGINE_COPPER_ASH_FOR_ITEM; + ashForItem = Constants.ENGINE_COPPER_ASH_FOR_ITEM; setInternalInventory(new EngineCopperInventoryAdapter(this)); } @Override public void openGui(EntityPlayer player) { - player.openGui(ForestryAPI.instance, GuiId.EngineCopperGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); + player.openGui(ForestryAPI.instance, GuiId.EnginePeatGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); } private int getFuelSlot() { @@ -248,8 +248,8 @@ public class EngineCopper extends Engine implements ISidedInventory { return; } - if (!InvTools.moveOneItemToPipe(wasteInventory, getTileCache())) { - InvTools.moveItemStack(wasteInventory, inventoryCache.getAdjacentInventories()); + if (!InventoryUtil.moveOneItemToPipe(wasteInventory, getTileCache())) { + InventoryUtil.moveItemStack(wasteInventory, inventoryCache.getAdjacentInventories()); } } @@ -354,8 +354,8 @@ public class EngineCopper extends Engine implements ISidedInventory { return res; } - private static class EngineCopperInventoryAdapter extends TileInventoryAdapter { - public EngineCopperInventoryAdapter(EngineCopper engineCopper) { + private static class EngineCopperInventoryAdapter extends TileInventoryAdapter { + public EngineCopperInventoryAdapter(TileEnginePeat engineCopper) { super(engineCopper, 5, "Items"); } @@ -366,7 +366,7 @@ public class EngineCopper extends Engine implements ISidedInventory { @Override public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - return Utils.isIndexInRange(slotIndex, SLOT_WASTE_1, SLOT_WASTE_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_WASTE_1, SLOT_WASTE_COUNT); } } } diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/tiles/TileGenerator.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/forestry/energy/gadgets/MachineGenerator.java rename to src/main/java/forestry/energy/tiles/TileGenerator.java index 2687fd544..b49993c3b --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileGenerator.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.energy.gadgets; +package forestry.energy.tiles; import java.io.IOException; @@ -28,27 +28,26 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.gadgets.TileBase; -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.interfaces.IRenderableMachine; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.IRenderableTile; +import forestry.core.tiles.TileBase; import forestry.plugins.PluginIC2; import ic2.api.energy.prefab.BasicSource; -public class MachineGenerator extends TileBase implements ISidedInventory, ILiquidTankContainer, IRenderableMachine { +public class TileGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile { // / CONSTANTS private static final int maxEnergy = 30000; @@ -62,12 +61,12 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu private BasicSource ic2EnergySource; - public MachineGenerator() { + public TileGenerator() { setHints(Config.hints.get("generator")); setInternalInventory(new GeneratorInventoryAdapter(this)); - resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FuelManager.generatorFuel.keySet()); + resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FuelManager.generatorFuel.keySet()); tankManager = new TankManager(resourceTank); if (PluginIC2.instance.isAvailable()) { @@ -177,7 +176,7 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu } public int getResourceScaled(int i) { - return (resourceTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (resourceTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } public int getStoredScaled(int i) { @@ -190,7 +189,7 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu @Override public EnumTankLevel getPrimaryLevel() { - return Utils.rateTankLevel(getResourceScaled(100)); + return EnumTankLevel.rateTankLevel(getResourceScaled(100)); } @Override @@ -217,7 +216,7 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu } } - /* ILiquidTankContainer */ + /* ILiquidTankTile */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); @@ -253,8 +252,8 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu return tankManager.getTankInfo(from); } - private static class GeneratorInventoryAdapter extends TileInventoryAdapter { - public GeneratorInventoryAdapter(MachineGenerator generator) { + private static class GeneratorInventoryAdapter extends TileInventoryAdapter { + public GeneratorInventoryAdapter(TileGenerator generator) { super(generator, 1, "Items"); } diff --git a/src/main/java/forestry/factory/GuiHandlerFactory.java b/src/main/java/forestry/factory/GuiHandlerFactory.java index a3b74cca2..6671b272b 100755 --- a/src/main/java/forestry/factory/GuiHandlerFactory.java +++ b/src/main/java/forestry/factory/GuiHandlerFactory.java @@ -15,16 +15,6 @@ import net.minecraft.world.World; import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; -import forestry.factory.gadgets.MachineBottler; -import forestry.factory.gadgets.MachineCarpenter; -import forestry.factory.gadgets.MachineCentrifuge; -import forestry.factory.gadgets.MachineFabricator; -import forestry.factory.gadgets.MachineFermenter; -import forestry.factory.gadgets.MachineMoistener; -import forestry.factory.gadgets.MachineRaintank; -import forestry.factory.gadgets.MachineSqueezer; -import forestry.factory.gadgets.MachineStill; -import forestry.factory.gadgets.TileWorktable; import forestry.factory.gui.ContainerBottler; import forestry.factory.gui.ContainerCarpenter; import forestry.factory.gui.ContainerCentrifuge; @@ -45,6 +35,16 @@ import forestry.factory.gui.GuiRaintank; import forestry.factory.gui.GuiSqueezer; import forestry.factory.gui.GuiStill; import forestry.factory.gui.GuiWorktable; +import forestry.factory.tiles.TileBottler; +import forestry.factory.tiles.TileCarpenter; +import forestry.factory.tiles.TileCentrifuge; +import forestry.factory.tiles.TileFabricator; +import forestry.factory.tiles.TileFermenter; +import forestry.factory.tiles.TileMoistener; +import forestry.factory.tiles.TileRaintank; +import forestry.factory.tiles.TileSqueezer; +import forestry.factory.tiles.TileStill; +import forestry.factory.tiles.TileWorktable; public class GuiHandlerFactory extends GuiHandlerBase { @@ -58,31 +58,31 @@ public class GuiHandlerFactory extends GuiHandlerBase { switch (GuiId.values()[id]) { case BottlerGUI: - return new GuiBottler(player.inventory, getTile(world, x, y, z, player, MachineBottler.class)); + return new GuiBottler(player.inventory, getTile(world, x, y, z, player, TileBottler.class)); case CarpenterGUI: - return new GuiCarpenter(player.inventory, getTile(world, x, y, z, player, MachineCarpenter.class)); + return new GuiCarpenter(player.inventory, getTile(world, x, y, z, player, TileCarpenter.class)); case CentrifugeGUI: - return new GuiCentrifuge(player.inventory, getTile(world, x, y, z, player, MachineCentrifuge.class)); + return new GuiCentrifuge(player.inventory, getTile(world, x, y, z, player, TileCentrifuge.class)); case FabricatorGUI: - return new GuiFabricator(player.inventory, getTile(world, x, y, z, player, MachineFabricator.class)); + return new GuiFabricator(player.inventory, getTile(world, x, y, z, player, TileFabricator.class)); case FermenterGUI: - return new GuiFermenter(player.inventory, getTile(world, x, y, z, player, MachineFermenter.class)); + return new GuiFermenter(player.inventory, getTile(world, x, y, z, player, TileFermenter.class)); case MoistenerGUI: - return new GuiMoistener(player.inventory, getTile(world, x, y, z, player, MachineMoistener.class)); + return new GuiMoistener(player.inventory, getTile(world, x, y, z, player, TileMoistener.class)); case RaintankGUI: - return new GuiRaintank(player.inventory, getTile(world, x, y, z, player, MachineRaintank.class)); + return new GuiRaintank(player.inventory, getTile(world, x, y, z, player, TileRaintank.class)); case SqueezerGUI: - return new GuiSqueezer(player.inventory, getTile(world, x, y, z, player, MachineSqueezer.class)); + return new GuiSqueezer(player.inventory, getTile(world, x, y, z, player, TileSqueezer.class)); case StillGUI: - return new GuiStill(player.inventory, getTile(world, x, y, z, player, MachineStill.class)); + return new GuiStill(player.inventory, getTile(world, x, y, z, player, TileStill.class)); case WorktableGUI: return new GuiWorktable(player, getTile(world, x, y, z, player, TileWorktable.class)); @@ -103,31 +103,31 @@ public class GuiHandlerFactory extends GuiHandlerBase { switch (GuiId.values()[id]) { case BottlerGUI: - return new ContainerBottler(player.inventory, getTile(world, x, y, z, player, MachineBottler.class)); + return new ContainerBottler(player.inventory, getTile(world, x, y, z, player, TileBottler.class)); case CarpenterGUI: - return new ContainerCarpenter(player.inventory, getTile(world, x, y, z, player, MachineCarpenter.class)); + return new ContainerCarpenter(player.inventory, getTile(world, x, y, z, player, TileCarpenter.class)); case CentrifugeGUI: - return new ContainerCentrifuge(player.inventory, getTile(world, x, y, z, player, MachineCentrifuge.class)); + return new ContainerCentrifuge(player.inventory, getTile(world, x, y, z, player, TileCentrifuge.class)); case FabricatorGUI: - return new ContainerFabricator(player.inventory, getTile(world, x, y, z, player, MachineFabricator.class)); + return new ContainerFabricator(player.inventory, getTile(world, x, y, z, player, TileFabricator.class)); case FermenterGUI: - return new ContainerFermenter(player.inventory, getTile(world, x, y, z, player, MachineFermenter.class)); + return new ContainerFermenter(player.inventory, getTile(world, x, y, z, player, TileFermenter.class)); case MoistenerGUI: - return new ContainerMoistener(player.inventory, getTile(world, x, y, z, player, MachineMoistener.class)); + return new ContainerMoistener(player.inventory, getTile(world, x, y, z, player, TileMoistener.class)); case RaintankGUI: - return new ContainerRaintank(player.inventory, getTile(world, x, y, z, player, MachineRaintank.class)); + return new ContainerRaintank(player.inventory, getTile(world, x, y, z, player, TileRaintank.class)); case SqueezerGUI: - return new ContainerSqueezer(player.inventory, getTile(world, x, y, z, player, MachineSqueezer.class)); + return new ContainerSqueezer(player.inventory, getTile(world, x, y, z, player, TileSqueezer.class)); case StillGUI: - return new ContainerStill(player.inventory, getTile(world, x, y, z, player, MachineStill.class)); + return new ContainerStill(player.inventory, getTile(world, x, y, z, player, TileStill.class)); case WorktableGUI: return new ContainerWorktable(player, getTile(world, x, y, z, player, TileWorktable.class)); diff --git a/src/main/java/forestry/factory/gui/ContainerBottler.java b/src/main/java/forestry/factory/gui/ContainerBottler.java index b338da52e..bb4848b62 100755 --- a/src/main/java/forestry/factory/gui/ContainerBottler.java +++ b/src/main/java/forestry/factory/gui/ContainerBottler.java @@ -15,15 +15,15 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.factory.gadgets.MachineBottler; +import forestry.factory.tiles.TileBottler; -public class ContainerBottler extends ContainerLiquidTanks { +public class ContainerBottler extends ContainerLiquidTanks { - public ContainerBottler(InventoryPlayer player, MachineBottler tile) { + public ContainerBottler(InventoryPlayer player, TileBottler tile) { super(tile, player, 8, 84); - this.addSlotToContainer(new SlotFiltered(tile, MachineBottler.SLOT_INPUT_EMPTY_CAN, 116, 19)); - this.addSlotToContainer(new SlotOutput(tile, MachineBottler.SLOT_OUTPUT, 116, 55)); - this.addSlotToContainer(new SlotFiltered(tile, MachineBottler.SLOT_INPUT_FULL_CAN, 26, 38)); + this.addSlotToContainer(new SlotFiltered(tile, TileBottler.SLOT_INPUT_EMPTY_CAN, 116, 19)); + this.addSlotToContainer(new SlotOutput(tile, TileBottler.SLOT_OUTPUT, 116, 55)); + this.addSlotToContainer(new SlotFiltered(tile, TileBottler.SLOT_INPUT_FULL_CAN, 26, 38)); } } diff --git a/src/main/java/forestry/factory/gui/ContainerCarpenter.java b/src/main/java/forestry/factory/gui/ContainerCarpenter.java index 7d937e275..e736cf4a3 100755 --- a/src/main/java/forestry/factory/gui/ContainerCarpenter.java +++ b/src/main/java/forestry/factory/gui/ContainerCarpenter.java @@ -16,32 +16,32 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.IContainerCrafting; import forestry.core.gui.slots.SlotCraftMatrix; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotLocked; import forestry.core.gui.slots.SlotOutput; -import forestry.core.interfaces.IContainerCrafting; import forestry.core.network.PacketItemStackDisplay; -import forestry.factory.gadgets.MachineCarpenter; +import forestry.factory.tiles.TileCarpenter; -public class ContainerCarpenter extends ContainerLiquidTanks implements IContainerCrafting { +public class ContainerCarpenter extends ContainerLiquidTanks implements IContainerCrafting { - public ContainerCarpenter(InventoryPlayer inventoryplayer, MachineCarpenter tile) { + public ContainerCarpenter(InventoryPlayer inventoryplayer, TileCarpenter tile) { super(tile, inventoryplayer, 8, 136); // Internal inventory for (int i = 0; i < 2; i++) { for (int k = 0; k < 9; k++) { - addSlotToContainer(new Slot(tile, MachineCarpenter.SLOT_INVENTORY_1 + k + i * 9, 8 + k * 18, 90 + i * 18)); + addSlotToContainer(new Slot(tile, TileCarpenter.SLOT_INVENTORY_1 + k + i * 9, 8 + k * 18, 90 + i * 18)); } } // Liquid Input - this.addSlotToContainer(new SlotFiltered(tile, MachineCarpenter.SLOT_CAN_INPUT, 120, 20)); + this.addSlotToContainer(new SlotFiltered(tile, TileCarpenter.SLOT_CAN_INPUT, 120, 20)); // Boxes - this.addSlotToContainer(new SlotFiltered(tile, MachineCarpenter.SLOT_BOX, 83, 20)); + this.addSlotToContainer(new SlotFiltered(tile, TileCarpenter.SLOT_BOX, 83, 20)); // Product - this.addSlotToContainer(new SlotOutput(tile, MachineCarpenter.SLOT_PRODUCT, 120, 56)); + this.addSlotToContainer(new SlotOutput(tile, TileCarpenter.SLOT_PRODUCT, 120, 56)); // Craft Preview display addSlotToContainer(new SlotLocked(tile.getCraftPreviewInventory(), 0, 80, 51)); diff --git a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java index 3a4a4e5bf..15a87b588 100755 --- a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java +++ b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java @@ -15,11 +15,11 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerSocketed; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.factory.gadgets.MachineCentrifuge; +import forestry.factory.tiles.TileCentrifuge; -public class ContainerCentrifuge extends ContainerSocketed { +public class ContainerCentrifuge extends ContainerSocketed { - public ContainerCentrifuge(InventoryPlayer player, MachineCentrifuge tile) { + public ContainerCentrifuge(InventoryPlayer player, TileCentrifuge tile) { super(tile, player, 8, 84); // Resource diff --git a/src/main/java/forestry/factory/gui/ContainerFabricator.java b/src/main/java/forestry/factory/gui/ContainerFabricator.java index dbdf9bbbe..e2a6527c2 100755 --- a/src/main/java/forestry/factory/gui/ContainerFabricator.java +++ b/src/main/java/forestry/factory/gui/ContainerFabricator.java @@ -15,37 +15,37 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.IContainerCrafting; import forestry.core.gui.slots.SlotCraftMatrix; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.core.interfaces.IContainerCrafting; -import forestry.factory.gadgets.MachineFabricator; +import forestry.factory.tiles.TileFabricator; -public class ContainerFabricator extends ContainerLiquidTanks implements IContainerCrafting { +public class ContainerFabricator extends ContainerLiquidTanks implements IContainerCrafting { - public ContainerFabricator(InventoryPlayer playerInventory, MachineFabricator tile) { + public ContainerFabricator(InventoryPlayer playerInventory, TileFabricator tile) { super(tile, playerInventory, 8, 129); // Internal inventory for (int i = 0; i < 2; i++) { for (int k = 0; k < 9; k++) { - addSlotToContainer(new Slot(tile, MachineFabricator.SLOT_INVENTORY_1 + k + i * 9, 8 + k * 18, 84 + i * 18)); + addSlotToContainer(new Slot(tile, TileFabricator.SLOT_INVENTORY_1 + k + i * 9, 8 + k * 18, 84 + i * 18)); } } // Molten resource - this.addSlotToContainer(new SlotFiltered(tile, MachineFabricator.SLOT_METAL, 26, 21)); + this.addSlotToContainer(new SlotFiltered(tile, TileFabricator.SLOT_METAL, 26, 21)); // Plan - this.addSlotToContainer(new SlotFiltered(tile, MachineFabricator.SLOT_PLAN, 139, 17)); + this.addSlotToContainer(new SlotFiltered(tile, TileFabricator.SLOT_PLAN, 139, 17)); // Result - this.addSlotToContainer(new SlotOutput(tile, MachineFabricator.SLOT_RESULT, 139, 53)); + this.addSlotToContainer(new SlotOutput(tile, TileFabricator.SLOT_RESULT, 139, 53)); // Crafting matrix for (int l = 0; l < 3; l++) { for (int k = 0; k < 3; k++) { - addSlotToContainer(new SlotCraftMatrix(this, tile.getCraftingInventory(), MachineFabricator.SLOT_CRAFTING_1 + k + l * 3, 67 + k * 18, 17 + l * 18)); + addSlotToContainer(new SlotCraftMatrix(this, tile.getCraftingInventory(), TileFabricator.SLOT_CRAFTING_1 + k + l * 3, 67 + k * 18, 17 + l * 18)); } } } diff --git a/src/main/java/forestry/factory/gui/ContainerFermenter.java b/src/main/java/forestry/factory/gui/ContainerFermenter.java index 8387e6e61..c17c48160 100755 --- a/src/main/java/forestry/factory/gui/ContainerFermenter.java +++ b/src/main/java/forestry/factory/gui/ContainerFermenter.java @@ -15,17 +15,17 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.factory.gadgets.MachineFermenter; +import forestry.factory.tiles.TileFermenter; -public class ContainerFermenter extends ContainerLiquidTanks { +public class ContainerFermenter extends ContainerLiquidTanks { - public ContainerFermenter(InventoryPlayer player, MachineFermenter fermenter) { + public ContainerFermenter(InventoryPlayer player, TileFermenter fermenter) { super(fermenter, player, 8, 84); - this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_RESOURCE, 85, 23)); - this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_FUEL, 75, 57)); - this.addSlotToContainer(new SlotOutput(fermenter, MachineFermenter.SLOT_CAN_OUTPUT, 150, 58)); - this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_CAN_INPUT, 150, 22)); - this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_INPUT, 10, 40)); + this.addSlotToContainer(new SlotFiltered(fermenter, TileFermenter.SLOT_RESOURCE, 85, 23)); + this.addSlotToContainer(new SlotFiltered(fermenter, TileFermenter.SLOT_FUEL, 75, 57)); + this.addSlotToContainer(new SlotOutput(fermenter, TileFermenter.SLOT_CAN_OUTPUT, 150, 58)); + this.addSlotToContainer(new SlotFiltered(fermenter, TileFermenter.SLOT_CAN_INPUT, 150, 22)); + this.addSlotToContainer(new SlotFiltered(fermenter, TileFermenter.SLOT_INPUT, 10, 40)); } } diff --git a/src/main/java/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java index eeabd732a..6d1bf8235 100755 --- a/src/main/java/forestry/factory/gui/ContainerMoistener.java +++ b/src/main/java/forestry/factory/gui/ContainerMoistener.java @@ -14,15 +14,15 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.IContainerCrafting; import forestry.core.gui.slots.SlotCraftAuto; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotWorking; -import forestry.core.interfaces.IContainerCrafting; -import forestry.factory.gadgets.MachineMoistener; +import forestry.factory.tiles.TileMoistener; -public class ContainerMoistener extends ContainerLiquidTanks implements IContainerCrafting { +public class ContainerMoistener extends ContainerLiquidTanks implements IContainerCrafting { - public ContainerMoistener(InventoryPlayer player, MachineMoistener tile) { + public ContainerMoistener(InventoryPlayer player, TileMoistener tile) { super(tile, player, 8, 84); // Stash diff --git a/src/main/java/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java index a13bb873e..ef74f4641 100755 --- a/src/main/java/forestry/factory/gui/ContainerRaintank.java +++ b/src/main/java/forestry/factory/gui/ContainerRaintank.java @@ -15,14 +15,14 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.factory.gadgets.MachineRaintank; +import forestry.factory.tiles.TileRaintank; -public class ContainerRaintank extends ContainerLiquidTanks { +public class ContainerRaintank extends ContainerLiquidTanks { - public ContainerRaintank(InventoryPlayer player, MachineRaintank tile) { + public ContainerRaintank(InventoryPlayer player, TileRaintank tile) { super(tile, player, 8, 84); - this.addSlotToContainer(new SlotFiltered(tile, MachineRaintank.SLOT_RESOURCE, 116, 19)); - this.addSlotToContainer(new SlotOutput(tile, MachineRaintank.SLOT_PRODUCT, 116, 55)); + this.addSlotToContainer(new SlotFiltered(tile, TileRaintank.SLOT_RESOURCE, 116, 19)); + this.addSlotToContainer(new SlotOutput(tile, TileRaintank.SLOT_PRODUCT, 116, 55)); } } diff --git a/src/main/java/forestry/factory/gui/ContainerSqueezer.java b/src/main/java/forestry/factory/gui/ContainerSqueezer.java index 4f0248099..dbf39fae4 100755 --- a/src/main/java/forestry/factory/gui/ContainerSqueezer.java +++ b/src/main/java/forestry/factory/gui/ContainerSqueezer.java @@ -15,11 +15,11 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerLiquidTanksSocketed; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.factory.gadgets.MachineSqueezer; +import forestry.factory.tiles.TileSqueezer; -public class ContainerSqueezer extends ContainerLiquidTanksSocketed { +public class ContainerSqueezer extends ContainerLiquidTanksSocketed { - public ContainerSqueezer(InventoryPlayer player, MachineSqueezer tile) { + public ContainerSqueezer(InventoryPlayer player, TileSqueezer tile) { super(tile, player, 8, 84); // Resource inventory @@ -30,11 +30,11 @@ public class ContainerSqueezer extends ContainerLiquidTanksSocketed { +public class ContainerStill extends ContainerLiquidTanks { - public ContainerStill(InventoryPlayer player, MachineStill tile) { + public ContainerStill(InventoryPlayer player, TileStill tile) { super(tile, player, 8, 84); - this.addSlotToContainer(new SlotOutput(tile, MachineStill.SLOT_PRODUCT, 150, 54)); - this.addSlotToContainer(new SlotFiltered(tile, MachineStill.SLOT_RESOURCE, 150, 18)); - this.addSlotToContainer(new SlotFiltered(tile, MachineStill.SLOT_CAN, 10, 36)); + this.addSlotToContainer(new SlotOutput(tile, TileStill.SLOT_PRODUCT, 150, 54)); + this.addSlotToContainer(new SlotFiltered(tile, TileStill.SLOT_RESOURCE, 150, 18)); + this.addSlotToContainer(new SlotFiltered(tile, TileStill.SLOT_CAN, 10, 36)); } } diff --git a/src/main/java/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java index 15b67b810..56b8f839a 100755 --- a/src/main/java/forestry/factory/gui/ContainerWorktable.java +++ b/src/main/java/forestry/factory/gui/ContainerWorktable.java @@ -17,17 +17,17 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import forestry.core.gui.ContainerTile; +import forestry.core.gui.IContainerCrafting; import forestry.core.gui.IGuiSelectable; import forestry.core.gui.slots.SlotCraftMatrix; import forestry.core.gui.slots.SlotCrafter; -import forestry.core.interfaces.IContainerCrafting; import forestry.core.network.PacketGuiSelect; import forestry.core.network.PacketId; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; -import forestry.factory.gadgets.TileWorktable; +import forestry.core.utils.ItemStackUtil; import forestry.factory.network.PacketWorktableMemoryUpdate; import forestry.factory.recipes.RecipeMemory; +import forestry.factory.tiles.TileWorktable; public class ContainerWorktable extends ContainerTile implements IContainerCrafting, IGuiSelectable { @@ -84,7 +84,7 @@ public class ContainerWorktable extends ContainerTile implements ItemStack stack = iinventory.getStackInSlot(slot); ItemStack currentStack = craftMatrix.getStackInSlot(slot); - if (!StackUtils.isIdenticalItem(stack, currentStack)) { + if (!ItemStackUtil.isIdenticalItem(stack, currentStack)) { craftMatrix.setInventorySlotContents(slot, stack); updateRecipe(); } diff --git a/src/main/java/forestry/factory/gui/GuiBottler.java b/src/main/java/forestry/factory/gui/GuiBottler.java index 25a1b8c64..25850bab4 100755 --- a/src/main/java/forestry/factory/gui/GuiBottler.java +++ b/src/main/java/forestry/factory/gui/GuiBottler.java @@ -12,22 +12,22 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.factory.gadgets.MachineBottler; +import forestry.factory.tiles.TileBottler; -public class GuiBottler extends GuiForestryTitled { +public class GuiBottler extends GuiForestryTitled { - public GuiBottler(InventoryPlayer inventory, MachineBottler processor) { - super(Defaults.TEXTURE_PATH_GUI + "/bottler.png", new ContainerBottler(inventory, processor), processor); + public GuiBottler(InventoryPlayer inventory, TileBottler processor) { + super(Constants.TEXTURE_PATH_GUI + "/bottler.png", new ContainerBottler(inventory, processor), processor); widgetManager.add(new TankWidget(this.widgetManager, 53, 17, 0)); } @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - MachineBottler bottler = inventory; + TileBottler bottler = inventory; int i1 = bottler.getFillProgressScaled(24); drawTexturedModalRect(guiLeft + 80, guiTop + 39, 176, 74, i1, 16); diff --git a/src/main/java/forestry/factory/gui/GuiCarpenter.java b/src/main/java/forestry/factory/gui/GuiCarpenter.java index da9485657..99d7dcfde 100755 --- a/src/main/java/forestry/factory/gui/GuiCarpenter.java +++ b/src/main/java/forestry/factory/gui/GuiCarpenter.java @@ -12,15 +12,15 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.factory.gadgets.MachineCarpenter; +import forestry.factory.tiles.TileCarpenter; -public class GuiCarpenter extends GuiForestryTitled { +public class GuiCarpenter extends GuiForestryTitled { - public GuiCarpenter(InventoryPlayer inventory, MachineCarpenter tile) { - super(Defaults.TEXTURE_PATH_GUI + "/carpenter.png", new ContainerCarpenter(inventory, tile), tile); + public GuiCarpenter(InventoryPlayer inventory, TileCarpenter tile) { + super(Constants.TEXTURE_PATH_GUI + "/carpenter.png", new ContainerCarpenter(inventory, tile), tile); this.ySize = 218; widgetManager.add(new TankWidget(this.widgetManager, 150, 17, 0)); @@ -29,8 +29,7 @@ public class GuiCarpenter extends GuiForestryTitled { +public class GuiCentrifuge extends GuiForestryTitled { - public GuiCentrifuge(InventoryPlayer inventory, MachineCentrifuge tile) { - super(Defaults.TEXTURE_PATH_GUI + "/centrifugesocket.png", new ContainerCentrifuge(inventory, tile), tile); + public GuiCentrifuge(InventoryPlayer inventory, TileCentrifuge tile) { + super(Constants.TEXTURE_PATH_GUI + "/centrifugesocket.png", new ContainerCentrifuge(inventory, tile), tile); widgetManager.add(new SocketWidget(this.widgetManager, 71, 37, tile, 0)); } diff --git a/src/main/java/forestry/factory/gui/GuiFabricator.java b/src/main/java/forestry/factory/gui/GuiFabricator.java index 4d15c3715..d87b8b03e 100755 --- a/src/main/java/forestry/factory/gui/GuiFabricator.java +++ b/src/main/java/forestry/factory/gui/GuiFabricator.java @@ -12,15 +12,15 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.ReservoirWidget; -import forestry.factory.gadgets.MachineFabricator; +import forestry.factory.tiles.TileFabricator; -public class GuiFabricator extends GuiForestryTitled { +public class GuiFabricator extends GuiForestryTitled { - public GuiFabricator(InventoryPlayer player, MachineFabricator tile) { - super(Defaults.TEXTURE_PATH_GUI + "/fabricator.png", new ContainerFabricator(player, tile), tile); + public GuiFabricator(InventoryPlayer player, TileFabricator tile) { + super(Constants.TEXTURE_PATH_GUI + "/fabricator.png", new ContainerFabricator(player, tile), tile); this.ySize = 211; widgetManager.add(new ReservoirWidget(this.widgetManager, 26, 48, 0)); } @@ -29,7 +29,7 @@ public class GuiFabricator extends GuiForestryTitled 0) { drawTexturedModalRect(guiLeft + 55, guiTop + 17 + 52 - heatScaled, 192, 52 - heatScaled, 4, heatScaled); diff --git a/src/main/java/forestry/factory/gui/GuiFermenter.java b/src/main/java/forestry/factory/gui/GuiFermenter.java index 841b9b1f5..8988d6ea3 100755 --- a/src/main/java/forestry/factory/gui/GuiFermenter.java +++ b/src/main/java/forestry/factory/gui/GuiFermenter.java @@ -12,15 +12,15 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.factory.gadgets.MachineFermenter; +import forestry.factory.tiles.TileFermenter; -public class GuiFermenter extends GuiForestryTitled { +public class GuiFermenter extends GuiForestryTitled { - public GuiFermenter(InventoryPlayer inventory, MachineFermenter tile) { - super(Defaults.TEXTURE_PATH_GUI + "/fermenter.png", new ContainerFermenter(inventory, tile), tile); + public GuiFermenter(InventoryPlayer inventory, TileFermenter tile) { + super(Constants.TEXTURE_PATH_GUI + "/fermenter.png", new ContainerFermenter(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 35, 19, 0)); widgetManager.add(new TankWidget(this.widgetManager, 125, 19, 1)); } @@ -28,16 +28,15 @@ public class GuiFermenter extends GuiForestryTitled 0) { drawTexturedModalRect(guiLeft + 98, guiTop + 46 + 17 - fuelRemain, 176, 78 + 17 - fuelRemain, 4, fuelRemain); } // Raw bio mush remaining - int bioRemain = machine.getFermentationProgressScaled(16); + int bioRemain = inventory.getFermentationProgressScaled(16); if (bioRemain > 0) { drawTexturedModalRect(guiLeft + 74, guiTop + 32 + 17 - bioRemain, 176, 60 + 17 - bioRemain, 4, bioRemain); } diff --git a/src/main/java/forestry/factory/gui/GuiMoistener.java b/src/main/java/forestry/factory/gui/GuiMoistener.java index adc77d7be..959e54ee5 100755 --- a/src/main/java/forestry/factory/gui/GuiMoistener.java +++ b/src/main/java/forestry/factory/gui/GuiMoistener.java @@ -12,32 +12,31 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.factory.gadgets.MachineMoistener; +import forestry.factory.tiles.TileMoistener; -public class GuiMoistener extends GuiForestryTitled { +public class GuiMoistener extends GuiForestryTitled { - public GuiMoistener(InventoryPlayer inventory, MachineMoistener tile) { - super(Defaults.TEXTURE_PATH_GUI + "/moistener.png", new ContainerMoistener(inventory, tile), tile); + public GuiMoistener(InventoryPlayer inventory, TileMoistener tile) { + super(Constants.TEXTURE_PATH_GUI + "/moistener.png", new ContainerMoistener(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 16, 16, 0)); } @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - MachineMoistener machine = inventory; // Mycelium production progress - if (machine.isProducing()) { - int i1 = machine.getProductionProgressScaled(16); + if (inventory.isProducing()) { + int i1 = inventory.getProductionProgressScaled(16); drawTexturedModalRect(guiLeft + 124, guiTop + 36, 176, 74, 16 - i1, 16); } // Resource consumption progress - if (machine.isWorking()) { - int i1 = machine.getConsumptionProgressScaled(54); + if (inventory.isWorking()) { + int i1 = inventory.getConsumptionProgressScaled(54); drawTexturedModalRect(guiLeft + 93, guiTop + 18 + i1, 176, 92 + i1, 29, 54 - i1); } } diff --git a/src/main/java/forestry/factory/gui/GuiRaintank.java b/src/main/java/forestry/factory/gui/GuiRaintank.java index 26bfa16a3..f2a09240b 100755 --- a/src/main/java/forestry/factory/gui/GuiRaintank.java +++ b/src/main/java/forestry/factory/gui/GuiRaintank.java @@ -12,27 +12,25 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.factory.gadgets.MachineRaintank; +import forestry.factory.tiles.TileRaintank; -public class GuiRaintank extends GuiForestryTitled { +public class GuiRaintank extends GuiForestryTitled { - public GuiRaintank(InventoryPlayer inventory, MachineRaintank tile) { - super(Defaults.TEXTURE_PATH_GUI + "/raintank.png", new ContainerRaintank(inventory, tile), tile); + public GuiRaintank(InventoryPlayer inventory, TileRaintank tile) { + super(Constants.TEXTURE_PATH_GUI + "/raintank.png", new ContainerRaintank(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 53, 17, 0)); } @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - MachineRaintank machine = inventory; - if (machine.isFilling()) { - int progress = machine.getFillProgressScaled(24); + if (inventory.isFilling()) { + int progress = inventory.getFillProgressScaled(24); drawTexturedModalRect(guiLeft + 80, guiTop + 39, 176, 74, 24 - progress, 16); } - } } diff --git a/src/main/java/forestry/factory/gui/GuiSqueezer.java b/src/main/java/forestry/factory/gui/GuiSqueezer.java index d3794d067..4bbe23eb4 100755 --- a/src/main/java/forestry/factory/gui/GuiSqueezer.java +++ b/src/main/java/forestry/factory/gui/GuiSqueezer.java @@ -12,16 +12,16 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.SocketWidget; import forestry.core.gui.widgets.TankWidget; -import forestry.factory.gadgets.MachineSqueezer; +import forestry.factory.tiles.TileSqueezer; -public class GuiSqueezer extends GuiForestryTitled { +public class GuiSqueezer extends GuiForestryTitled { - public GuiSqueezer(InventoryPlayer inventory, MachineSqueezer tile) { - super(Defaults.TEXTURE_PATH_GUI + "/squeezersocket.png", new ContainerSqueezer(inventory, tile), tile); + public GuiSqueezer(InventoryPlayer inventory, TileSqueezer tile) { + super(Constants.TEXTURE_PATH_GUI + "/squeezersocket.png", new ContainerSqueezer(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 122, 18, 0)); widgetManager.add(new SocketWidget(this.widgetManager, 75, 20, tile, 0)); } diff --git a/src/main/java/forestry/factory/gui/GuiStill.java b/src/main/java/forestry/factory/gui/GuiStill.java index df8bd7da3..01fae8169 100755 --- a/src/main/java/forestry/factory/gui/GuiStill.java +++ b/src/main/java/forestry/factory/gui/GuiStill.java @@ -12,15 +12,15 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.factory.gadgets.MachineStill; +import forestry.factory.tiles.TileStill; -public class GuiStill extends GuiForestryTitled { +public class GuiStill extends GuiForestryTitled { - public GuiStill(InventoryPlayer inventory, MachineStill tile) { - super(Defaults.TEXTURE_PATH_GUI + "/still.png", new ContainerStill(inventory, tile), tile); + public GuiStill(InventoryPlayer inventory, TileStill tile) { + super(Constants.TEXTURE_PATH_GUI + "/still.png", new ContainerStill(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 35, 15, 0)); widgetManager.add(new TankWidget(this.widgetManager, 125, 15, 1)); } @@ -28,7 +28,7 @@ public class GuiStill extends GuiForestryTitled { @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - MachineStill still = inventory; + TileStill still = inventory; drawTexturedModalRect(guiLeft + 81, guiTop + 57, 176, 60, 14, 14); diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index df3f10587..f3f1d965f 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -16,14 +16,14 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.render.TextureManager; -import forestry.factory.gadgets.TileWorktable; +import forestry.factory.tiles.TileWorktable; public class GuiWorktable extends GuiForestryTitled { @@ -95,7 +95,7 @@ public class GuiWorktable extends GuiForestryTitled> entries = new ArrayList>(recipe.getAllProducts().entrySet()); diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java index c577bac0e..aca876a1b 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java @@ -13,9 +13,9 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; import forestry.api.recipes.IFabricatorRecipe; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineFabricator; +import forestry.factory.tiles.TileFabricator; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; @@ -47,10 +47,10 @@ public class CraftGuideFabricator implements RecipeProvider { return; } - ItemStack machine = ForestryBlock.factoryPlain.getItemStack(1, Defaults.DEFINITION_FABRICATOR_META); + ItemStack machine = ForestryBlock.factoryPlain.getItemStack(1, Constants.DEFINITION_FABRICATOR_META); RecipeTemplate template = generator.createRecipeTemplate(slots, machine); - for (IFabricatorRecipe recipe : MachineFabricator.RecipeManager.recipes) { + for (IFabricatorRecipe recipe : TileFabricator.RecipeManager.recipes) { Object[] array = new Object[12]; Object[] recipeIngredients = recipe.getIngredients(); diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java index 4d846c034..66fce5761 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java @@ -18,9 +18,9 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import forestry.api.fuels.FuelManager; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineFermenter; +import forestry.factory.tiles.TileFermenter; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; @@ -49,11 +49,11 @@ public class CraftGuideFermenter implements RecipeProvider { return; } - ItemStack machine = ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_FERMENTER_META); + ItemStack machine = ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_FERMENTER_META); RecipeTemplate template = generator.createRecipeTemplate(slots, machine); List fuels = new ArrayList(FuelManager.fermenterFuel.keySet()); - for (MachineFermenter.Recipe recipe : MachineFermenter.RecipeManager.recipes) { + for (TileFermenter.Recipe recipe : TileFermenter.RecipeManager.recipes) { Object[] array = new Object[5]; array[0] = recipe.resource; diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java index 0a1356659..650d91715 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java @@ -12,10 +12,10 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineSqueezer; import forestry.factory.recipes.ISqueezerRecipe; +import forestry.factory.tiles.TileSqueezer; import uristqwerty.CraftGuide.api.ChanceSlot; import uristqwerty.CraftGuide.api.ItemSlot; @@ -48,10 +48,10 @@ public class CraftGuideSqueezer implements RecipeProvider { return; } - ItemStack machine = ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_SQUEEZER_META); + ItemStack machine = ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_SQUEEZER_META); RecipeTemplate template = generator.createRecipeTemplate(slots, machine); - for (ISqueezerRecipe recipe : MachineSqueezer.RecipeManager.recipes) { + for (ISqueezerRecipe recipe : TileSqueezer.RecipeManager.recipes) { Object[] array = new Object[12]; System.arraycopy(recipe.getResources(), 0, array, 0, recipe.getResources().length); diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java index 6f6e2de64..bbee28872 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java @@ -12,9 +12,9 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineStill; +import forestry.factory.tiles.TileStill; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; @@ -41,10 +41,10 @@ public class CraftGuideStill implements RecipeProvider { return; } - ItemStack machine = ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_STILL_META); + ItemStack machine = ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_STILL_META); RecipeTemplate template = generator.createRecipeTemplate(slots, machine); - for (MachineStill.Recipe recipe : MachineStill.RecipeManager.recipes) { + for (TileStill.Recipe recipe : TileStill.RecipeManager.recipes) { Object[] array = new Object[3]; array[0] = recipe.input; diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java index fffda6784..2a7bdd8f9 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java @@ -23,8 +23,11 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; -import forestry.factory.gadgets.MachineBottler; +import forestry.core.recipes.nei.NEIUtils; +import forestry.core.recipes.nei.PositionedFluidTank; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiBottler; +import forestry.factory.tiles.TileBottler; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; @@ -32,12 +35,12 @@ import codechicken.nei.PositionedStack; public class NEIHandlerBottler extends RecipeHandlerBase { - private static List recipes = new ArrayList(); + private static final List recipes = new ArrayList(); @Override public void prepare() { for (FluidContainerData container : FluidContainerRegistry.getRegisteredFluidContainerData()) { - MachineBottler.Recipe recipe = MachineBottler.RecipeManager.findMatchingRecipe(container.fluid, container.emptyContainer); + TileBottler.Recipe recipe = TileBottler.RecipeManager.findMatchingRecipe(container.fluid, container.emptyContainer); if (recipe != null) { recipes.add(recipe); } @@ -50,7 +53,7 @@ public class NEIHandlerBottler extends RecipeHandlerBase { public PositionedStack input; public PositionedStack output; - public CachedBottlerRecipe(MachineBottler.Recipe recipe) { + public CachedBottlerRecipe(TileBottler.Recipe recipe) { if (recipe.input != null) { this.fluid = new PositionedFluidTank(recipe.input, 10000, new Rectangle(48, 6, 16, 58), NEIHandlerBottler.this.getGuiTexture(), new Point(176, 0)); } @@ -117,14 +120,14 @@ public class NEIHandlerBottler extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (MachineBottler.Recipe recipe : recipes) { + for (TileBottler.Recipe recipe : recipes) { this.arecipes.add(new CachedBottlerRecipe(recipe)); } } @Override public void loadCraftingRecipes(ItemStack result) { - for (MachineBottler.Recipe recipe : recipes) { + for (TileBottler.Recipe recipe : recipes) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.bottled, result)) { this.arecipes.add(new CachedBottlerRecipe(recipe)); } @@ -134,7 +137,7 @@ public class NEIHandlerBottler extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingred) { super.loadUsageRecipes(ingred); - for (MachineBottler.Recipe recipe : recipes) { + for (TileBottler.Recipe recipe : recipes) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.can, ingred)) { this.arecipes.add(new CachedBottlerRecipe(recipe)); } @@ -143,7 +146,7 @@ public class NEIHandlerBottler extends RecipeHandlerBase { @Override public void loadUsageRecipes(FluidStack ingred) { - for (MachineBottler.Recipe recipe : recipes) { + for (TileBottler.Recipe recipe : recipes) { if (NEIUtils.areFluidsSameType(recipe.input, ingred)) { this.arecipes.add(new CachedBottlerRecipe(recipe)); } diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java index a2ab04d7f..b44d3207c 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java @@ -21,9 +21,12 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import forestry.core.interfaces.IDescriptiveRecipe; -import forestry.factory.gadgets.MachineCarpenter; +import forestry.core.recipes.IDescriptiveRecipe; +import forestry.core.recipes.nei.NEIUtils; +import forestry.core.recipes.nei.PositionedFluidTank; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiCarpenter; +import forestry.factory.tiles.TileCarpenter; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; @@ -46,7 +49,7 @@ public class NEIHandlerCarpenter extends RecipeHandlerBase { public PositionedFluidTank tank; public PositionedStack output; - public CachedCarpenterRecipe(MachineCarpenter.Recipe recipe, boolean genPerms) { + public CachedCarpenterRecipe(TileCarpenter.Recipe recipe, boolean genPerms) { IDescriptiveRecipe irecipe = (IDescriptiveRecipe) recipe.asIRecipe(); if (irecipe != null) { if (irecipe.getIngredients() != null) { @@ -68,7 +71,7 @@ public class NEIHandlerCarpenter extends RecipeHandlerBase { } } - public CachedCarpenterRecipe(MachineCarpenter.Recipe recipe) { + public CachedCarpenterRecipe(TileCarpenter.Recipe recipe) { this(recipe, false); } @@ -152,14 +155,14 @@ public class NEIHandlerCarpenter extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (MachineCarpenter.Recipe recipe : MachineCarpenter.RecipeManager.recipes) { + for (TileCarpenter.Recipe recipe : TileCarpenter.RecipeManager.recipes) { this.arecipes.add(new CachedCarpenterRecipe(recipe, true)); } } @Override public void loadCraftingRecipes(ItemStack result) { - for (MachineCarpenter.Recipe recipe : MachineCarpenter.RecipeManager.recipes) { + for (TileCarpenter.Recipe recipe : TileCarpenter.RecipeManager.recipes) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getCraftingResult(), result)) { this.arecipes.add(new CachedCarpenterRecipe(recipe, true)); } @@ -169,7 +172,7 @@ public class NEIHandlerCarpenter extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingred) { super.loadUsageRecipes(ingred); - for (MachineCarpenter.Recipe recipe : MachineCarpenter.RecipeManager.recipes) { + for (TileCarpenter.Recipe recipe : TileCarpenter.RecipeManager.recipes) { CachedCarpenterRecipe crecipe = new CachedCarpenterRecipe(recipe); if (crecipe.inputs != null && crecipe.contains(crecipe.inputs, ingred)) { crecipe.generatePermutations(); @@ -181,7 +184,7 @@ public class NEIHandlerCarpenter extends RecipeHandlerBase { @Override public void loadUsageRecipes(FluidStack ingredient) { - for (MachineCarpenter.Recipe recipe : MachineCarpenter.RecipeManager.recipes) { + for (TileCarpenter.Recipe recipe : TileCarpenter.RecipeManager.recipes) { if (NEIUtils.areFluidsSameType(recipe.getLiquid(), ingredient)) { this.arecipes.add(new CachedCarpenterRecipe(recipe, true)); } diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java index be61c031b..6ff391cc8 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java @@ -23,8 +23,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import forestry.api.recipes.ICentrifugeRecipe; -import forestry.factory.gadgets.MachineCentrifuge; +import forestry.core.recipes.nei.PositionedStackAdv; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiCentrifuge; +import forestry.factory.tiles.TileCentrifuge; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; @@ -129,14 +131,14 @@ public class NEIHandlerCentrifuge extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (ICentrifugeRecipe recipe : MachineCentrifuge.RecipeManager.recipes) { + for (ICentrifugeRecipe recipe : TileCentrifuge.RecipeManager.recipes) { this.arecipes.add(new CachedCentrifugeRecipe(recipe, true)); } } @Override public void loadCraftingRecipes(ItemStack result) { - for (ICentrifugeRecipe recipe : MachineCentrifuge.RecipeManager.recipes) { + for (ICentrifugeRecipe recipe : TileCentrifuge.RecipeManager.recipes) { CachedCentrifugeRecipe crecipe = new CachedCentrifugeRecipe(recipe); if (crecipe.outputs != null && crecipe.contains(crecipe.outputs, result)) { crecipe.setIngredientPermutation(crecipe.outputs, result); @@ -148,7 +150,7 @@ public class NEIHandlerCentrifuge extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingred) { super.loadCraftingRecipes(ingred); - for (ICentrifugeRecipe recipe : MachineCentrifuge.RecipeManager.recipes) { + for (ICentrifugeRecipe recipe : TileCentrifuge.RecipeManager.recipes) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getInput(), ingred)) { this.arecipes.add(new CachedCentrifugeRecipe(recipe, true)); } diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java index 90f33f285..9bedee045 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java @@ -28,8 +28,12 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.IFabricatorRecipe; -import forestry.factory.gadgets.MachineFabricator; +import forestry.core.recipes.nei.INBTMatchingCachedRecipe; +import forestry.core.recipes.nei.NEIUtils; +import forestry.core.recipes.nei.PositionedFluidTank; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiFabricator; +import forestry.factory.tiles.TileFabricator; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; @@ -51,7 +55,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { if (recipe.getLiquid() != null) { this.tank = new PositionedFluidTank(recipe.getLiquid(), 2000, new Rectangle(21, 37, 16, 16)); List smeltingInput = new ArrayList(); - for (MachineFabricator.Smelting s : getSmeltingInputs().get(recipe.getLiquid().getFluid())) { + for (TileFabricator.Smelting s : getSmeltingInputs().get(recipe.getLiquid().getFluid())) { smeltingInput.add(s.getResource()); } if (!smeltingInput.isEmpty()) { @@ -194,14 +198,14 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (IFabricatorRecipe recipe : MachineFabricator.RecipeManager.recipes) { + for (IFabricatorRecipe recipe : TileFabricator.RecipeManager.recipes) { this.arecipes.add(new CachedFabricatorRecipe(recipe, true)); } } @Override public void loadCraftingRecipes(ItemStack result) { - for (IFabricatorRecipe recipe : MachineFabricator.RecipeManager.recipes) { + for (IFabricatorRecipe recipe : TileFabricator.RecipeManager.recipes) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getRecipeOutput(), result)) { CachedFabricatorRecipe crecipe = new CachedFabricatorRecipe(recipe, true); NEIUtils.setResultPermutationNBT(crecipe, result); @@ -213,7 +217,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingred) { super.loadUsageRecipes(ingred); - for (IFabricatorRecipe recipe : MachineFabricator.RecipeManager.recipes) { + for (IFabricatorRecipe recipe : TileFabricator.RecipeManager.recipes) { CachedFabricatorRecipe crecipe = new CachedFabricatorRecipe(recipe); if (crecipe.inputs != null && crecipe.contains(crecipe.inputs, ingred) || crecipe.smeltingInput != null && crecipe.contains(crecipe.smeltingInput, ingred)) { crecipe.generatePermutations(); @@ -226,7 +230,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { @Override public void loadUsageRecipes(FluidStack ingredient) { - for (IFabricatorRecipe recipe : MachineFabricator.RecipeManager.recipes) { + for (IFabricatorRecipe recipe : TileFabricator.RecipeManager.recipes) { if (NEIUtils.areFluidsSameType(recipe.getLiquid(), ingredient)) { this.arecipes.add(new CachedFabricatorRecipe(recipe, true)); } @@ -238,7 +242,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { super.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse); if (new Rectangle(20, 9, 18, 18).contains(relMouse)) { - for (MachineFabricator.Smelting smelting : MachineFabricator.RecipeManager.smeltings) { + for (TileFabricator.Smelting smelting : TileFabricator.RecipeManager.smeltings) { if (NEIServerUtils.areStacksSameTypeCrafting(smelting.getResource(), itemStack) && smelting.getProduct() != null) { currenttip.add(EnumChatFormatting.GRAY.toString() + NEIUtils.translate("handler.forestry.fabricator.worth") + " " + smelting.getProduct().amount + " mB"); } @@ -248,12 +252,12 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { return currenttip; } - private static Map> getSmeltingInputs() { - Map> smeltingInputs = new HashMap>(); - for (MachineFabricator.Smelting smelting : MachineFabricator.RecipeManager.smeltings) { + private static Map> getSmeltingInputs() { + Map> smeltingInputs = new HashMap>(); + for (TileFabricator.Smelting smelting : TileFabricator.RecipeManager.smeltings) { Fluid fluid = smelting.getProduct().getFluid(); if (!smeltingInputs.containsKey(fluid)) { - smeltingInputs.put(fluid, new ArrayList()); + smeltingInputs.put(fluid, new ArrayList()); } smeltingInputs.get(fluid).add(smelting); } diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java index 26037e397..e62edd4dc 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java @@ -25,8 +25,12 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.fuels.FermenterFuel; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IVariableFermentable; -import forestry.factory.gadgets.MachineFermenter; +import forestry.core.recipes.nei.INBTMatchingCachedRecipe; +import forestry.core.recipes.nei.NEIUtils; +import forestry.core.recipes.nei.PositionedFluidTank; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiFermenter; +import forestry.factory.tiles.TileFermenter; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; @@ -49,7 +53,7 @@ public class NEIHandlerFermenter extends RecipeHandlerBase { public PositionedStack resource; public List inputItems = new ArrayList(); - public CachedFermenterRecipe(MachineFermenter.Recipe recipe, ItemStack fermentable, boolean genPerms) { + public CachedFermenterRecipe(TileFermenter.Recipe recipe, ItemStack fermentable, boolean genPerms) { if (recipe.liquid != null) { FluidStack input = recipe.liquid.copy(); input.amount = recipe.fermentationValue; @@ -142,7 +146,7 @@ public class NEIHandlerFermenter extends RecipeHandlerBase { this.drawProgressBar(93, 31, 176, 78, 4, 18, 80, 11); } - private List getCachedRecipes(MachineFermenter.Recipe recipe, boolean generatePermutations) { + private List getCachedRecipes(TileFermenter.Recipe recipe, boolean generatePermutations) { if (recipe.resource != null && recipe.resource.getItem() instanceof IVariableFermentable) { List crecipes = new ArrayList(); for (ItemStack stack : NEIUtils.getItemVariations(recipe.resource)) { @@ -155,14 +159,14 @@ public class NEIHandlerFermenter extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (MachineFermenter.Recipe recipe : MachineFermenter.RecipeManager.recipes) { + for (TileFermenter.Recipe recipe : TileFermenter.RecipeManager.recipes) { this.arecipes.addAll(this.getCachedRecipes(recipe, true)); } } @Override public void loadCraftingRecipes(FluidStack result) { - for (MachineFermenter.Recipe recipe : MachineFermenter.RecipeManager.recipes) { + for (TileFermenter.Recipe recipe : TileFermenter.RecipeManager.recipes) { if (NEIUtils.areFluidsSameType(recipe.output, result)) { this.arecipes.addAll(this.getCachedRecipes(recipe, true)); } @@ -172,7 +176,7 @@ public class NEIHandlerFermenter extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingred) { super.loadUsageRecipes(ingred); - for (MachineFermenter.Recipe recipe : MachineFermenter.RecipeManager.recipes) { + for (TileFermenter.Recipe recipe : TileFermenter.RecipeManager.recipes) { if (recipe.resource != null) { for (ItemStack stack : NEIUtils.getItemVariations(recipe.resource)) { if (stack.hasTagCompound() && NEIServerUtils.areStacksSameType(stack, ingred) || !stack.hasTagCompound() && NEIServerUtils.areStacksSameTypeCrafting(stack, ingred)) { @@ -195,7 +199,7 @@ public class NEIHandlerFermenter extends RecipeHandlerBase { @Override public void loadUsageRecipes(FluidStack ingred) { - for (MachineFermenter.Recipe recipe : MachineFermenter.RecipeManager.recipes) { + for (TileFermenter.Recipe recipe : TileFermenter.RecipeManager.recipes) { if (NEIUtils.areFluidsSameType(recipe.liquid, ingred)) { this.arecipes.addAll(this.getCachedRecipes(recipe, true)); } diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java index 6975d781d..e54e385b4 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java @@ -24,8 +24,10 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; -import forestry.factory.gadgets.MachineMoistener; +import forestry.core.recipes.nei.PositionedFluidTank; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiMoistener; +import forestry.factory.tiles.TileMoistener; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; @@ -39,7 +41,7 @@ public class NEIHandlerMoistener extends RecipeHandlerBase { public PositionedStack input; public PositionedStack output; - public CachedMoistenerRecipe(MachineMoistener.Recipe recipe, MoistenerFuel fuel) { + public CachedMoistenerRecipe(TileMoistener.Recipe recipe, MoistenerFuel fuel) { this.tank = new PositionedFluidTank(FluidRegistry.getFluidStack("water", 10000), 10000, new Rectangle(11, 5, 16, 58), NEIHandlerMoistener.this.getGuiTexture(), new Point(176, 0)); this.tank.showAmount = false; if (fuel.item != null) { @@ -116,7 +118,7 @@ public class NEIHandlerMoistener extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (MachineMoistener.Recipe recipe : MachineMoistener.RecipeManager.recipes) { + for (TileMoistener.Recipe recipe : TileMoistener.RecipeManager.recipes) { for (MoistenerFuel fuel : FuelManager.moistenerResource.values()) { this.arecipes.add(new CachedMoistenerRecipe(recipe, fuel)); } @@ -125,7 +127,7 @@ public class NEIHandlerMoistener extends RecipeHandlerBase { @Override public void loadCraftingRecipes(ItemStack result) { - for (MachineMoistener.Recipe recipe : MachineMoistener.RecipeManager.recipes) { + for (TileMoistener.Recipe recipe : TileMoistener.RecipeManager.recipes) { for (MoistenerFuel fuel : FuelManager.moistenerResource.values()) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.product, result) || NEIServerUtils.areStacksSameTypeCrafting(fuel.product, result)) { this.arecipes.add(new CachedMoistenerRecipe(recipe, fuel)); @@ -137,7 +139,7 @@ public class NEIHandlerMoistener extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingred) { super.loadUsageRecipes(ingred); - for (MachineMoistener.Recipe recipe : MachineMoistener.RecipeManager.recipes) { + for (TileMoistener.Recipe recipe : TileMoistener.RecipeManager.recipes) { for (MoistenerFuel fuel : FuelManager.moistenerResource.values()) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.resource, ingred) || NEIServerUtils.areStacksSameTypeCrafting(fuel.item, ingred)) { this.arecipes.add(new CachedMoistenerRecipe(recipe, fuel)); diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java index f0837bd1d..2af6f75fa 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java @@ -21,9 +21,13 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import forestry.factory.gadgets.MachineSqueezer; +import forestry.core.recipes.nei.NEIUtils; +import forestry.core.recipes.nei.PositionedFluidTank; +import forestry.core.recipes.nei.PositionedStackAdv; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiSqueezer; import forestry.factory.recipes.ISqueezerRecipe; +import forestry.factory.tiles.TileSqueezer; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; @@ -131,7 +135,7 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (ISqueezerRecipe recipe : MachineSqueezer.RecipeManager.recipes) { + for (ISqueezerRecipe recipe : TileSqueezer.RecipeManager.recipes) { this.arecipes.add(new CachedSqueezerRecipe(recipe, true)); } } @@ -139,7 +143,7 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase { @Override public void loadCraftingRecipes(ItemStack result) { super.loadCraftingRecipes(result); - for (ISqueezerRecipe recipe : MachineSqueezer.RecipeManager.recipes) { + for (ISqueezerRecipe recipe : TileSqueezer.RecipeManager.recipes) { if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getRemnants(), result)) { this.arecipes.add(new CachedSqueezerRecipe(recipe, true)); } @@ -148,7 +152,7 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase { @Override public void loadCraftingRecipes(FluidStack result) { - for (ISqueezerRecipe recipe : MachineSqueezer.RecipeManager.recipes) { + for (ISqueezerRecipe recipe : TileSqueezer.RecipeManager.recipes) { if (NEIUtils.areFluidsSameType(recipe.getFluidOutput(), result)) { this.arecipes.add(new CachedSqueezerRecipe(recipe, true)); } @@ -157,7 +161,7 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingred) { - ISqueezerRecipe recipe = MachineSqueezer.RecipeManager.findMatchingRecipe(new ItemStack[]{ingred}); + ISqueezerRecipe recipe = TileSqueezer.RecipeManager.findMatchingRecipe(new ItemStack[]{ingred}); if (recipe != null) { CachedSqueezerRecipe crecipe = new CachedSqueezerRecipe(recipe); // Override recipe to show the right input in case it's OD diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java index 7a20dfacd..d2f47fd61 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java @@ -20,8 +20,11 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import forestry.factory.gadgets.MachineStill; +import forestry.core.recipes.nei.NEIUtils; +import forestry.core.recipes.nei.PositionedFluidTank; +import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiStill; +import forestry.factory.tiles.TileStill; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; @@ -32,7 +35,7 @@ public class NEIHandlerStill extends RecipeHandlerBase { public List tanks = new ArrayList(); - public CachedStillRecipe(MachineStill.Recipe recipe) { + public CachedStillRecipe(TileStill.Recipe recipe) { if (recipe.input != null) { this.tanks.add(new PositionedFluidTank(recipe.input, 10000, new Rectangle(30, 4, 16, 58), NEIHandlerStill.this.getGuiTexture(), new Point(176, 0))); } @@ -92,14 +95,14 @@ public class NEIHandlerStill extends RecipeHandlerBase { @Override public void loadAllRecipes() { - for (MachineStill.Recipe recipe : MachineStill.RecipeManager.recipes) { + for (TileStill.Recipe recipe : TileStill.RecipeManager.recipes) { this.arecipes.add(new CachedStillRecipe(recipe)); } } @Override public void loadCraftingRecipes(FluidStack result) { - for (MachineStill.Recipe recipe : MachineStill.RecipeManager.recipes) { + for (TileStill.Recipe recipe : TileStill.RecipeManager.recipes) { if (NEIUtils.areFluidsSameType(recipe.output, result)) { this.arecipes.add(new CachedStillRecipe(recipe)); } @@ -108,7 +111,7 @@ public class NEIHandlerStill extends RecipeHandlerBase { @Override public void loadUsageRecipes(FluidStack ingred) { - for (MachineStill.Recipe recipe : MachineStill.RecipeManager.recipes) { + for (TileStill.Recipe recipe : TileStill.RecipeManager.recipes) { if (NEIUtils.areFluidsSameType(recipe.input, ingred)) { this.arecipes.add(new CachedStillRecipe(recipe)); } diff --git a/src/main/java/forestry/core/interfaces/ICrafterWorktable.java b/src/main/java/forestry/factory/tiles/ICrafterWorktable.java similarity index 85% rename from src/main/java/forestry/core/interfaces/ICrafterWorktable.java rename to src/main/java/forestry/factory/tiles/ICrafterWorktable.java index 61d4bcfa9..69b7ed277 100644 --- a/src/main/java/forestry/core/interfaces/ICrafterWorktable.java +++ b/src/main/java/forestry/factory/tiles/ICrafterWorktable.java @@ -1,4 +1,4 @@ -package forestry.core.interfaces; +package forestry.factory.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/tiles/TileBottler.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/factory/gadgets/MachineBottler.java rename to src/main/java/forestry/factory/tiles/TileBottler.java index a05379a10..ac54d2345 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/tiles/TileBottler.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; import java.util.ArrayList; @@ -36,27 +36,26 @@ import cpw.mods.fml.common.Optional; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICraftingProvider; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TilePowered; +import forestry.core.utils.InventoryUtil; import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; -public class MachineBottler extends TilePowered implements ISidedInventory, ILiquidTankContainer { +public class TileBottler extends TilePowered implements ISidedInventory, ILiquidTankTile { /* CONSTANTS */ public static final short SLOT_INPUT_EMPTY_CAN = 0; @@ -87,7 +86,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq public static class RecipeManager implements ICraftingProvider { - public static final ArrayList recipes = new ArrayList(); + public static final ArrayList recipes = new ArrayList(); /** * @return Recipe matching both res and empty, null if none @@ -144,13 +143,13 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq private int fillingTime; private int fillingTotalTime; - public MachineBottler() { + public TileBottler() { super(1100, 4000, 200); setInternalInventory(new BottlerInventoryAdapter(this)); setHints(Config.hints.get("bottler")); - resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + resourceTank = new StandardTank(Constants.PROCESSOR_TANK_CAPACITY); tankManager = new TankManager(resourceTank); } @@ -222,7 +221,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq return false; } - boolean added = InvTools.tryAddStack(this, currentRecipe.bottled, SLOT_OUTPUT, 1, true, false); + boolean added = InventoryUtil.tryAddStack(this, currentRecipe.bottled, SLOT_OUTPUT, 1, true, false); if (getErrorLogic().setCondition(!added, EnumErrorCode.NOSPACE)) { return false; @@ -291,12 +290,12 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } public int getResourceScaled(int i) { - return (resourceTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (resourceTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } @Override public EnumTankLevel getPrimaryLevel() { - return Utils.rateTankLevel(getResourceScaled(100)); + return EnumTankLevel.rateTankLevel(getResourceScaled(100)); } /* SMP GUI */ @@ -366,9 +365,9 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq return res; } - private static class BottlerInventoryAdapter extends TileInventoryAdapter { - public BottlerInventoryAdapter(MachineBottler machineBottler) { - super(machineBottler, 3, "Items"); + private static class BottlerInventoryAdapter extends TileInventoryAdapter { + public BottlerInventoryAdapter(TileBottler tileBottler) { + super(tileBottler, 3, "Items"); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/forestry/factory/gadgets/MachineCarpenter.java rename to src/main/java/forestry/factory/tiles/TileCarpenter.java index e340da613..efbe0c6e9 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import javax.annotation.Nullable; import java.io.IOException; @@ -39,30 +39,30 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.recipes.ICarpenterManager; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.IItemStackDisplay; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ShapedRecipeCustom; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.IItemStackDisplay; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TilePowered; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.SlotUtil; -public class MachineCarpenter extends TilePowered implements ISidedInventory, ILiquidTankContainer, IItemStackDisplay { +public class TileCarpenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IItemStackDisplay { /* CONSTANTS */ public final static int SLOT_CRAFTING_1 = 0; @@ -81,7 +81,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL private final InventoryCraftResult craftPreviewInventory; @Nullable - private MachineCarpenter.Recipe currentRecipe; + private TileCarpenter.Recipe currentRecipe; private int packageTime; private int totalTime; private ItemStack pendingProduct; @@ -90,12 +90,12 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return getInternalInventory().getStackInSlot(SLOT_BOX); } - public MachineCarpenter() { + public TileCarpenter() { super(1100, 4000, 200); setHints(Config.hints.get("carpenter")); - resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids); + resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids); - craftingInventory = new TileInventoryAdapter(this, 10, "CraftItems"); + craftingInventory = new TileInventoryAdapter(this, 10, "CraftItems"); craftPreviewInventory = new InventoryCraftResult(); setInternalInventory(new CarpenterInventoryAdapter(this)); @@ -167,7 +167,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL setCurrentRecipe(RecipeManager.findMatchingRecipe(resourceTank.getFluid(), getBoxStack(), craftingInventory, getWorldObj())); } - private void setCurrentRecipe(@Nullable MachineCarpenter.Recipe currentRecipe) { + private void setCurrentRecipe(@Nullable TileCarpenter.Recipe currentRecipe) { this.currentRecipe = currentRecipe; final ItemStack craftingResult; @@ -199,7 +199,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } if (currentRecipe == null) { - Recipe recipe = MachineCarpenter.RecipeManager.findMatchingRecipe(resourceTank.getFluid(), getBoxStack(), craftingInventory, worldObj); + Recipe recipe = TileCarpenter.RecipeManager.findMatchingRecipe(resourceTank.getFluid(), getBoxStack(), craftingInventory, worldObj); if (recipe != null) { setCurrentRecipe(recipe); } @@ -279,10 +279,10 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } // Need at least one matched set - ItemStack[] set = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); - ItemStack[] stock = InvTools.getStacks(accessibleInventory, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + ItemStack[] set = InventoryUtil.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] stock = InventoryUtil.getStacks(accessibleInventory, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); - return StackUtils.containsSets(set, stock, true, false) > 0; + return ItemStackUtil.containsSets(set, stock, true, false) > 0; } private boolean removeResources(Recipe recipe) { @@ -303,12 +303,12 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return false; } } - return removeSets(1, InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT)); + return removeSets(1, InventoryUtil.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT)); } private boolean removeSets(int count, ItemStack[] set) { EntityPlayer player = Proxies.common.getPlayer(worldObj, getAccessHandler().getOwner()); - return InvTools.removeSets(getInternalInventory(), count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true); + return InventoryUtil.removeSets(getInternalInventory(), count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true); } private boolean tryAddPending() { @@ -316,7 +316,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return false; } - boolean added = InvTools.tryAddStack(this, pendingProduct, SLOT_PRODUCT, SLOT_PRODUCT_COUNT, true); + boolean added = InventoryUtil.tryAddStack(this, pendingProduct, SLOT_PRODUCT, SLOT_PRODUCT_COUNT, true); if (added) { pendingProduct = null; @@ -351,12 +351,12 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } public int getResourceScaled(int i) { - return (resourceTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (resourceTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } @Override public EnumTankLevel getPrimaryLevel() { - return Utils.rateTankLevel(getResourceScaled(100)); + return EnumTankLevel.rateTankLevel(getResourceScaled(100)); } /* SMP GUI */ @@ -432,8 +432,8 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return tankManager.getTankInfo(from); } - private static class CarpenterInventoryAdapter extends TileInventoryAdapter { - public CarpenterInventoryAdapter(MachineCarpenter carpenter) { + private static class CarpenterInventoryAdapter extends TileInventoryAdapter { + public CarpenterInventoryAdapter(TileCarpenter carpenter) { super(carpenter, 30, "Items"); } @@ -448,7 +448,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return false; } - return Utils.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); } @Override @@ -485,7 +485,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } // Check box - if (box != null && !StackUtils.isCraftingEquivalent(box, item)) { + if (box != null && !ItemStackUtil.isCraftingEquivalent(box, item)) { return false; } @@ -507,13 +507,13 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL public static class RecipeManager implements ICarpenterManager { - public static final ArrayList recipes = new ArrayList(); + public static final ArrayList recipes = new ArrayList(); private static final Set recipeFluids = new HashSet(); private static final List boxes = new ArrayList(); public void addCrating(ItemStack itemStack) { ItemStack uncrated = ((forestry.core.items.ItemCrated) itemStack.getItem()).getContained(); - addRecipe(Defaults.CARPENTER_CRATING_CYCLES, Fluids.WATER.getFluid(Defaults.CARPENTER_CRATING_LIQUID_QUANTITY), + addRecipe(Constants.CARPENTER_CRATING_CYCLES, Fluids.WATER.getFluid(Constants.CARPENTER_CRATING_LIQUID_QUANTITY), ForestryItem.crate.getItemStack(), itemStack, new Object[]{"###", "###", "###", '#', uncrated}); addRecipe(null, new ItemStack(uncrated.getItem(), 9, uncrated.getItemDamage()), new Object[]{"#", '#', itemStack}); } @@ -528,7 +528,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } public void addCrating(String toCrate, ItemStack unpack, ItemStack crated) { - addRecipe(Defaults.CARPENTER_CRATING_CYCLES, Fluids.WATER.getFluid(Defaults.CARPENTER_CRATING_LIQUID_QUANTITY), + addRecipe(Constants.CARPENTER_CRATING_CYCLES, Fluids.WATER.getFluid(Constants.CARPENTER_CRATING_LIQUID_QUANTITY), ForestryItem.crate.getItemStack(), crated, new Object[]{"###", "###", "###", '#', toCrate}); addRecipe(null, new ItemStack(unpack.getItem(), 9, unpack.getItemDamage()), new Object[]{"#", '#', crated}); } @@ -569,7 +569,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } for (ItemStack box : boxes) { - if (StackUtils.isIdenticalItem(box, resource)) { + if (ItemStackUtil.isIdenticalItem(box, resource)) { return true; } } diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/tiles/TileCentrifuge.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/forestry/factory/gadgets/MachineCentrifuge.java rename to src/main/java/forestry/factory/tiles/TileCentrifuge.java index 806e9c992..42318e138 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/tiles/TileCentrifuge.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import com.google.common.collect.ImmutableMap; @@ -40,25 +40,25 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.recipes.ICentrifugeManager; import forestry.api.recipes.ICentrifugeRecipe; -import forestry.core.EnumErrorCode; import forestry.core.circuits.ISocketable; import forestry.core.config.Config; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TilePowered; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.tiles.TilePowered; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.SlotUtil; import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; -public class MachineCentrifuge extends TilePowered implements ISocketable, ISidedInventory { +public class TileCentrifuge extends TilePowered implements ISocketable, ISidedInventory { private static final int TICKS_PER_RECIPE_TIME = 4; private static final int ENERGY_PER_RECIPE_TIME = 210; @@ -75,8 +75,8 @@ public class MachineCentrifuge extends TilePowered implements ISocketable, ISide private final Stack pendingProducts = new Stack(); - public MachineCentrifuge() { - super(800, Defaults.MACHINE_MAX_ENERGY, 4200); + public TileCentrifuge() { + super(800, Constants.MACHINE_MAX_ENERGY, 4200); setInternalInventory(new CentrifugeInventoryAdapter(this)); setHints(Config.hints.get("centrifuge")); } @@ -185,7 +185,7 @@ public class MachineCentrifuge extends TilePowered implements ISocketable, ISide ItemStack next = pendingProducts.peek(); - boolean added = InvTools.tryAddStack(this, next, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, true); + boolean added = InventoryUtil.tryAddStack(this, next, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, true); if (added) { pendingProducts.pop(); @@ -227,8 +227,8 @@ public class MachineCentrifuge extends TilePowered implements ISocketable, ISide return res; } - private static class CentrifugeInventoryAdapter extends TileInventoryAdapter { - public CentrifugeInventoryAdapter(MachineCentrifuge centrifuge) { + private static class CentrifugeInventoryAdapter extends TileInventoryAdapter { + public CentrifugeInventoryAdapter(TileCentrifuge centrifuge) { super(centrifuge, 10, "Items"); } @@ -239,7 +239,7 @@ public class MachineCentrifuge extends TilePowered implements ISocketable, ISide @Override public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - return Utils.isIndexInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT); } } @@ -356,7 +356,7 @@ public class MachineCentrifuge extends TilePowered implements ISocketable, ISide for (ICentrifugeRecipe recipe : recipes) { ItemStack recipeInput = recipe.getInput(); - if (StackUtils.isCraftingEquivalent(recipeInput, itemStack)) { + if (ItemStackUtil.isCraftingEquivalent(recipeInput, itemStack)) { return recipe; } } diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/forestry/factory/gadgets/MachineFabricator.java rename to src/main/java/forestry/factory/tiles/TileFabricator.java index 6f18096b0..076d4dbb6 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; import java.util.ArrayList; @@ -33,28 +33,28 @@ import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.ForestryAPI; import forestry.api.recipes.IFabricatorManager; import forestry.api.recipes.IFabricatorRecipe; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.ICrafter; -import forestry.core.interfaces.ICraftingPlan; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; +import forestry.core.items.ICraftingPlan; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.ShapedRecipeCustom; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.tiles.ICrafter; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TilePowered; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.SlotUtil; import forestry.factory.recipes.FabricatorRecipe; -public class MachineFabricator extends TilePowered implements ICrafter, ILiquidTankContainer, ISidedInventory { +public class TileFabricator extends TilePowered implements ICrafter, ILiquidTankTile, ISidedInventory { /* CONSTANTS */ private static final int MAX_HEAT = 5000; @@ -80,11 +80,11 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT private int heat = 0; private int guiMeltingPoint = 0; - public MachineFabricator() { + public TileFabricator() { super(1100, 3300, 200); - craftingInventory = new TileInventoryAdapter(this, SLOT_CRAFTING_COUNT, "CraftItems"); + craftingInventory = new TileInventoryAdapter(this, SLOT_CRAFTING_COUNT, "CraftItems"); setInternalInventory(new FabricatorInventoryAdapter(this)); - moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, Fluids.GLASS.getFluid()); + moltenTank = new FilteredTank(2 * Constants.BUCKET_VOLUME, Fluids.GLASS.getFluid()); moltenTank.tankMode = StandardTank.TankMode.INTERNAL; tankManager = new TankManager(moltenTank); } @@ -214,7 +214,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT private IFabricatorRecipe getRecipe() { IInventoryAdapter inventory = getInternalInventory(); ItemStack plan = inventory.getStackInSlot(SLOT_PLAN); - ItemStack[] crafting = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] crafting = InventoryUtil.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); return RecipeManager.findMatchingRecipe(plan, moltenTank.getFluid(), crafting); } @@ -264,7 +264,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT FluidStack liquid = myRecipe.getLiquid(); // Remove resources - ItemStack[] crafting = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] crafting = InventoryUtil.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); if (!removeFromInventory(crafting, player, false)) { return; } @@ -291,10 +291,10 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT private boolean removeFromInventory(ItemStack[] set, EntityPlayer player, boolean doRemove) { IInventoryAdapter inventory = getInternalInventory(); if (doRemove) { - return InvTools.removeSets(inventory, 1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true); + return InventoryUtil.removeSets(inventory, 1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true); } else { - ItemStack[] stock = InvTools.getStacks(inventory, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); - return StackUtils.containsSets(set, stock) >= 1; + ItemStack[] stock = InventoryUtil.getStacks(inventory, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + return ItemStackUtil.containsSets(set, stock) >= 1; } } @@ -308,7 +308,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT } ItemStack plan = inventory.getStackInSlot(SLOT_PLAN); - ItemStack[] resources = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] resources = InventoryUtil.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); return RecipeManager.findMatchingRecipe(plan, moltenTank.getFluid(), resources) != null; } @@ -410,9 +410,9 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT return tankManager.getTankInfo(from); } - private static class FabricatorInventoryAdapter extends TileInventoryAdapter { - public FabricatorInventoryAdapter(MachineFabricator fabricator) { - super(fabricator, MachineFabricator.SLOT_COUNT, "Items"); + private static class FabricatorInventoryAdapter extends TileInventoryAdapter { + public FabricatorInventoryAdapter(TileFabricator fabricator) { + super(fabricator, TileFabricator.SLOT_COUNT, "Items"); } @Override @@ -421,14 +421,14 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT return RecipeManager.findMatchingSmelting(itemStack) != null; } else if (slotIndex == SLOT_PLAN) { return RecipeManager.isPlan(itemStack); - } else if (Utils.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT)) { if (RecipeManager.isPlan(itemStack)) { return false; } else if (RecipeManager.findMatchingSmelting(itemStack) != null) { return false; } } - return Utils.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); } @Override @@ -518,7 +518,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT public static boolean isPlan(ItemStack plan) { for (IFabricatorRecipe recipe : recipes) { - if (StackUtils.isIdenticalItem(recipe.getPlan(), plan)) { + if (ItemStackUtil.isIdenticalItem(recipe.getPlan(), plan)) { return true; } } @@ -532,7 +532,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT } for (Smelting smelting : smeltings) { - if (StackUtils.isCraftingEquivalent(smelting.resource, resource)) { + if (ItemStackUtil.isCraftingEquivalent(smelting.resource, resource)) { return smelting; } } diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/tiles/TileFermenter.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/forestry/factory/gadgets/MachineFermenter.java rename to src/main/java/forestry/factory/tiles/TileFermenter.java index 7269d695d..98e9bfcbd --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/tiles/TileFermenter.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; import java.util.ArrayList; @@ -38,29 +38,28 @@ import forestry.api.core.IErrorLogic; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterManager; import forestry.api.recipes.IVariableFermentable; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TilePowered; +import forestry.core.utils.ItemStackUtil; import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; -public class MachineFermenter extends TilePowered implements ISidedInventory, ILiquidTankContainer { +public class TileFermenter extends TilePowered implements ISidedInventory, ILiquidTankTile { // / CONSTANTS public static final short SLOT_RESOURCE = 0; @@ -99,7 +98,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } public boolean matches(ItemStack res, FluidStack liqu) { - if (!StackUtils.isCraftingEquivalent(resource, res)) { + if (!ItemStackUtil.isCraftingEquivalent(resource, res)) { return false; } @@ -109,7 +108,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL public static class RecipeManager implements IFermenterManager { - public static final ArrayList recipes = new ArrayList(); + public static final ArrayList recipes = new ArrayList(); public static final HashSet recipeFluidInputs = new HashSet(); public static final HashSet recipeFluidOutputs = new HashSet(); @@ -144,7 +143,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } for (Recipe recipe : recipes) { - if (StackUtils.isCraftingEquivalent(recipe.resource, resource)) { + if (ItemStackUtil.isCraftingEquivalent(recipe.resource, resource)) { return true; } } @@ -176,13 +175,13 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL private int fuelTotalTime = 0; private int fuelCurrentFerment = 0; - public MachineFermenter() { + public TileFermenter() { super(2000, 8000, 600); setInternalInventory(new FermenterInventoryAdapter(this)); setHints(Config.hints.get("fermenter")); - resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); + resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); resourceTank.tankMode = StandardTank.TankMode.INPUT; - productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidOutputs); + productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidOutputs); productTank.tankMode = StandardTank.TankMode.OUTPUT; tankManager = new TankManager(resourceTank, productTank); } @@ -395,7 +394,6 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } - @Override public boolean hasResourcesMin(float percentage) { if (this.getFermentationStack() == null) { @@ -452,21 +450,21 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } public int getResourceScaled(int i) { - return (resourceTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (resourceTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } public int getProductScaled(int i) { - return (productTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (productTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } @Override public EnumTankLevel getPrimaryLevel() { - return Utils.rateTankLevel(getResourceScaled(100)); + return EnumTankLevel.rateTankLevel(getResourceScaled(100)); } @Override public EnumTankLevel getSecondaryLevel() { - return Utils.rateTankLevel(getProductScaled(100)); + return EnumTankLevel.rateTankLevel(getProductScaled(100)); } private ItemStack getFermentationStack() { @@ -503,7 +501,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL iCrafting.sendProgressBarUpdate(container, firstMessageId + 3, fermentationTotalTime); } - /* ILiquidTankContainer */ + /* ILiquidTankTile */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { return resourceTank.fill(resource, doFill); @@ -549,8 +547,8 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL return res; } - private static class FermenterInventoryAdapter extends TileInventoryAdapter { - public FermenterInventoryAdapter(MachineFermenter fermenter) { + private static class FermenterInventoryAdapter extends TileInventoryAdapter { + public FermenterInventoryAdapter(TileFermenter fermenter) { super(fermenter, 5, "Items"); } diff --git a/src/main/java/forestry/factory/gadgets/MillRainmaker.java b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/factory/gadgets/MillRainmaker.java rename to src/main/java/forestry/factory/tiles/TileMillRainmaker.java index dc067bc2d..1e80d04a9 --- a/src/main/java/forestry/factory/gadgets/MillRainmaker.java +++ b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,16 +16,16 @@ import net.minecraft.nbt.NBTTagCompound; import forestry.api.fuels.FuelManager; import forestry.api.fuels.RainSubstrate; -import forestry.core.gadgets.Mill; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.proxy.Proxies; +import forestry.core.tiles.TileMill; -public class MillRainmaker extends Mill { +public class TileMillRainmaker extends TileMill { private int duration; private boolean reverse; - public MillRainmaker() { + public TileMillRainmaker() { speed = 0.01f; setInternalInventory(new InventoryRainmaker(this)); } @@ -112,10 +112,10 @@ public class MillRainmaker extends Mill { } } - private static class InventoryRainmaker extends TileInventoryAdapter { + private static class InventoryRainmaker extends TileInventoryAdapter { private static final int SLOT_SUBSTRATE = 0; - public InventoryRainmaker(MillRainmaker tile) { + public InventoryRainmaker(TileMillRainmaker tile) { super(tile, 1, "items"); } diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/forestry/factory/gadgets/MachineMoistener.java rename to src/main/java/forestry/factory/tiles/TileMoistener.java index 39f2cfb54..c530c4522 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/tiles/TileMoistener.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; import java.util.ArrayList; @@ -33,26 +33,26 @@ import forestry.api.core.IErrorLogic; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.IMoistenerManager; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.gadgets.TileBase; -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.interfaces.IRenderableMachine; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.IRenderableTile; +import forestry.core.tiles.TileBase; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.SlotUtil; -public class MachineMoistener extends TileBase implements ISidedInventory, ILiquidTankContainer, IRenderableMachine { +public class TileMoistener extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile { /* CONSTANTS */ private static final short SLOT_STASH_1 = 0; @@ -77,17 +77,17 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu } public boolean matches(ItemStack res) { - return StackUtils.isCraftingEquivalent(resource, res); + return ItemStackUtil.isCraftingEquivalent(resource, res); } } public static class RecipeManager implements IMoistenerManager { - public static final ArrayList recipes = new ArrayList(); + public static final ArrayList recipes = new ArrayList(); @Override public void addRecipe(ItemStack resource, ItemStack product, int timePerItem) { - recipes.add(new MachineMoistener.Recipe(resource, product, timePerItem)); + recipes.add(new TileMoistener.Recipe(resource, product, timePerItem)); } public static boolean isResource(ItemStack resource) { @@ -96,7 +96,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu } for (Recipe rec : recipes) { - if (StackUtils.isIdenticalItem(resource, rec.resource)) { + if (ItemStackUtil.isIdenticalItem(resource, rec.resource)) { return true; } } @@ -127,7 +127,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu private final FilteredTank resourceTank; private final TankManager tankManager; - private MachineMoistener.Recipe currentRecipe; + private TileMoistener.Recipe currentRecipe; private int burnTime = 0; private int totalTime = 0; @@ -136,10 +136,10 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu private ItemStack currentProduct; private ItemStack pendingProduct; - public MachineMoistener() { + public TileMoistener() { setInternalInventory(new MoistenerInventoryAdapter(this)); setHints(Config.hints.get("moistener")); - resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); + resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); tankManager = new TankManager(resourceTank); } @@ -294,7 +294,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu return false; } - boolean added = InvTools.tryAddStack(this, pendingProduct, SLOT_PRODUCT, 1, true); + boolean added = InventoryUtil.tryAddStack(this, pendingProduct, SLOT_PRODUCT, 1, true); getErrorLogic().setCondition(!added, EnumErrorCode.NOSPACE); if (added) { @@ -477,7 +477,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu setInventorySlotContents(targetSlot, getStackInSlot(resourceSlot)); setInventorySlotContents(resourceSlot, null); } else { - StackUtils.mergeStacks(getStackInSlot(resourceSlot), getStackInSlot(targetSlot)); + ItemStackUtil.mergeStacks(getStackInSlot(resourceSlot), getStackInSlot(targetSlot)); if (getStackInSlot(resourceSlot) != null && getStackInSlot(resourceSlot).stackSize <= 0) { setInventorySlotContents(resourceSlot, null); } @@ -543,13 +543,13 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu } public int getResourceScaled(int i) { - return (resourceTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (resourceTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } - /* IRenderableMachine */ + /* IRenderableTile */ @Override public EnumTankLevel getPrimaryLevel() { - return Utils.rateTankLevel(getResourceScaled(100)); + return EnumTankLevel.rateTankLevel(getResourceScaled(100)); } @Override @@ -557,7 +557,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu return EnumTankLevel.EMPTY; } - /* ILiquidTankContainer */ + /* ILiquidTankTile */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); @@ -623,8 +623,8 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu iCrafting.sendProgressBarUpdate(container, i + 3, timePerItem); } - private static class MoistenerInventoryAdapter extends TileInventoryAdapter { - public MoistenerInventoryAdapter(MachineMoistener moistener) { + private static class MoistenerInventoryAdapter extends TileInventoryAdapter { + public MoistenerInventoryAdapter(TileMoistener moistener) { super(moistener, 12, "Items"); } @@ -634,7 +634,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu return RecipeManager.isResource(itemStack); } - if (Utils.isIndexInRange(slotIndex, SLOT_STASH_1, SLOT_STASH_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_STASH_1, SLOT_STASH_COUNT)) { return FuelManager.moistenerResource.containsKey(itemStack); } @@ -652,7 +652,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu return true; } - if (Utils.isIndexInRange(slotIndex, SLOT_STASH_1, (SLOT_STASH_COUNT + SLOT_RESERVOIR_COUNT))) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_STASH_1, (SLOT_STASH_COUNT + SLOT_RESERVOIR_COUNT))) { return !FuelManager.moistenerResource.containsKey(itemstack); } diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/forestry/factory/gadgets/MachineRaintank.java rename to src/main/java/forestry/factory/tiles/TileRaintank.java index d34a8aebe..b12b9cc30 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; @@ -29,27 +29,27 @@ import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.BiomeHelper; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.gadgets.TileBase; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.StackUtils; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TileBase; +import forestry.core.utils.ItemStackUtil; -public class MachineRaintank extends TileBase implements ISidedInventory, ILiquidTankContainer { +public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile { /* CONSTANTS */ public static final short SLOT_RESOURCE = 0; public static final short SLOT_PRODUCT = 1; - private static final FluidStack STACK_WATER = Fluids.WATER.getFluid(Defaults.RAINTANK_AMOUNT_PER_UPDATE); + private static final FluidStack STACK_WATER = Fluids.WATER.getFluid(Constants.RAINTANK_AMOUNT_PER_UPDATE); /* MEMBER */ private final FilteredTank resourceTank; @@ -58,11 +58,11 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui private int fillingTime; private ItemStack usedEmpty; - public MachineRaintank() { + public TileRaintank() { setInternalInventory(new RaintankInventoryAdapter(this)); setHints(Config.hints.get("raintank")); - resourceTank = new FilteredTank(Defaults.RAINTANK_TANK_CAPACITY, FluidRegistry.WATER); + resourceTank = new FilteredTank(Constants.RAINTANK_TANK_CAPACITY, FluidRegistry.WATER); tankManager = new TankManager(resourceTank); } @@ -133,7 +133,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui resourceTank.fill(STACK_WATER, true); } - if (!StackUtils.isIdenticalItem(usedEmpty, getStackInSlot(SLOT_RESOURCE))) { + if (!ItemStackUtil.isIdenticalItem(usedEmpty, getStackInSlot(SLOT_RESOURCE))) { fillingTime = 0; usedEmpty = null; } @@ -162,11 +162,11 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui return; } - fillingTime = Defaults.RAINTANK_FILLING_TIME; + fillingTime = Constants.RAINTANK_FILLING_TIME; } public int getFillProgressScaled(int i) { - return (fillingTime * i) / Defaults.RAINTANK_FILLING_TIME; + return (fillingTime * i) / Constants.RAINTANK_FILLING_TIME; } /* SMP GUI */ @@ -222,8 +222,8 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui return tankManager.getTankInfo(from); } - private static class RaintankInventoryAdapter extends TileInventoryAdapter { - public RaintankInventoryAdapter(MachineRaintank raintank) { + private static class RaintankInventoryAdapter extends TileInventoryAdapter { + public RaintankInventoryAdapter(TileRaintank raintank) { super(raintank, 3, "Items"); } diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/tiles/TileSqueezer.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/forestry/factory/gadgets/MachineSqueezer.java rename to src/main/java/forestry/factory/tiles/TileSqueezer.java index cf48b7671..2d49b03a1 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/tiles/TileSqueezer.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; import java.util.ArrayList; @@ -36,30 +36,29 @@ import forestry.api.circuits.ICircuitBoard; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.recipes.ISqueezerManager; -import forestry.core.EnumErrorCode; import forestry.core.circuits.ISocketable; import forestry.core.circuits.ISpeedUpgradable; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TilePowered; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; import forestry.factory.recipes.ISqueezerRecipe; import forestry.factory.recipes.SqueezerRecipe; -public class MachineSqueezer extends TilePowered implements ISocketable, ISidedInventory, ILiquidTankContainer, ISpeedUpgradable { +public class TileSqueezer extends TilePowered implements ISocketable, ISidedInventory, ILiquidTankTile, ISpeedUpgradable { private static final int TICKS_PER_RECIPE_TIME = 4; private static final int ENERGY_PER_RECIPE_TIME = 200; @@ -73,12 +72,12 @@ public class MachineSqueezer extends TilePowered implements ISocketable, ISidedI private ISqueezerRecipe currentRecipe; - public MachineSqueezer() { + public TileSqueezer() { super(1100, 4000, 2000); this.inventory = new SqueezerInventory(this); setInternalInventory(this.inventory); setHints(Config.hints.get("squeezer")); - this.productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + this.productTank = new StandardTank(Constants.PROCESSOR_TANK_CAPACITY); this.productTank.tankMode = StandardTank.TankMode.OUTPUT; this.tankManager = new TankManager(productTank); } @@ -214,12 +213,12 @@ public class MachineSqueezer extends TilePowered implements ISocketable, ISidedI } public int getResourceScaled(int i) { - return (productTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (productTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } @Override public EnumTankLevel getSecondaryLevel() { - return Utils.rateTankLevel(getResourceScaled(100)); + return EnumTankLevel.rateTankLevel(getResourceScaled(100)); } /* ILIQUIDCONTAINER IMPLEMENTATION */ @@ -307,7 +306,7 @@ public class MachineSqueezer extends TilePowered implements ISocketable, ISidedI } } - public static class SqueezerInventory extends TileInventoryAdapter { + public static class SqueezerInventory extends TileInventoryAdapter { public static final short SLOT_RESOURCE_1 = 0; public static final short SLOTS_RESOURCE_COUNT = 9; public static final short SLOT_REMNANT = 9; @@ -315,7 +314,7 @@ public class MachineSqueezer extends TilePowered implements ISocketable, ISidedI public static final short SLOT_CAN_INPUT = 10; public static final short SLOT_CAN_OUTPUT = 11; - public SqueezerInventory(MachineSqueezer squeezer) { + public SqueezerInventory(TileSqueezer squeezer) { super(squeezer, 12, "Items"); } @@ -344,19 +343,19 @@ public class MachineSqueezer extends TilePowered implements ISocketable, ISidedI } public boolean hasResources() { - return !InvTools.isEmpty(this, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT); + return !InventoryUtil.isEmpty(this, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT); } public ItemStack[] getResources() { - return InvTools.getStacks(this, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT); + return InventoryUtil.getStacks(this, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT); } public boolean removeResources(ItemStack[] stacks, EntityPlayer player) { - return InvTools.removeSets(this, 1, stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT, player, false, true); + return InventoryUtil.removeSets(this, 1, stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT, player, false, true); } public boolean addRemnant(ItemStack remnant, boolean doAdd) { - return InvTools.tryAddStack(this, remnant, SLOT_REMNANT, SLOT_REMNANT_COUNT, true, doAdd); + return InventoryUtil.tryAddStack(this, remnant, SLOT_REMNANT, SLOT_REMNANT_COUNT, true, doAdd); } public void fillContainers(FluidStack fluidStack, TankManager tankManager) { @@ -388,14 +387,14 @@ public class MachineSqueezer extends TilePowered implements ISocketable, ISidedI public static ISqueezerRecipe findMatchingRecipe(ItemStack[] items) { // First try to match a specific recipe (without OD) for (ISqueezerRecipe recipe : recipes) { - if (StackUtils.containsSets(recipe.getResources(), items, false, false) > 0) { + if (ItemStackUtil.containsSets(recipe.getResources(), items, false, false) > 0) { return recipe; } } // If that fails - try again with oredict support enabled for (ISqueezerRecipe recipe : recipes) { - if (StackUtils.containsSets(recipe.getResources(), items, true, false) > 0) { + if (ItemStackUtil.containsSets(recipe.getResources(), items, true, false) > 0) { return recipe; } } @@ -408,7 +407,7 @@ public class MachineSqueezer extends TilePowered implements ISocketable, ISidedI return true; } for (ItemStack recipeInput : recipeInputs) { - if (StackUtils.isCraftingEquivalent(recipeInput, itemStack, true, false)) { + if (ItemStackUtil.isCraftingEquivalent(recipeInput, itemStack, true, false)) { return true; } } diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/tiles/TileStill.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/factory/gadgets/MachineStill.java rename to src/main/java/forestry/factory/tiles/TileStill.java index 9a046004f..2f2d4f69b --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/tiles/TileStill.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; import java.util.ArrayList; @@ -31,24 +31,23 @@ import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.recipes.IStillManager; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.Utils; +import forestry.core.render.EnumTankLevel; +import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.TilePowered; -public class MachineStill extends TilePowered implements ISidedInventory, ILiquidTankContainer { +public class TileStill extends TilePowered implements ISidedInventory, ILiquidTankTile { /* CONSTANTS */ public static final short SLOT_PRODUCT = 0; @@ -80,13 +79,13 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui public static class RecipeManager implements IStillManager { - public static final ArrayList recipes = new ArrayList(); + public static final ArrayList recipes = new ArrayList(); public static final HashSet recipeFluidInputs = new HashSet(); public static final HashSet recipeFluidOutputs = new HashSet(); @Override public void addRecipe(int timePerUnit, FluidStack input, FluidStack output) { - recipes.add(new MachineStill.Recipe(timePerUnit, input, output)); + recipes.add(new TileStill.Recipe(timePerUnit, input, output)); if (input != null) { recipeFluidInputs.add(input.getFluid()); } @@ -130,13 +129,13 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui private int distillationTime = 0; private int distillationTotalTime = 0; - public MachineStill() { + public TileStill() { super(1100, 8000, 200); setInternalInventory(new StillInventoryAdapter(this)); setHints(Config.hints.get("still")); - resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); + resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); resourceTank.tankMode = StandardTank.TankMode.INPUT; - productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidOutputs); + productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidOutputs); productTank.tankMode = StandardTank.TankMode.OUTPUT; tankManager = new TankManager(resourceTank, productTank); } @@ -277,21 +276,21 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui } public int getResourceScaled(int i) { - return (resourceTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (resourceTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } public int getProductScaled(int i) { - return (productTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY; + return (productTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY; } @Override public EnumTankLevel getPrimaryLevel() { - return Utils.rateTankLevel(getResourceScaled(100)); + return EnumTankLevel.rateTankLevel(getResourceScaled(100)); } @Override public EnumTankLevel getSecondaryLevel() { - return Utils.rateTankLevel(getProductScaled(100)); + return EnumTankLevel.rateTankLevel(getProductScaled(100)); } /* SMP GUI */ @@ -351,8 +350,8 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui return tankManager.getTankInfo(from); } - private static class StillInventoryAdapter extends TileInventoryAdapter { - public StillInventoryAdapter(MachineStill still) { + private static class StillInventoryAdapter extends TileInventoryAdapter { + public StillInventoryAdapter(TileStill still) { super(still, 3, "Items"); } diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/tiles/TileWorktable.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/forestry/factory/gadgets/TileWorktable.java rename to src/main/java/forestry/factory/tiles/TileWorktable.java index aee5c056b..7b4d447fd --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/tiles/TileWorktable.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.gadgets; +package forestry.factory.tiles; import java.io.IOException; @@ -23,17 +23,16 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import forestry.api.core.ForestryAPI; -import forestry.core.gadgets.TileBase; -import forestry.core.interfaces.ICrafterWorktable; -import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; -import forestry.core.utils.Utils; +import forestry.core.recipes.RecipeUtil; +import forestry.core.tiles.TileBase; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.SlotUtil; import forestry.factory.recipes.RecipeMemory; public class TileWorktable extends TileBase implements ICrafterWorktable { @@ -157,8 +156,8 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { return false; } - ItemStack[] recipeItems = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); - ItemStack[] inventory = InvTools.getStacks(getInternalInventory(), SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + ItemStack[] recipeItems = InventoryUtil.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] inventory = InventoryUtil.getStacks(getInternalInventory(), SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); ItemStack recipeOutput = currentRecipe.getRecipeOutput(worldObj); return RecipeUtil.canCraftRecipe(worldObj, recipeItems, recipeOutput, inventory); @@ -174,8 +173,8 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { @Override public boolean onCraftingStart(EntityPlayer player) { - ItemStack[] set = InvTools.getStacks(currentRecipe.getMatrix(), SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); - ItemStack[] removed = InvTools.removeSets(this, 1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, false, true, true); + ItemStack[] set = InventoryUtil.getStacks(currentRecipe.getMatrix(), SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] removed = InventoryUtil.removeSets(this, 1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, false, true, true); for (int i = 0; i < removed.length; i++) { craftingInventory.setInventorySlotContents(i, removed[i]); @@ -204,7 +203,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { continue; } - if (!InvTools.tryAddStack(this, container, true)) { + if (!InventoryUtil.tryAddStack(this, container, true)) { player.dropPlayerItemWithRandomChoice(container, false); } } @@ -242,7 +241,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - return Utils.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); } } } diff --git a/src/main/java/forestry/factory/triggers/TriggerLowFuel.java b/src/main/java/forestry/factory/triggers/TriggerLowFuel.java index 3575a9b91..77da0a62c 100644 --- a/src/main/java/forestry/factory/triggers/TriggerLowFuel.java +++ b/src/main/java/forestry/factory/triggers/TriggerLowFuel.java @@ -14,8 +14,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.gadgets.Engine; -import forestry.core.gadgets.TilePowered; +import forestry.core.tiles.TileEngine; +import forestry.core.tiles.TilePowered; import forestry.core.triggers.Trigger; import buildcraft.api.statements.IStatementContainer; @@ -45,9 +45,9 @@ public class TriggerLowFuel extends Trigger { return !((TilePowered) tile).hasFuelMin(threshold); } - if (tile instanceof Engine) { - Engine engine = (Engine) tile; - return !engine.hasFuelMin(threshold); + if (tile instanceof TileEngine) { + TileEngine tileEngine = (TileEngine) tile; + return !tileEngine.hasFuelMin(threshold); } return false; diff --git a/src/main/java/forestry/factory/triggers/TriggerLowResource.java b/src/main/java/forestry/factory/triggers/TriggerLowResource.java index f9ee8db87..e652bfe37 100644 --- a/src/main/java/forestry/factory/triggers/TriggerLowResource.java +++ b/src/main/java/forestry/factory/triggers/TriggerLowResource.java @@ -14,7 +14,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.gadgets.TilePowered; +import forestry.core.tiles.TilePowered; import forestry.core.triggers.Trigger; import buildcraft.api.statements.IStatementContainer; diff --git a/src/main/java/forestry/farming/EventHandlerFarming.java b/src/main/java/forestry/farming/EventHandlerFarming.java index e5f248d80..38a046436 100755 --- a/src/main/java/forestry/farming/EventHandlerFarming.java +++ b/src/main/java/forestry/farming/EventHandlerFarming.java @@ -19,7 +19,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import forestry.core.config.ForestryBlock; import forestry.core.proxy.Proxies; -import forestry.farming.gadgets.BlockMushroom; +import forestry.farming.blocks.BlockMushroom; public class EventHandlerFarming { diff --git a/src/main/java/forestry/farming/FarmHelper.java b/src/main/java/forestry/farming/FarmHelper.java index 44c40bf5e..18acd2273 100755 --- a/src/main/java/forestry/farming/FarmHelper.java +++ b/src/main/java/forestry/farming/FarmHelper.java @@ -10,18 +10,30 @@ ******************************************************************************/ package forestry.farming; +import com.google.common.collect.ImmutableSet; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmComponent; -import forestry.core.vect.MutableVect; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.vect.MutableVect; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public class FarmHelper { + public static final ImmutableSet bricks = ImmutableSet.of( + Blocks.brick_block, + Blocks.stonebrick, + Blocks.sandstone, + Blocks.nether_brick, + Blocks.quartz_block + ); + private static FarmDirection getOpposite(FarmDirection farmDirection) { ForgeDirection forgeDirection = farmDirection.getForgeDirection(); ForgeDirection forgeDirectionOpposite = forgeDirection.getOpposite(); diff --git a/src/main/java/forestry/farming/FarmTarget.java b/src/main/java/forestry/farming/FarmTarget.java index ee9c19e42..a276bc708 100755 --- a/src/main/java/forestry/farming/FarmTarget.java +++ b/src/main/java/forestry/farming/FarmTarget.java @@ -14,10 +14,9 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import forestry.api.farming.FarmDirection; -import forestry.core.vect.MutableVect; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; -import forestry.farming.gadgets.StructureLogicFarm; +import forestry.core.utils.vect.MutableVect; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public class FarmTarget { @@ -59,7 +58,7 @@ public class FarmTarget { MutableVect position = new MutableVect(platformPosition); for (extent = 0; extent < limit; extent++) { Block platform = VectUtil.getBlock(world, position); - if (!StructureLogicFarm.bricks.contains(platform)) { + if (!FarmHelper.bricks.contains(platform)) { break; } position.add(getDirection().getForgeDirection()); diff --git a/src/main/java/forestry/farming/GuiHandlerFarming.java b/src/main/java/forestry/farming/GuiHandlerFarming.java index 3567529ca..a40e93dea 100755 --- a/src/main/java/forestry/farming/GuiHandlerFarming.java +++ b/src/main/java/forestry/farming/GuiHandlerFarming.java @@ -19,7 +19,7 @@ import forestry.core.network.PacketSocketUpdate; import forestry.core.proxy.Proxies; import forestry.farming.gui.ContainerFarm; import forestry.farming.gui.GuiFarm; -import forestry.farming.multiblock.TileFarm; +import forestry.farming.tiles.TileFarm; public class GuiHandlerFarming extends GuiHandlerBase { diff --git a/src/main/java/forestry/farming/multiblock/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java similarity index 91% rename from src/main/java/forestry/farming/multiblock/BlockFarm.java rename to src/main/java/forestry/farming/blocks/BlockFarm.java index e4a00c46a..b46b5b759 100644 --- a/src/main/java/forestry/farming/multiblock/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.blocks; import java.util.ArrayList; import java.util.List; @@ -33,11 +33,17 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.gadgets.BlockStructure; +import forestry.core.blocks.BlockStructure; import forestry.core.proxy.Proxies; import forestry.core.render.ParticleHelper; -import forestry.core.render.ParticleHelperCallback; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; +import forestry.farming.render.EnumFarmBlockTexture; +import forestry.farming.tiles.TileControl; +import forestry.farming.tiles.TileFarm; +import forestry.farming.tiles.TileFarmPlain; +import forestry.farming.tiles.TileGearbox; +import forestry.farming.tiles.TileHatch; +import forestry.farming.tiles.TileValve; import forestry.plugins.PluginFarming; public class BlockFarm extends BlockStructure { @@ -95,7 +101,7 @@ public class BlockFarm extends BlockStructure { if (Proxies.common.isSimulating(world) && canHarvestBlock(player, meta)) { List drops = getDrops(world, x, y, z, 0, 0); for (ItemStack drop : drops) { - StackUtils.dropItemStackAsEntity(drop, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(drop, world, x, y, z); } } return world.setBlockToAir(x, y, z); @@ -157,7 +163,7 @@ public class BlockFarm extends BlockStructure { EnumFarmBlockTexture.registerIcons(register); } - private static class ParticleCallback implements ParticleHelperCallback { + private static class ParticleCallback implements ParticleHelper.Callback { @Override @SideOnly(Side.CLIENT) @@ -177,7 +183,7 @@ public class BlockFarm extends BlockStructure { } } - private static final ParticleHelperCallback callback = new ParticleCallback(); + private static final ParticleHelper.Callback callback = new ParticleCallback(); @SideOnly(Side.CLIENT) @Override @@ -199,7 +205,7 @@ public class BlockFarm extends BlockStructure { @SideOnly(Side.CLIENT) public static IIcon getBlockTextureForSide(EnumFarmBlockTexture type, int side) { - Block block = StackUtils.getBlock(type.getBase()); + Block block = ItemStackUtil.getBlock(type.getBase()); if (block == null) { return null; } @@ -247,7 +253,7 @@ public class BlockFarm extends BlockStructure { base = ((TileFarm) tile).getFarmBlockTexture().getBase(); } - Block block = StackUtils.getBlock(base); + Block block = ItemStackUtil.getBlock(base); if (block == null) { return null; } diff --git a/src/main/java/forestry/farming/gadgets/BlockMushroom.java b/src/main/java/forestry/farming/blocks/BlockMushroom.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/farming/gadgets/BlockMushroom.java rename to src/main/java/forestry/farming/blocks/BlockMushroom.java index 851aa9731..722b12524 --- a/src/main/java/forestry/farming/gadgets/BlockMushroom.java +++ b/src/main/java/forestry/farming/blocks/BlockMushroom.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.gadgets; +package forestry.farming.blocks; import java.util.ArrayList; import java.util.List; @@ -28,8 +28,8 @@ import net.minecraft.world.gen.feature.WorldGenerator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.IItemTyped; -import forestry.core.config.Defaults; +import forestry.core.blocks.IItemTyped; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.farming.worldgen.WorldGenBigMushroom; @@ -99,7 +99,7 @@ public class BlockMushroom extends BlockSapling implements IItemTyped { maturity = 3; int matX = maturity << 2; int meta = (matX | type.ordinal()); - world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); + world.setBlockMetadataWithNotify(i, j, k, meta, Constants.FLAG_BLOCK_SYNCH); } else if (lightvalue <= 7) { func_149878_d(world, i, j, k, random); } diff --git a/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java b/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java deleted file mode 100755 index fe561a177..000000000 --- a/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.farming.gadgets; - -import com.google.common.collect.ImmutableSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; - -public class StructureLogicFarm { - - public static final ImmutableSet bricks = ImmutableSet.of( - Blocks.brick_block, - Blocks.stonebrick, - Blocks.sandstone, - Blocks.nether_brick, - Blocks.quartz_block - ); - - private StructureLogicFarm() { - - } - -} diff --git a/src/main/java/forestry/farming/gui/ContainerFarm.java b/src/main/java/forestry/farming/gui/ContainerFarm.java index 0d204278d..d6e3e6519 100755 --- a/src/main/java/forestry/farming/gui/ContainerFarm.java +++ b/src/main/java/forestry/farming/gui/ContainerFarm.java @@ -20,7 +20,7 @@ import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.core.network.PacketGuiUpdate; import forestry.farming.multiblock.FarmInventory; -import forestry.farming.multiblock.TileFarm; +import forestry.farming.tiles.TileFarm; public class ContainerFarm extends ContainerSocketed { diff --git a/src/main/java/forestry/farming/gui/GuiFarm.java b/src/main/java/forestry/farming/gui/GuiFarm.java index 2a8d28557..00e2058a5 100755 --- a/src/main/java/forestry/farming/gui/GuiFarm.java +++ b/src/main/java/forestry/farming/gui/GuiFarm.java @@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmLogic; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.gui.ledgers.ClimateLedger; import forestry.core.gui.ledgers.OwnerLedger; @@ -29,12 +29,12 @@ import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; import forestry.farming.multiblock.IFarmController; -import forestry.farming.multiblock.TileFarm; +import forestry.farming.tiles.TileFarm; public class GuiFarm extends GuiForestry { public GuiFarm(EntityPlayer player, TileFarm tile) { - super(Defaults.TEXTURE_PATH_GUI + "/mfarm.png", new ContainerFarm(player.inventory, tile), tile); + super(Constants.TEXTURE_PATH_GUI + "/mfarm.png", new ContainerFarm(player.inventory, tile), tile); widgetManager.add(new TankWidget(widgetManager, 15, 19, 0).setOverlayOrigin(216, 18)); diff --git a/src/main/java/forestry/farming/items/ItemFarmBlock.java b/src/main/java/forestry/farming/items/ItemBlockFarm.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/forestry/farming/items/ItemFarmBlock.java rename to src/main/java/forestry/farming/items/ItemBlockFarm.java index d4d94f33e..c5e879414 --- a/src/main/java/forestry/farming/items/ItemFarmBlock.java +++ b/src/main/java/forestry/farming/items/ItemBlockFarm.java @@ -17,12 +17,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import forestry.core.gadgets.IStructureBlockItem; -import forestry.farming.multiblock.EnumFarmBlockTexture; +import forestry.core.items.IStructureBlockItem; +import forestry.farming.render.EnumFarmBlockTexture; -public class ItemFarmBlock extends ItemBlock implements IStructureBlockItem { +public class ItemBlockFarm extends ItemBlock implements IStructureBlockItem { - public ItemFarmBlock(Block block) { + public ItemBlockFarm(Block block) { super(block); setHasSubtypes(true); } diff --git a/src/main/java/forestry/farming/logic/Crop.java b/src/main/java/forestry/farming/logic/Crop.java index 64a837079..235956619 100755 --- a/src/main/java/forestry/farming/logic/Crop.java +++ b/src/main/java/forestry/farming/logic/Crop.java @@ -17,8 +17,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.farming.ICrop; -import forestry.core.config.Defaults; -import forestry.core.vect.Vect; +import forestry.core.config.Constants; +import forestry.core.utils.vect.Vect; public abstract class Crop implements ICrop { @@ -31,7 +31,7 @@ public abstract class Crop implements ICrop { } protected final void setBlock(Vect position, Block block, int meta) { - world.setBlock(position.x, position.y, position.z, block, meta, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(position.x, position.y, position.z, block, meta, Constants.FLAG_BLOCK_SYNCH); } protected final Block getBlock(Vect position) { diff --git a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java index ebfc62223..97750b269 100644 --- a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java +++ b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java @@ -18,9 +18,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class CropBasicAgriCraft extends Crop { @@ -46,7 +46,7 @@ public class CropBasicAgriCraft extends Crop { } harvest.remove(0); Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, Blocks.melon_block, 0); - world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Defaults.FLAG_BLOCK_SYNCH); + world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Constants.FLAG_BLOCK_SYNCH); return harvest; } diff --git a/src/main/java/forestry/farming/logic/CropBasicFruit.java b/src/main/java/forestry/farming/logic/CropBasicFruit.java index c65c2b378..893f9410a 100644 --- a/src/main/java/forestry/farming/logic/CropBasicFruit.java +++ b/src/main/java/forestry/farming/logic/CropBasicFruit.java @@ -16,9 +16,9 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class CropBasicFruit extends Crop { @@ -40,7 +40,7 @@ public class CropBasicFruit extends Crop { protected Collection harvestBlock(Vect pos) { Collection harvested = block.getDrops(world, pos.x, pos.y, pos.z, meta, 0); Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, block, 0); - world.setBlock(pos.x, pos.y, pos.z, block, 0, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(pos.x, pos.y, pos.z, block, 0, Constants.FLAG_BLOCK_SYNCH); return harvested; } diff --git a/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java b/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java index 64a6f20d3..0e8813c10 100644 --- a/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java +++ b/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java @@ -17,9 +17,9 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class CropBasicGrowthCraft extends Crop { @@ -52,11 +52,11 @@ public class CropBasicGrowthCraft extends Crop { world.setBlockToAir(pos.x, pos.y, pos.z); } else { - world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Defaults.FLAG_BLOCK_SYNCH); + world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Constants.FLAG_BLOCK_SYNCH); } if (isRice) { - world.setBlockMetadataWithNotify(pos.x, pos.y - 1, pos.z, 7, Defaults.FLAG_BLOCK_SYNCH); + world.setBlockMetadataWithNotify(pos.x, pos.y - 1, pos.z, 7, Constants.FLAG_BLOCK_SYNCH); } return harvest; diff --git a/src/main/java/forestry/farming/logic/CropBlock.java b/src/main/java/forestry/farming/logic/CropBlock.java index 7dde1591f..8044744cf 100755 --- a/src/main/java/forestry/farming/logic/CropBlock.java +++ b/src/main/java/forestry/farming/logic/CropBlock.java @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class CropBlock extends Crop { diff --git a/src/main/java/forestry/farming/logic/CropFruit.java b/src/main/java/forestry/farming/logic/CropFruit.java index 86b27391a..34396e2e1 100755 --- a/src/main/java/forestry/farming/logic/CropFruit.java +++ b/src/main/java/forestry/farming/logic/CropFruit.java @@ -20,7 +20,7 @@ import net.minecraft.world.World; import forestry.api.genetics.IFruitBearer; import forestry.core.network.PacketFXSignal; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class CropFruit extends Crop { diff --git a/src/main/java/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java index 7abd2a6e4..8750f6233 100755 --- a/src/main/java/forestry/farming/logic/CropPeat.java +++ b/src/main/java/forestry/farming/logic/CropPeat.java @@ -19,10 +19,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.core.blocks.BlockSoil; import forestry.core.config.ForestryItem; -import forestry.core.gadgets.BlockSoil; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class CropPeat extends Crop { diff --git a/src/main/java/forestry/farming/logic/CropRubber.java b/src/main/java/forestry/farming/logic/CropRubber.java index a0da43fb9..e09d67c47 100755 --- a/src/main/java/forestry/farming/logic/CropRubber.java +++ b/src/main/java/forestry/farming/logic/CropRubber.java @@ -17,9 +17,9 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; import forestry.plugins.PluginIC2; public class CropRubber extends CropBlock { @@ -33,7 +33,7 @@ public class CropRubber extends CropBlock { Collection harvested = new ArrayList(); harvested.add(PluginIC2.resin.copy()); Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, block, 0); - world.setBlock(pos.x, pos.y, pos.z, block, meta + 6, Defaults.FLAG_BLOCK_SYNCH); + world.setBlock(pos.x, pos.y, pos.z, block, meta + 6, Constants.FLAG_BLOCK_SYNCH); return harvested; } diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index 500aa261c..6a0b1ce83 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -19,9 +19,9 @@ import net.minecraft.world.World; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmLogic; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.render.SpriteSheet; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public abstract class FarmLogic implements IFarmLogic { @@ -61,7 +61,7 @@ public abstract class FarmLogic implements IFarmLogic { } protected final void setBlock(Vect position, Block block, int meta) { - getWorld().setBlock(position.x, position.y, position.z, block, meta, Defaults.FLAG_BLOCK_SYNCH_AND_UPDATE); + getWorld().setBlock(position.x, position.y, position.z, block, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index dd68e8285..98b9ca0d8 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -36,11 +36,11 @@ import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; +import forestry.core.blocks.BlockSoil; import forestry.core.config.ForestryBlock; -import forestry.core.gadgets.BlockSoil; import forestry.core.render.SpriteSheet; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public class FarmLogicArboreal extends FarmLogicHomogeneous { diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index 7f3804887..12be00de5 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -33,9 +33,9 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.vect.MutableVect; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.vect.MutableVect; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public class FarmLogicCocoa extends FarmLogic { @@ -185,7 +185,7 @@ public class FarmLogicCocoa extends FarmLogic { candidates.addAll(temp); temp.clear(); } - // Proxies.log.finest("Logic %s at %s/%s/%s has seen %s blocks.", getClass().getName(), position.x, position.y, position.z, seen.size()); + // Log.finest("Logic %s at %s/%s/%s has seen %s blocks.", getClass().getName(), position.x, position.y, position.z, seen.size()); return crops; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicCrops.java b/src/main/java/forestry/farming/logic/FarmLogicCrops.java index ec3d22f5d..1643025a4 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCrops.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCrops.java @@ -26,17 +26,17 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.config.Defaults; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; -import forestry.core.vect.IVect; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.IVect; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public abstract class FarmLogicCrops extends FarmLogicWatered { private final Iterable seeds; - private static final ItemStack farmland = new ItemStack(Blocks.farmland, 1, Defaults.WILDCARD); + private static final ItemStack farmland = new ItemStack(Blocks.farmland, 1, Constants.WILDCARD); protected FarmLogicCrops(IFarmHousing housing, Iterable seeds) { super(housing, new ItemStack(Blocks.dirt), new ItemStack(Blocks.farmland)); @@ -46,7 +46,7 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { @Override public boolean isAcceptedGround(ItemStack itemStack) { - return super.isAcceptedGround(itemStack) || StackUtils.isIdenticalItem(farmland, itemStack); + return super.isAcceptedGround(itemStack) || ItemStackUtil.isIdenticalItem(farmland, itemStack); } @Override @@ -111,7 +111,7 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { for (int i = 0; i < extent; i++) { Vect position = translateWithOffset(x, y, z, direction, i); - if (!VectUtil.isAirBlock(world, position) && !Utils.isReplaceableBlock(getWorld(), position.x, position.y, position.z)) { + if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(getWorld(), position.x, position.y, position.z)) { continue; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicEnder.java b/src/main/java/forestry/farming/logic/FarmLogicEnder.java index bdce6fb86..792d092eb 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicEnder.java +++ b/src/main/java/forestry/farming/logic/FarmLogicEnder.java @@ -27,9 +27,9 @@ import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.utils.Utils; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public class FarmLogicEnder extends FarmLogicHomogeneous { @@ -88,7 +88,7 @@ public class FarmLogicEnder extends FarmLogicHomogeneous { for (int i = 0; i < extent; i++) { Vect position = translateWithOffset(x, y, z, direction, i); - if (!VectUtil.isAirBlock(world, position) && !Utils.isReplaceableBlock(world, position.x, position.y, position.z)) { + if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(world, position.x, position.y, position.z)) { continue; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 737848ed2..b68434d14 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -26,7 +26,7 @@ import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class FarmLogicGourd extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java index 1c7ffe9b3..e0dc25947 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java +++ b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java @@ -20,10 +20,10 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.core.utils.BlockUtil; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; -import forestry.farming.gadgets.StructureLogicFarm; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; +import forestry.farming.FarmHelper; public abstract class FarmLogicHomogeneous extends FarmLogic { @@ -41,7 +41,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { } protected boolean isAcceptedSoil(ItemStack itemStack) { - return StackUtils.isIdenticalItem(soilBlock, itemStack); + return ItemStackUtil.isIdenticalItem(soilBlock, itemStack); } @Override @@ -94,7 +94,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { Vect position = translateWithOffset(x, yGround, z, direction, i); Block soil = VectUtil.getBlock(world, position); - if (StructureLogicFarm.bricks.contains(soil)) { + if (FarmHelper.bricks.contains(soil)) { break; } @@ -106,13 +106,13 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { Vect platformPosition = position.add(0, -1, 0); Block platformBlock = VectUtil.getBlock(world, platformPosition); - if (!StructureLogicFarm.bricks.contains(platformBlock)) { + if (!FarmHelper.bricks.contains(platformBlock)) { break; } produce.addAll(BlockUtil.getBlockDrops(world, position)); - setBlock(position, StackUtils.getBlock(soilBlock), soilBlock.getItemDamage()); + setBlock(position, ItemStackUtil.getBlock(soilBlock), soilBlock.getItemDamage()); housing.getFarmInventory().removeResources(resources); return true; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java index 43a4970e1..5586c976f 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java @@ -27,9 +27,9 @@ import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.utils.Utils; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public class FarmLogicInfernal extends FarmLogicHomogeneous { @@ -88,7 +88,7 @@ public class FarmLogicInfernal extends FarmLogicHomogeneous { for (int i = 0; i < extent; i++) { Vect position = translateWithOffset(x, y, z, direction, i); - if (!VectUtil.isAirBlock(world, position) && !Utils.isReplaceableBlock(world, position.x, position.y, position.z)) { + if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(world, position.x, position.y, position.z)) { continue; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index 5b62f4df2..0be890456 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -38,8 +38,8 @@ import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.api.genetics.IFruitBearer; import forestry.core.config.ForestryItem; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; import forestry.plugins.PluginManager; public class FarmLogicOrchard extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index 911c4e401..e98dc68f7 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -24,11 +24,11 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; +import forestry.core.blocks.BlockSoil; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; -import forestry.core.gadgets.BlockSoil; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; public class FarmLogicPeat extends FarmLogicWatered { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPoale.java b/src/main/java/forestry/farming/logic/FarmLogicPoale.java index bcbd84ffa..cce92708d 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPoale.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPoale.java @@ -27,8 +27,8 @@ import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmLogicPoale extends FarmLogic { @@ -71,7 +71,7 @@ public class FarmLogicPoale extends FarmLogic { return false; } - return StackUtils.equals(Blocks.sand, itemstack) || StackUtils.equals(Blocks.dirt, itemstack); + return ItemStackUtil.equals(Blocks.sand, itemstack) || ItemStackUtil.equals(Blocks.dirt, itemstack); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index ac59af8a5..0dd64d812 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -29,10 +29,10 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; -import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Log; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; import forestry.plugins.PluginIC2; public class FarmLogicRubber extends FarmLogic { @@ -42,7 +42,7 @@ public class FarmLogicRubber extends FarmLogic { public FarmLogicRubber(IFarmHousing housing) { super(housing); if (PluginIC2.rubberwood == null || PluginIC2.resin == null) { - Proxies.log.warning("Failed to init a farm logic %s since IC2 was not found", getClass().getName()); + Log.warning("Failed to init a farm logic %s since IC2 was not found", getClass().getName()); inActive = true; } } @@ -127,7 +127,7 @@ public class FarmLogicRubber extends FarmLogic { // Determine what type we want to harvest. Block block = VectUtil.getBlock(world, position); - if (!StackUtils.equals(block, PluginIC2.rubberwood)) { + if (!ItemStackUtil.equals(block, PluginIC2.rubberwood)) { return crops; } @@ -168,7 +168,7 @@ public class FarmLogicRubber extends FarmLogic { } Block block = VectUtil.getBlock(world, candidate); - if (StackUtils.equals(block, PluginIC2.rubberwood)) { + if (ItemStackUtil.equals(block, PluginIC2.rubberwood)) { int meta = VectUtil.getBlockMeta(world, candidate); if (meta >= 2 && meta <= 5) { crops.push(new CropRubber(world, block, meta, candidate)); diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index 2041ed72c..0dd039ded 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -27,8 +27,8 @@ import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmLogicSucculent extends FarmLogic { @@ -71,7 +71,7 @@ public class FarmLogicSucculent extends FarmLogic { return false; } - return StackUtils.equals(Blocks.sand, itemstack); + return ItemStackUtil.equals(Blocks.sand, itemstack); } @Override @@ -80,7 +80,7 @@ public class FarmLogicSucculent extends FarmLogic { return false; } - return StackUtils.equals(Blocks.cactus, itemstack); + return ItemStackUtil.equals(Blocks.cactus, itemstack); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index 0f96f1f04..e47efd1e3 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -24,11 +24,10 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; import forestry.core.fluids.Fluids; import forestry.core.utils.BlockUtil; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; -import forestry.farming.gadgets.StructureLogicFarm; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; +import forestry.farming.FarmHelper; public abstract class FarmLogicWatered extends FarmLogic { @@ -56,7 +55,7 @@ public abstract class FarmLogicWatered extends FarmLogic { } protected boolean isAcceptedGround(ItemStack ground) { - return StackUtils.isIdenticalItem(this.ground, ground); + return ItemStackUtil.isIdenticalItem(this.ground, ground); } @Override @@ -105,11 +104,11 @@ public abstract class FarmLogicWatered extends FarmLogic { Vect platformPosition = position.add(0, -1, 0); Block platformBlock = VectUtil.getBlock(world, platformPosition); - if (!StructureLogicFarm.bricks.contains(platformBlock)) { + if (!FarmHelper.bricks.contains(platformBlock)) { break; } - if (!isAirBlock(soil) && !Utils.isReplaceableBlock(soil)) { + if (!isAirBlock(soil) && !BlockUtil.isReplaceableBlock(soil)) { produce.addAll(BlockUtil.getBlockDrops(getWorld(), position)); setBlock(position, Blocks.air, 0); return trySetSoil(position); @@ -137,7 +136,7 @@ public abstract class FarmLogicWatered extends FarmLogic { Vect platformPosition = position.add(0, -1, 0); Block platformBlock = VectUtil.getBlock(world, platformPosition); - if (!StructureLogicFarm.bricks.contains(platformBlock)) { + if (!FarmHelper.bricks.contains(platformBlock)) { break; } @@ -158,7 +157,7 @@ public abstract class FarmLogicWatered extends FarmLogic { if (!housing.getFarmInventory().hasResources(resources)) { return false; } - setBlock(position, StackUtils.getBlock(ground), ground.getItemDamage()); + setBlock(position, ItemStackUtil.getBlock(ground), ground.getItemDamage()); housing.getFarmInventory().removeResources(resources); return true; } diff --git a/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java b/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java index 2c31b7234..77effa370 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java @@ -17,9 +17,9 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.config.Defaults; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.config.Constants; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmableBasicAgricraft implements IFarmable { @@ -49,7 +49,7 @@ public class FarmableBasicAgricraft implements IFarmable { @Override public boolean isGermling(ItemStack itemstack) { - return StackUtils.equals(block, itemstack); + return ItemStackUtil.equals(block, itemstack); } @Override @@ -59,7 +59,7 @@ public class FarmableBasicAgricraft implements IFarmable { @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/farming/logic/FarmableBasicFruit.java b/src/main/java/forestry/farming/logic/FarmableBasicFruit.java index 5a4ebcda0..63ffbf84f 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicFruit.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicFruit.java @@ -17,9 +17,9 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.config.Defaults; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.config.Constants; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmableBasicFruit implements IFarmable { @@ -49,12 +49,12 @@ public class FarmableBasicFruit implements IFarmable { @Override public boolean isGermling(ItemStack itemstack) { - return StackUtils.equals(block, itemstack); + return ItemStackUtil.equals(block, itemstack); } @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java b/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java index 5b414d324..e92cff5ba 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java @@ -17,9 +17,9 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.config.Defaults; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.config.Constants; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmableBasicGrowthCraft implements IFarmable { @@ -28,7 +28,7 @@ public class FarmableBasicGrowthCraft implements IFarmable { private final boolean isRice; private final boolean isGrape; - public FarmableBasicGrowthCraft(Block block, int matureMeta,boolean isRice, boolean isGrape) { + public FarmableBasicGrowthCraft(Block block, int matureMeta, boolean isRice, boolean isGrape) { this.block = block; this.matureMeta = matureMeta; this.isRice = isRice; @@ -53,12 +53,12 @@ public class FarmableBasicGrowthCraft implements IFarmable { @Override public boolean isGermling(ItemStack itemstack) { - return StackUtils.equals(block, itemstack); + return ItemStackUtil.equals(block, itemstack); } @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableCocoa.java b/src/main/java/forestry/farming/logic/FarmableCocoa.java index 8d4513fac..794798c0f 100755 --- a/src/main/java/forestry/farming/logic/FarmableCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmableCocoa.java @@ -21,7 +21,7 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.utils.BlockUtil; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class FarmableCocoa implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java index 50f796477..aa55e6a45 100755 --- a/src/main/java/forestry/farming/logic/FarmableGE.java +++ b/src/main/java/forestry/farming/logic/FarmableGE.java @@ -20,7 +20,7 @@ import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.arboriculture.genetics.TreeGenome; import forestry.core.config.ForestryBlock; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class FarmableGE implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java index 97a6bbd4d..b81d7fdb1 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class FarmableGenericCrop implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java index a06fd3266..d8182b1af 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java @@ -17,8 +17,8 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmableGenericSapling implements IFarmable { @@ -64,7 +64,7 @@ public class FarmableGenericSapling implements IFarmable { @Override public boolean isGermling(ItemStack itemstack) { - if (!StackUtils.equals(sapling, itemstack)) { + if (!ItemStackUtil.equals(sapling, itemstack)) { return false; } diff --git a/src/main/java/forestry/farming/logic/FarmableGourd.java b/src/main/java/forestry/farming/logic/FarmableGourd.java index 98512ac1e..e11dcfd3d 100755 --- a/src/main/java/forestry/farming/logic/FarmableGourd.java +++ b/src/main/java/forestry/farming/logic/FarmableGourd.java @@ -16,9 +16,9 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.config.Defaults; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.config.Constants; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmableGourd implements IFarmable { @@ -38,7 +38,7 @@ public class FarmableGourd implements IFarmable { return false; } - return StackUtils.equals(world.getBlock(x, y, z), stem); + return ItemStackUtil.equals(world.getBlock(x, y, z), stem); } @Override @@ -47,7 +47,7 @@ public class FarmableGourd implements IFarmable { return null; } - if (!StackUtils.equals(world.getBlock(x, y, z), fruit)) { + if (!ItemStackUtil.equals(world.getBlock(x, y, z), fruit)) { return null; } @@ -55,7 +55,7 @@ public class FarmableGourd implements IFarmable { return null; } - return new CropBlock(world, StackUtils.getBlock(fruit), fruit.getItemDamage(), new Vect(x, y, z)); + return new CropBlock(world, ItemStackUtil.getBlock(fruit), fruit.getItemDamage(), new Vect(x, y, z)); } @Override @@ -70,7 +70,7 @@ public class FarmableGourd implements IFarmable { @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, StackUtils.getBlock(stem), 0, Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, ItemStackUtil.getBlock(stem), 0, Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/farming/logic/FarmableStacked.java b/src/main/java/forestry/farming/logic/FarmableStacked.java index b2a2c8a17..aea4af2a3 100755 --- a/src/main/java/forestry/farming/logic/FarmableStacked.java +++ b/src/main/java/forestry/farming/logic/FarmableStacked.java @@ -17,9 +17,9 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.config.Defaults; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.config.Constants; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmableStacked implements IFarmable { @@ -48,12 +48,12 @@ public class FarmableStacked implements IFarmable { @Override public boolean isGermling(ItemStack itemstack) { - return StackUtils.equals(block, itemstack); + return ItemStackUtil.equals(block, itemstack); } @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Defaults.FLAG_BLOCK_SYNCH); + return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java index b950a8239..ccea3357a 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java @@ -19,8 +19,8 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.core.config.ForestryBlock; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; -import forestry.core.vect.Vect; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.vect.Vect; public class FarmableVanillaShroom extends FarmableGenericSapling { @@ -42,7 +42,7 @@ public class FarmableVanillaShroom extends FarmableGenericSapling { @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { int meta = 0; - if (StackUtils.equals(Blocks.red_mushroom, germling)) { + if (ItemStackUtil.equals(Blocks.red_mushroom, germling)) { meta = 1; } diff --git a/src/main/java/forestry/farming/multiblock/FakeFarmController.java b/src/main/java/forestry/farming/multiblock/FakeFarmController.java index fdbd1c8b2..f935f7c15 100644 --- a/src/main/java/forestry/farming/multiblock/FakeFarmController.java +++ b/src/main/java/forestry/farming/multiblock/FakeFarmController.java @@ -26,16 +26,16 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmInventory; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; -import forestry.core.delegates.FakeAccessHandler; -import forestry.core.delegates.FakeErrorLogic; +import forestry.core.access.EnumAccess; +import forestry.core.access.FakeAccessHandler; +import forestry.core.access.IAccessHandler; +import forestry.core.errors.FakeErrorLogic; import forestry.core.fluids.FakeTankManager; import forestry.core.fluids.ITankManager; -import forestry.core.interfaces.IAccessHandler; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.utils.EnumAccess; import forestry.farming.gui.IFarmLedgerDelegate; import io.netty.util.internal.EmptyArrays; diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 5189b0e70..cc61e76dc 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -46,9 +46,10 @@ import forestry.api.farming.IFarmInventory; import forestry.api.farming.IFarmListener; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; -import forestry.core.EnumErrorCode; +import forestry.core.access.EnumAccess; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; @@ -64,14 +65,14 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketGuiUpdate; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumAccess; -import forestry.core.vect.Vect; -import forestry.core.vect.VectUtil; +import forestry.core.utils.Log; +import forestry.core.utils.vect.Vect; +import forestry.core.utils.vect.VectUtil; import forestry.farming.FarmHelper; import forestry.farming.FarmTarget; -import forestry.farming.gadgets.StructureLogicFarm; import forestry.farming.gui.IFarmLedgerDelegate; import forestry.farming.logic.FarmLogicArboreal; +import forestry.farming.tiles.TileGearbox; public class FarmController extends RectangularMultiblockControllerBase implements IFarmController { @@ -124,10 +125,10 @@ public class FarmController extends RectangularMultiblockControllerBase implemen private BiomeGenBase cachedBiome; - protected FarmController(World world) { + public FarmController(World world) { super(world); - FilteredTank liquidTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); + FilteredTank liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); this.tankManager = new TankManager(liquidTank); this.inventory = new FarmInventory(this); @@ -565,7 +566,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen } Block platform = VectUtil.getBlock(world, groundLocation); - if (!StructureLogicFarm.bricks.contains(platform)) { + if (!FarmHelper.bricks.contains(platform)) { break; } @@ -581,7 +582,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen for (int yOffset = 2; yOffset > -4; yOffset--) { Vect position = targetPosition.add(0, yOffset, 0); Block ground = VectUtil.getBlock(world, position); - if (StructureLogicFarm.bricks.contains(ground)) { + if (FarmHelper.bricks.contains(ground)) { return position; } } @@ -746,7 +747,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen Collection harvested = crop.harvest(); if (harvested == null) { - Proxies.log.fine("Failed to harvest crop: " + crop.toString()); + Log.fine("Failed to harvest crop: " + crop.toString()); return true; } diff --git a/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java b/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java index c7a98a285..ed6dda7e0 100644 --- a/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java +++ b/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java @@ -15,7 +15,7 @@ import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INBTTagable; -import forestry.core.GameMode; +import forestry.core.config.GameMode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; diff --git a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java index c2d3dc15e..9078db1cc 100644 --- a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java +++ b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java @@ -16,10 +16,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import forestry.api.core.INBTTagable; -import forestry.core.interfaces.IClimatised; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; +import forestry.core.tiles.IClimatised; import forestry.farming.gui.IFarmLedgerDelegate; public class FarmHydrationManager implements IFarmLedgerDelegate, INBTTagable, IStreamable { diff --git a/src/main/java/forestry/farming/multiblock/FarmInventory.java b/src/main/java/forestry/farming/multiblock/FarmInventory.java index 2c2b7c95d..6ea880ad2 100644 --- a/src/main/java/forestry/farming/multiblock/FarmInventory.java +++ b/src/main/java/forestry/farming/multiblock/FarmInventory.java @@ -24,12 +24,12 @@ import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapterRestricted; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.SlotUtil; import forestry.plugins.PluginFarming; public class FarmInventory extends InventoryAdapterRestricted implements IFarmInventory { @@ -66,13 +66,13 @@ public class FarmInventory extends InventoryAdapterRestricted implements IFarmIn @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (Utils.isIndexInRange(slotIndex, SLOT_FERTILIZER, SLOT_FERTILIZER_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_FERTILIZER, SLOT_FERTILIZER_COUNT)) { return acceptsAsFertilizer(itemStack); - } else if (Utils.isIndexInRange(slotIndex, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT)) { return acceptsAsGermling(itemStack); - } else if (Utils.isIndexInRange(slotIndex, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT)) { return acceptsAsResource(itemStack); - } else if (Utils.isIndexInRange(slotIndex, SLOT_CAN, SLOT_CAN_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, SLOT_CAN, SLOT_CAN_COUNT)) { Fluid fluid = FluidHelper.getFluidInContainer(itemStack); return farmController.getTankManager().accepts(fluid); } @@ -81,18 +81,18 @@ public class FarmInventory extends InventoryAdapterRestricted implements IFarmIn @Override public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { - return Utils.isIndexInRange(slotIndex, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT); + return SlotUtil.isSlotInRange(slotIndex, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT); } @Override public boolean hasResources(ItemStack[] resources) { - return InvTools.contains(resourcesInventory, resources); + return InventoryUtil.contains(resourcesInventory, resources); } @Override public void removeResources(ItemStack[] resources) { EntityPlayer player = Proxies.common.getPlayer(farmController.getWorld(), farmController.getAccessHandler().getOwner()); - InvTools.removeSets(resourcesInventory, 1, resources, player, false, true); + InventoryUtil.removeSets(resourcesInventory, 1, resources, player, false, true); } @Override @@ -133,7 +133,7 @@ public class FarmInventory extends InventoryAdapterRestricted implements IFarmIn return false; } - return StackUtils.isIdenticalItem(PluginFarming.farmFertilizer, itemstack); + return ItemStackUtil.isIdenticalItem(PluginFarming.farmFertilizer, itemstack); } @Override @@ -180,7 +180,7 @@ public class FarmInventory extends InventoryAdapterRestricted implements IFarmIn public void addProduce(ItemStack produce) { if (acceptsAsGermling(produce)) { - produce.stackSize -= InvTools.addStack(germlingsInventory, produce, true); + produce.stackSize -= InventoryUtil.addStack(germlingsInventory, produce, true); } if (produce.stackSize <= 0) { @@ -188,28 +188,28 @@ public class FarmInventory extends InventoryAdapterRestricted implements IFarmIn } if (acceptsAsResource(produce)) { - produce.stackSize -= InvTools.addStack(resourcesInventory, produce, true); + produce.stackSize -= InventoryUtil.addStack(resourcesInventory, produce, true); } if (produce.stackSize <= 0) { return; } - produce.stackSize -= InvTools.addStack(productInventory, produce, true); + produce.stackSize -= InventoryUtil.addStack(productInventory, produce, true); } public void stowHarvest(Iterable harvested, Stack pendingProduce) { for (ItemStack harvest : harvested) { if (acceptsAsGermling(harvest)) { - harvest.stackSize -= InvTools.addStack(germlingsInventory, harvest, true); + harvest.stackSize -= InventoryUtil.addStack(germlingsInventory, harvest, true); } if (harvest.stackSize <= 0) { continue; } - harvest.stackSize -= InvTools.addStack(productInventory, harvest, true); + harvest.stackSize -= InventoryUtil.addStack(productInventory, harvest, true); if (harvest.stackSize <= 0) { continue; @@ -223,7 +223,7 @@ public class FarmInventory extends InventoryAdapterRestricted implements IFarmIn IInventory productInventory = getProductInventory(); ItemStack next = pendingProduce.peek(); - boolean added = InvTools.tryAddStack(productInventory, next, true, true); + boolean added = InventoryUtil.tryAddStack(productInventory, next, true, true); if (added) { pendingProduce.pop(); diff --git a/src/main/java/forestry/farming/multiblock/IFarmController.java b/src/main/java/forestry/farming/multiblock/IFarmController.java index b4a192795..2a42677fa 100644 --- a/src/main/java/forestry/farming/multiblock/IFarmController.java +++ b/src/main/java/forestry/farming/multiblock/IFarmController.java @@ -14,9 +14,9 @@ import forestry.api.core.IErrorLogicSource; import forestry.api.farming.IFarmHousing; import forestry.core.circuits.ISocketable; import forestry.core.fluids.ITankManager; -import forestry.core.interfaces.IClimatised; -import forestry.core.interfaces.IRestrictedAccessTile; import forestry.core.inventory.IInventoryAdapter; +import forestry.core.tiles.IClimatised; +import forestry.core.tiles.IRestrictedAccessTile; import forestry.farming.gui.IFarmLedgerDelegate; public interface IFarmController extends IFarmHousing, ISocketable, IClimatised, IRestrictedAccessTile, IErrorLogicSource { diff --git a/src/main/java/forestry/farming/proxy/ClientProxyFarming.java b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java old mode 100755 new mode 100644 similarity index 79% rename from src/main/java/forestry/farming/proxy/ClientProxyFarming.java rename to src/main/java/forestry/farming/proxy/ProxyFarmingClient.java index 7f290ecdf..3b1f84152 --- a/src/main/java/forestry/farming/proxy/ClientProxyFarming.java +++ b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java @@ -16,17 +16,17 @@ import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.RenderingRegistry; import forestry.core.config.ForestryBlock; -import forestry.farming.render.FarmItemRenderer; -import forestry.farming.render.FarmRenderingHandler; +import forestry.farming.render.RenderFarmBlock; +import forestry.farming.render.RenderFarmItem; import forestry.plugins.PluginFarming; -public class ClientProxyFarming extends ProxyFarming { +public class ProxyFarmingClient extends ProxyFarming { @Override public void initializeRendering() { PluginFarming.modelIdFarmBlock = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new FarmRenderingHandler()); - MinecraftForgeClient.registerItemRenderer(ForestryBlock.farm.item(), new FarmItemRenderer()); + RenderingRegistry.registerBlockHandler(new RenderFarmBlock()); + MinecraftForgeClient.registerItemRenderer(ForestryBlock.farm.item(), new RenderFarmItem()); } } diff --git a/src/main/java/forestry/farming/multiblock/EnumFarmBlockTexture.java b/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java similarity index 98% rename from src/main/java/forestry/farming/multiblock/EnumFarmBlockTexture.java rename to src/main/java/forestry/farming/render/EnumFarmBlockTexture.java index e7f802772..d9598824d 100644 --- a/src/main/java/forestry/farming/multiblock/EnumFarmBlockTexture.java +++ b/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.render; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/forestry/farming/render/FarmRenderingHandler.java b/src/main/java/forestry/farming/render/RenderFarmBlock.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/farming/render/FarmRenderingHandler.java rename to src/main/java/forestry/farming/render/RenderFarmBlock.java index 1056e0d0d..3fe6c0e8d --- a/src/main/java/forestry/farming/render/FarmRenderingHandler.java +++ b/src/main/java/forestry/farming/render/RenderFarmBlock.java @@ -15,11 +15,11 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import forestry.core.config.ForestryBlock; -import forestry.core.render.OverlayRenderingHandler; -import forestry.farming.multiblock.BlockFarm; +import forestry.core.render.RenderOverlayBlock; +import forestry.farming.blocks.BlockFarm; import forestry.plugins.PluginFarming; -public class FarmRenderingHandler extends OverlayRenderingHandler { +public class RenderFarmBlock extends RenderOverlayBlock { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { diff --git a/src/main/java/forestry/farming/render/FarmItemRenderer.java b/src/main/java/forestry/farming/render/RenderFarmItem.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/farming/render/FarmItemRenderer.java rename to src/main/java/forestry/farming/render/RenderFarmItem.java index f2e677fce..dcdf6abb2 --- a/src/main/java/forestry/farming/render/FarmItemRenderer.java +++ b/src/main/java/forestry/farming/render/RenderFarmItem.java @@ -18,11 +18,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import forestry.core.utils.StackUtils; -import forestry.farming.multiblock.BlockFarm; -import forestry.farming.multiblock.EnumFarmBlockTexture; +import forestry.core.utils.ItemStackUtil; +import forestry.farming.blocks.BlockFarm; -public class FarmItemRenderer implements IItemRenderer { +public class RenderFarmItem implements IItemRenderer { private static void renderFarmBlock(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushAttrib(GL11.GL_ENABLE_BIT); @@ -31,7 +30,7 @@ public class FarmItemRenderer implements IItemRenderer { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Tessellator tessellator = Tessellator.instance; - BlockFarm block = (BlockFarm) StackUtils.getBlock(item); + BlockFarm block = (BlockFarm) ItemStackUtil.getBlock(item); if (block == null) { return; } diff --git a/src/main/java/forestry/farming/multiblock/TileControl.java b/src/main/java/forestry/farming/tiles/TileControl.java similarity index 96% rename from src/main/java/forestry/farming/multiblock/TileControl.java rename to src/main/java/forestry/farming/tiles/TileControl.java index 261925289..741d02ac8 100644 --- a/src/main/java/forestry/farming/multiblock/TileControl.java +++ b/src/main/java/forestry/farming/tiles/TileControl.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.tiles; import net.minecraft.world.World; @@ -19,7 +19,7 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmComponent; import forestry.api.farming.IFarmListener; import forestry.api.farming.IFarmLogic; -import forestry.core.vect.Vect; +import forestry.core.utils.vect.Vect; public class TileControl extends TileFarm implements IFarmComponent.Listener { diff --git a/src/main/java/forestry/farming/multiblock/TileFarm.java b/src/main/java/forestry/farming/tiles/TileFarm.java similarity index 95% rename from src/main/java/forestry/farming/multiblock/TileFarm.java rename to src/main/java/forestry/farming/tiles/TileFarm.java index 4827fa0aa..a5b7090ba 100644 --- a/src/main/java/forestry/farming/multiblock/TileFarm.java +++ b/src/main/java/forestry/farming/tiles/TileFarm.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.tiles; import java.io.IOException; @@ -24,7 +24,7 @@ import forestry.api.core.IErrorLogicSource; import forestry.api.farming.IFarmComponent; import forestry.core.circuits.ISocketable; import forestry.core.config.Config; -import forestry.core.interfaces.IHintSource; +import forestry.core.gui.IHintSource; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.MultiblockControllerBase; import forestry.core.multiblock.MultiblockValidationException; @@ -33,6 +33,10 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.network.IStreamableGui; +import forestry.farming.multiblock.FakeFarmController; +import forestry.farming.multiblock.FarmController; +import forestry.farming.multiblock.IFarmController; +import forestry.farming.render.EnumFarmBlockTexture; public abstract class TileFarm extends RectangularMultiblockTileEntityBase implements IFarmComponent, IHintSource, ISocketable, IStreamableGui, IErrorLogicSource { diff --git a/src/main/java/forestry/farming/multiblock/TileFarmPlain.java b/src/main/java/forestry/farming/tiles/TileFarmPlain.java similarity index 96% rename from src/main/java/forestry/farming/multiblock/TileFarmPlain.java rename to src/main/java/forestry/farming/tiles/TileFarmPlain.java index a1f7057c1..e2cbaa2e2 100644 --- a/src/main/java/forestry/farming/multiblock/TileFarmPlain.java +++ b/src/main/java/forestry/farming/tiles/TileFarmPlain.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.tiles; import forestry.core.multiblock.MultiblockControllerBase; diff --git a/src/main/java/forestry/farming/multiblock/TileGearbox.java b/src/main/java/forestry/farming/tiles/TileGearbox.java similarity index 95% rename from src/main/java/forestry/farming/multiblock/TileGearbox.java rename to src/main/java/forestry/farming/tiles/TileGearbox.java index 2745d6d62..b42e7bacf 100644 --- a/src/main/java/forestry/farming/multiblock/TileGearbox.java +++ b/src/main/java/forestry/farming/tiles/TileGearbox.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.tiles; import net.minecraft.nbt.NBTTagCompound; @@ -16,9 +16,10 @@ import net.minecraftforge.common.util.ForgeDirection; import forestry.api.core.IErrorLogic; import forestry.api.farming.IFarmComponent; -import forestry.core.EnumErrorCode; -import forestry.core.interfaces.IPowerHandler; +import forestry.core.errors.EnumErrorCode; +import forestry.core.tiles.IPowerHandler; import forestry.energy.EnergyManager; +import forestry.farming.multiblock.IFarmController; public class TileGearbox extends TileFarm implements IPowerHandler, IFarmComponent.Active { diff --git a/src/main/java/forestry/farming/multiblock/TileHatch.java b/src/main/java/forestry/farming/tiles/TileHatch.java similarity index 88% rename from src/main/java/forestry/farming/multiblock/TileHatch.java rename to src/main/java/forestry/farming/tiles/TileHatch.java index f5e8340ca..5b2b24300 100644 --- a/src/main/java/forestry/farming/multiblock/TileHatch.java +++ b/src/main/java/forestry/farming/tiles/TileHatch.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.tiles; import java.util.Collection; import java.util.Collections; @@ -23,9 +23,8 @@ import cpw.mods.fml.common.Optional; import forestry.api.farming.IFarmComponent; import forestry.core.inventory.AdjacentInventoryCache; -import forestry.core.inventory.ITileFilter; -import forestry.core.inventory.InvTools; -import forestry.core.utils.AdjacentTileCache; +import forestry.core.tiles.AdjacentTileCache; +import forestry.core.utils.InventoryUtil; import forestry.farming.triggers.FarmingTriggers; import buildcraft.api.statements.IStatementContainer; @@ -43,7 +42,7 @@ public class TileHatch extends TileFarm implements ISidedInventory, IFarmCompone public TileHatch() { this.tileCache = new AdjacentTileCache(this); - this.inventoryCache = new AdjacentInventoryCache(this, tileCache, new ITileFilter() { + this.inventoryCache = new AdjacentInventoryCache(this, tileCache, new AdjacentInventoryCache.ITileFilter() { @Override public boolean matches(TileEntity tile) { return !(tile instanceof TileFarm) && tile.yCoord < yCoord; @@ -61,8 +60,8 @@ public class TileHatch extends TileFarm implements ISidedInventory, IFarmCompone if (tickCount % 40 == 0) { IInventory productInventory = getFarmController().getFarmInventory().getProductInventory(); - if (!InvTools.moveOneItemToPipe(productInventory, tileCache, dumpDirections)) { - InvTools.moveItemStack(productInventory, inventoryCache.getAdjacentInventories()); + if (!InventoryUtil.moveOneItemToPipe(productInventory, tileCache, dumpDirections)) { + InventoryUtil.moveItemStack(productInventory, inventoryCache.getAdjacentInventories()); } } } diff --git a/src/main/java/forestry/farming/multiblock/TileValve.java b/src/main/java/forestry/farming/tiles/TileValve.java similarity index 92% rename from src/main/java/forestry/farming/multiblock/TileValve.java rename to src/main/java/forestry/farming/tiles/TileValve.java index c52e5bf8a..25571a12f 100644 --- a/src/main/java/forestry/farming/multiblock/TileValve.java +++ b/src/main/java/forestry/farming/tiles/TileValve.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.multiblock; +package forestry.farming.tiles; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -19,9 +19,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import forestry.core.fluids.ITankManager; -import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.tiles.ILiquidTankTile; -public class TileValve extends TileFarm implements ILiquidTankContainer { +public class TileValve extends TileFarm implements ILiquidTankTile { /* ILIQUIDTANKCONTAINER */ @Override diff --git a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java index 510c8146e..4a77ce9ea 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java @@ -15,9 +15,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.inventory.InvTools; import forestry.core.triggers.Trigger; -import forestry.farming.multiblock.TileHatch; +import forestry.core.utils.InventoryUtil; +import forestry.farming.tiles.TileHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -44,6 +44,6 @@ public class TriggerLowFertilizer extends Trigger { TileHatch tileHatch = (TileHatch) tile; IInventory fertilizerInventory = tileHatch.getFarmController().getFarmInventory().getFertilizerInventory(); - return InvTools.containsPercent(fertilizerInventory, threshold); + return InventoryUtil.containsPercent(fertilizerInventory, threshold); } } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java index e22c5e029..8857db06b 100644 --- a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java @@ -15,9 +15,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.inventory.InvTools; import forestry.core.triggers.Trigger; -import forestry.farming.multiblock.TileHatch; +import forestry.core.utils.InventoryUtil; +import forestry.farming.tiles.TileHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -47,6 +47,6 @@ public class TriggerLowGermlings extends Trigger { TileHatch tileHatch = (TileHatch) tile; IInventory germlingsInventory = tileHatch.getFarmController().getFarmInventory().getGermlingsInventory(); - return InvTools.containsPercent(germlingsInventory, threshold); + return InventoryUtil.containsPercent(germlingsInventory, threshold); } } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java index 636cb2378..2ccfb45b8 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.IFluidTank; import forestry.core.fluids.ITankManager; import forestry.core.triggers.Trigger; -import forestry.farming.multiblock.TileHatch; +import forestry.farming.tiles.TileHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java index 53d7d0914..d61d8ba84 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java @@ -17,10 +17,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.IFarmInventory; -import forestry.core.inventory.InvTools; import forestry.core.triggers.Trigger; +import forestry.core.utils.InventoryUtil; import forestry.farming.multiblock.IFarmController; -import forestry.farming.multiblock.TileHatch; +import forestry.farming.tiles.TileHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -70,7 +70,7 @@ public class TriggerLowSoil extends Trigger { if (parameter == null || parameter.getItemStack() == null) { IInventory resourcesInventory = farmInventory.getResourcesInventory(); - return InvTools.containsPercent(resourcesInventory, threshold); + return InventoryUtil.containsPercent(resourcesInventory, threshold); } else { ItemStack filter = parameter.getItemStack().copy(); filter.stackSize = threshold; diff --git a/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java b/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java index dd3863ca8..eb8fd4a4c 100755 --- a/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java +++ b/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java @@ -21,7 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; // Referenced classes of package net.minecraft.src: // WorldGenerator, World, Block, BlockLeaves, @@ -48,7 +48,7 @@ public class WorldGenBigMushroom extends WorldGenerator { int height = random.nextInt(1) + 2; boolean flag = true; - if (y < 1 || y + height + 1 > Defaults.WORLD_HEIGHT) { + if (y < 1 || y + height + 1 > Constants.WORLD_HEIGHT) { return false; } @@ -60,7 +60,7 @@ public class WorldGenBigMushroom extends WorldGenerator { for (int j = x - offset; j <= x + offset && flag; j++) { for (int k = z - offset; k <= z + offset && flag; k++) { - if (i >= 0 && i < Defaults.WORLD_HEIGHT) { + if (i >= 0 && i < Constants.WORLD_HEIGHT) { Block block = world.getBlock(j, i, k); if (!block.isAir(world, j, i, k) && block != Blocks.leaves) { flag = false; diff --git a/src/main/java/forestry/food/gui/GuiInfuser.java b/src/main/java/forestry/food/gui/GuiInfuser.java index 908d9d13a..e847c66af 100755 --- a/src/main/java/forestry/food/gui/GuiInfuser.java +++ b/src/main/java/forestry/food/gui/GuiInfuser.java @@ -13,7 +13,7 @@ package forestry.food.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.api.food.BeverageManager; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.food.items.ItemInfuser.InfuserInventory; @@ -23,7 +23,7 @@ public class GuiInfuser extends GuiForestry private int startY; public GuiInfuser(InventoryPlayer inventoryplayer, InfuserInventory inventory) { - super(Defaults.TEXTURE_PATH_GUI + "/infuser.png", new ContainerInfuser(inventoryplayer, inventory), inventory); + super(Constants.TEXTURE_PATH_GUI + "/infuser.png", new ContainerInfuser(inventoryplayer, inventory), inventory); xSize = 176; ySize = 185; diff --git a/src/main/java/forestry/food/items/ItemAmbrosia.java b/src/main/java/forestry/food/items/ItemAmbrosia.java index 171f68fc1..0bbaed4ba 100755 --- a/src/main/java/forestry/food/items/ItemAmbrosia.java +++ b/src/main/java/forestry/food/items/ItemAmbrosia.java @@ -13,13 +13,13 @@ package forestry.food.items; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.items.ItemForestryFood; public class ItemAmbrosia extends ItemForestryFood { public ItemAmbrosia() { - super(Defaults.FOOD_AMBROSIA_HEAL, 0.6f); + super(Constants.FOOD_AMBROSIA_HEAL, 0.6f); setAlwaysEdible(); setPotionEffect(Potion.regeneration.id, 40, 0, 1.0F); } diff --git a/src/main/java/forestry/lepidopterology/ButterflySpawner.java b/src/main/java/forestry/lepidopterology/ButterflySpawner.java index ac8611fc9..90d3f47bf 100755 --- a/src/main/java/forestry/lepidopterology/ButterflySpawner.java +++ b/src/main/java/forestry/lepidopterology/ButterflySpawner.java @@ -15,7 +15,7 @@ import net.minecraft.world.World; import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; import forestry.api.lepidopterology.IButterfly; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; import forestry.lepidopterology.entities.EntityButterfly; import forestry.plugins.PluginLepidopterology; @@ -56,7 +56,7 @@ public class ButterflySpawner implements ILeafTickHandler { private static void attemptButterflySpawn(World world, IButterfly butterfly, double x, double y, double z) { if (PluginLepidopterology.butterflyInterface.spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.1f, z) != null) { - Proxies.log.finest("Spawned a butterfly '%s' at %s/%s/%s.", butterfly.getDisplayName(), x, y, z); + Log.finest("Spawned a butterfly '%s' at %s/%s/%s.", butterfly.getDisplayName(), x, y, z); } } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java index e6759e8d0..0d9f362f1 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -49,7 +49,7 @@ public class AIButterflyMate extends AIButterflyInteract { IButterflyNursery nursery = (IButterflyNursery) tile; if (nursery.canNurse(entity.getButterfly())) { nursery.setCaterpillar(entity.getButterfly().spawnCaterpillar(nursery)); - // Proxies.log.finest("A butterfly '%s' laid an egg at %s/%s/%s.", entity.getButterfly().getIdent(), rest.posX, rest.posY, rest.posZ); + // Log.finest("A butterfly '%s' laid an egg at %s/%s/%s.", entity.getButterfly().getIdent(), rest.posX, rest.posY, rest.posZ); if (entity.getRNG().nextFloat() < 1.0f / entity.getButterfly().getGenome().getFertility()) { entity.setHealth(0); } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java index c8999757b..a94acdc2d 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java @@ -11,8 +11,8 @@ package forestry.lepidopterology.entities; import forestry.api.genetics.IPollinatable; -import forestry.arboriculture.genetics.FakePollinatable; -import forestry.arboriculture.genetics.ICheckPollinatable; +import forestry.arboriculture.genetics.pollination.FakePollinatable; +import forestry.arboriculture.genetics.pollination.ICheckPollinatable; import forestry.core.utils.GeneticsUtil; import forestry.plugins.PluginLepidopterology; @@ -50,12 +50,12 @@ public class AIButterflyPollinate extends AIButterflyInteract { if (checkPollinatable != null) { if (entity.getPollen() == null) { entity.setPollen(checkPollinatable.getPollen()); - // Proxies.log.finest("A butterfly '%s' grabbed a pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); + // Log.finest("A butterfly '%s' grabbed a pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); } else if (checkPollinatable.canMateWith(entity.getPollen())) { IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(null, entity.worldObj, rest.posX, rest.posY, rest.posZ); if (realPollinatable != null) { realPollinatable.mateWith(entity.getPollen()); - // Proxies.log.finest("A butterfly '%s' unloaded pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); + // Log.finest("A butterfly '%s' unloaded pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); entity.setPollen(null); } } diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index 416c7840e..460bf8cb0 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -45,9 +45,9 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IEntityButterfly; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; import forestry.lepidopterology.genetics.Butterfly; -import forestry.lepidopterology.render.ButterflyItemRenderer; +import forestry.lepidopterology.render.RenderButterflyItem; import forestry.plugins.PluginLepidopterology; public class EntityButterfly extends EntityCreature implements IEntityButterfly { @@ -70,7 +70,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly long flapping = systemTime + entity.contained.getIdent().hashCode(); float flap = (float) (flapping % 1000) / 1000; // 0 to 1 - return ButterflyItemRenderer.getIrregularWingYaw(flapping, flap); + return RenderButterflyItem.getIrregularWingYaw(flapping, flap); } else { return entity.ticksExisted + partialTicktime; } @@ -84,7 +84,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly private static final int DATAWATCHER_ID_SCALE = 17; private static final int DATAWATCHER_ID_STATE = 18; - //private static final String DEFAULT_TEXTURE = Defaults.TEXTURE_PATH_ENTITIES + "/butterflies/mothBrimstone.png"; + //private static final String DEFAULT_TEXTURE = Constants.TEXTURE_PATH_ENTITIES + "/butterflies/mothBrimstone.png"; public static final float DEFAULT_BUTTERFLY_SCALE = 0.75f; private static final EnumButterflyState DEFAULT_STATE = EnumButterflyState.FLYING; @@ -409,7 +409,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly if (Proxies.common.isSimulating(worldObj)) { contained.getGenome().getPrimary().getRoot().getBreedingTracker(worldObj, player.getGameProfile()).registerCatch(contained); - StackUtils.dropItemStackAsEntity(PluginLepidopterology.butterflyInterface.getMemberStack(contained.copy(), EnumFlutterType.BUTTERFLY.ordinal()), worldObj, posX, posY, posZ); + ItemStackUtil.dropItemStackAsEntity(PluginLepidopterology.butterflyInterface.getMemberStack(contained.copy(), EnumFlutterType.BUTTERFLY.ordinal()), worldObj, posX, posY, posZ); setDead(); } else { player.swingItem(); @@ -421,12 +421,12 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly @Override protected void dropFewItems(boolean playerKill, int lootLevel) { for (ItemStack stack : contained.getLootDrop(this, playerKill, lootLevel)) { - StackUtils.dropItemStackAsEntity(stack, worldObj, posX, posY, posZ); + ItemStackUtil.dropItemStackAsEntity(stack, worldObj, posX, posY, posZ); } // Drop pollen if any if (getPollen() != null) { - StackUtils.dropItemStackAsEntity(AlleleManager.alleleRegistry.getSpeciesRoot(getPollen().getClass()).getMemberStack(getPollen(), EnumGermlingType.POLLEN.ordinal()), worldObj, posX, posY, posZ); + ItemStackUtil.dropItemStackAsEntity(AlleleManager.alleleRegistry.getSpeciesRoot(getPollen().getClass()).getMemberStack(getPollen(), EnumGermlingType.POLLEN.ordinal()), worldObj, posX, posY, posZ); } } diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java index 5054776b6..6dfea715d 100755 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java @@ -32,7 +32,7 @@ import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterflyRoot; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleSpecies; import forestry.plugins.PluginLepidopterology; @@ -52,7 +52,7 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt public AlleleButterflySpecies(String uid, boolean isDominant, String speciesName, IClassification branch, String binomial, int serumColour) { super("forestry." + uid, getUnlocalizedName(speciesName, branch), "Sengir", "for.description." + uid, isDominant, branch, binomial, true); this.serumColour = serumColour; - texture = "forestry:" + Defaults.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png"; + texture = "forestry:" + Constants.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png"; } private static String getUnlocalizedName(String name, IClassification branch) { diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java index 7ae49c9a7..9edc9a00e 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java @@ -37,7 +37,7 @@ import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.config.ForestryItem; import forestry.core.genetics.SpeciesRoot; -import forestry.core.utils.Utils; +import forestry.core.utils.EntityUtil; import forestry.lepidopterology.entities.EntityButterfly; import forestry.plugins.PluginLepidopterology; @@ -148,7 +148,7 @@ public class ButterflyHelper extends SpeciesRoot implements IButterflyRoot { @Override public EntityButterfly spawnButterflyInWorld(World world, IButterfly butterfly, double x, double y, double z) { - return Utils.spawnEntity(world, new EntityButterfly(world, butterfly), x, y, z); + return EntityUtil.spawnEntity(world, new EntityButterfly(world, butterfly), x, y, z); } @Override diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 70909298a..6713298eb 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -38,7 +38,7 @@ import forestry.core.genetics.ItemGE; import forestry.core.network.PacketFXSignal; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; -import forestry.core.utils.Utils; +import forestry.core.utils.EntityUtil; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.genetics.ButterflyGenome; import forestry.plugins.PluginLepidopterology; @@ -133,7 +133,7 @@ public class ItemButterflyGE extends ItemGE { return false; } - if (Utils.spawnEntity(entityItem.worldObj, new EntityButterfly(entityItem.worldObj, butterfly), entityItem.posX, entityItem.posY, entityItem.posZ) != null) { + if (EntityUtil.spawnEntity(entityItem.worldObj, new EntityButterfly(entityItem.worldObj, butterfly), entityItem.posX, entityItem.posY, entityItem.posZ) != null) { if (entityItem.getEntityItem().stackSize > 1) { entityItem.getEntityItem().stackSize--; } else { diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java index 4172e6814..0b1628626 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java @@ -19,14 +19,13 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.api.lepidopterology.IButterfly; import forestry.core.config.Config; -import forestry.core.interfaces.IHintSource; -import forestry.core.inventory.AlyzerInventory; -import forestry.core.items.ItemInventoried; +import forestry.core.gui.IHintSource; +import forestry.core.items.ItemAlyzer; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.plugins.PluginLepidopterology; -public class ItemFlutterlyzer extends ItemInventoried { +public class ItemFlutterlyzer extends ItemAlyzer { public static class FlutterlyzerInventory extends AlyzerInventory implements IHintSource { diff --git a/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java old mode 100755 new mode 100644 similarity index 79% rename from src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java rename to src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java index 7783f8391..599151636 --- a/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java @@ -16,14 +16,14 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import forestry.core.config.ForestryItem; import forestry.lepidopterology.entities.EntityButterfly; -import forestry.lepidopterology.render.ButterflyItemRenderer; -import forestry.lepidopterology.render.RenderButterfly; +import forestry.lepidopterology.render.RenderButterflyEntity; +import forestry.lepidopterology.render.RenderButterflyItem; -public class ClientProxyLepidopterology extends ProxyLepidopterology { +public class ProxyLepidopterologyClient extends ProxyLepidopterology { @Override public void initializeRendering() { - RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterfly()); - MinecraftForgeClient.registerItemRenderer(ForestryItem.butterflyGE.item(), new ButterflyItemRenderer()); + RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity()); + MinecraftForgeClient.registerItemRenderer(ForestryItem.butterflyGE.item(), new RenderButterflyItem()); } } diff --git a/src/main/java/forestry/lepidopterology/MatingRecipe.java b/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/lepidopterology/MatingRecipe.java rename to src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java index 36d01f9f4..7203900b4 --- a/src/main/java/forestry/lepidopterology/MatingRecipe.java +++ b/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.lepidopterology; +package forestry.lepidopterology.recipes; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/lepidopterology/render/RenderButterfly.java b/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/lepidopterology/render/RenderButterfly.java rename to src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java index 8b640198a..b079e2121 --- a/src/main/java/forestry/lepidopterology/render/RenderButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java @@ -17,11 +17,11 @@ import net.minecraft.util.ResourceLocation; import forestry.lepidopterology.entities.EntityButterfly; -public class RenderButterfly extends RenderLiving { +public class RenderButterflyEntity extends RenderLiving { private final ModelButterfly butterflyModel; - public RenderButterfly() { + public RenderButterflyEntity() { super(new ModelButterfly(), 0.25f); butterflyModel = (ModelButterfly) mainModel; } diff --git a/src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java b/src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java rename to src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java index 02470a0cc..6c39993d0 --- a/src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java +++ b/src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java @@ -26,12 +26,12 @@ import forestry.core.proxy.Proxies; import forestry.lepidopterology.entities.EntityButterfly; import forestry.plugins.PluginLepidopterology; -public class ButterflyItemRenderer implements IItemRenderer { +public class RenderButterflyItem implements IItemRenderer { private final ModelButterfly model; private EntityButterfly entity; - public ButterflyItemRenderer() { + public RenderButterflyItem() { model = new ModelButterfly(); } diff --git a/src/main/java/forestry/lepidopterology/gadgets/TileLepidopteristChest.java b/src/main/java/forestry/lepidopterology/tiles/TileLepidopteristChest.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/lepidopterology/gadgets/TileLepidopteristChest.java rename to src/main/java/forestry/lepidopterology/tiles/TileLepidopteristChest.java index 5960d38bf..62c14240c --- a/src/main/java/forestry/lepidopterology/gadgets/TileLepidopteristChest.java +++ b/src/main/java/forestry/lepidopterology/tiles/TileLepidopteristChest.java @@ -8,11 +8,11 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.lepidopterology.gadgets; +package forestry.lepidopterology.tiles; import forestry.api.genetics.AlleleManager; -import forestry.core.gadgets.TileNaturalistChest; import forestry.core.network.GuiId; +import forestry.core.tiles.TileNaturalistChest; public class TileLepidopteristChest extends TileNaturalistChest { diff --git a/src/main/java/forestry/mail/GuiHandlerMail.java b/src/main/java/forestry/mail/GuiHandlerMail.java index 4b6eff1d3..35ab68282 100755 --- a/src/main/java/forestry/mail/GuiHandlerMail.java +++ b/src/main/java/forestry/mail/GuiHandlerMail.java @@ -16,9 +16,6 @@ import net.minecraft.world.World; import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; -import forestry.mail.gadgets.MachineMailbox; -import forestry.mail.gadgets.MachinePhilatelist; -import forestry.mail.gadgets.MachineTrader; import forestry.mail.gui.ContainerCatalogue; import forestry.mail.gui.ContainerLetter; import forestry.mail.gui.ContainerMailbox; @@ -34,6 +31,9 @@ import forestry.mail.gui.GuiTrader; import forestry.mail.items.ItemCatalogue; import forestry.mail.items.ItemLetter; import forestry.mail.items.ItemLetter.LetterInventory; +import forestry.mail.tiles.TileMailbox; +import forestry.mail.tiles.TilePhilatelist; +import forestry.mail.tiles.TileTrader; public class GuiHandlerMail extends GuiHandlerBase { @@ -70,13 +70,13 @@ public class GuiHandlerMail extends GuiHandlerBase { } case MailboxGUI: - return new GuiMailbox(player.inventory, getTile(world, x, y, z, player, MachineMailbox.class)); + return new GuiMailbox(player.inventory, getTile(world, x, y, z, player, TileMailbox.class)); case PhilatelistGUI: - return new GuiPhilatelist(player.inventory, getTile(world, x, y, z, player, MachinePhilatelist.class)); + return new GuiPhilatelist(player.inventory, getTile(world, x, y, z, player, TilePhilatelist.class)); case TraderGUI: - return new GuiTrader(player.inventory, getTile(world, x, y, z, player, MachineTrader.class)); + return new GuiTrader(player.inventory, getTile(world, x, y, z, player, TileTrader.class)); case TraderNameGUI: - return new GuiTradeName(getTile(world, x, y, z, player, MachineTrader.class)); + return new GuiTradeName(getTile(world, x, y, z, player, TileTrader.class)); default: return null; @@ -116,13 +116,13 @@ public class GuiHandlerMail extends GuiHandlerBase { } case MailboxGUI: - return new ContainerMailbox(player.inventory, getTile(world, x, y, z, player, MachineMailbox.class)); + return new ContainerMailbox(player.inventory, getTile(world, x, y, z, player, TileMailbox.class)); case PhilatelistGUI: - return new ContainerPhilatelist(player.inventory, getTile(world, x, y, z, player, MachinePhilatelist.class)); + return new ContainerPhilatelist(player.inventory, getTile(world, x, y, z, player, TilePhilatelist.class)); case TraderGUI: - return new ContainerTrader(player.inventory, getTile(world, x, y, z, player, MachineTrader.class)); + return new ContainerTrader(player.inventory, getTile(world, x, y, z, player, TileTrader.class)); case TraderNameGUI: - return new ContainerTradeName(getTile(world, x, y, z, player, MachineTrader.class)); + return new ContainerTradeName(getTile(world, x, y, z, player, TileTrader.class)); default: return null; diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index 983962a09..53cb39004 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -22,8 +22,8 @@ import forestry.api.core.INBTTagable; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; +import forestry.core.utils.InventoryUtil; import forestry.core.utils.StringUtil; public class Letter implements ILetter, INBTTagable { @@ -94,12 +94,12 @@ public class Letter implements ILetter, INBTTagable { @Override public ItemStack[] getPostage() { - return InvTools.getStacks(inventory, SLOT_POSTAGE_1, SLOT_POSTAGE_COUNT); + return InventoryUtil.getStacks(inventory, SLOT_POSTAGE_1, SLOT_POSTAGE_COUNT); } @Override public ItemStack[] getAttachments() { - return InvTools.getStacks(inventory, SLOT_ATTACHMENT_1, SLOT_ATTACHMENT_COUNT); + return InventoryUtil.getStacks(inventory, SLOT_ATTACHMENT_1, SLOT_ATTACHMENT_COUNT); } @Override @@ -118,7 +118,7 @@ public class Letter implements ILetter, INBTTagable { @Override public void addAttachment(ItemStack itemstack) { - InvTools.tryAddStack(inventory, itemstack, false); + InventoryUtil.tryAddStack(inventory, itemstack, false); } @Override @@ -186,7 +186,7 @@ public class Letter implements ILetter, INBTTagable { @Override public void addStamps(ItemStack stamps) { - InvTools.tryAddStack(inventory, stamps, SLOT_POSTAGE_1, 4, false); + InventoryUtil.tryAddStack(inventory, stamps, SLOT_POSTAGE_1, 4, false); } @Override diff --git a/src/main/java/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java index f2d509b4e..aa63809ec 100755 --- a/src/main/java/forestry/mail/POBox.java +++ b/src/main/java/forestry/mail/POBox.java @@ -19,8 +19,8 @@ import net.minecraft.world.WorldSavedData; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; import forestry.api.mail.PostManager; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; +import forestry.core.utils.InventoryUtil; public class POBox extends WorldSavedData implements IInventory { @@ -72,7 +72,7 @@ public class POBox extends WorldSavedData implements IInventory { this.markDirty(); - return InvTools.tryAddStack(letters, letterstack, true); + return InventoryUtil.tryAddStack(letters, letterstack, true); } public POBoxInfo getPOBoxInfo() { diff --git a/src/main/java/forestry/mail/PacketHandlerMail.java b/src/main/java/forestry/mail/PacketHandlerMail.java index c4ced3185..dcff0c114 100755 --- a/src/main/java/forestry/mail/PacketHandlerMail.java +++ b/src/main/java/forestry/mail/PacketHandlerMail.java @@ -21,7 +21,6 @@ import forestry.core.network.IPacketHandler; import forestry.core.network.PacketId; import forestry.core.network.PacketString; import forestry.core.proxy.Proxies; -import forestry.mail.gadgets.MachineTrader; import forestry.mail.gui.ContainerCatalogue; import forestry.mail.gui.ContainerLetter; import forestry.mail.gui.GuiMailboxInfo; @@ -29,6 +28,7 @@ import forestry.mail.network.PacketLetterInfo; import forestry.mail.network.PacketPOBoxInfo; import forestry.mail.network.PacketRequestLetterInfo; import forestry.mail.network.PacketTraderAddress; +import forestry.mail.tiles.TileTrader; public class PacketHandlerMail implements IPacketHandler { @@ -87,13 +87,13 @@ public class PacketHandlerMail implements IPacketHandler { private static void handleTradeAddressSet(EntityPlayer player, PacketTraderAddress packet) { TileEntity tile = packet.getTarget(player.worldObj); - if (!(tile instanceof MachineTrader)) { + if (!(tile instanceof TileTrader)) { return; } String addressName = packet.getAddressName(); - ((MachineTrader) tile).handleSetAddress(addressName); + ((TileTrader) tile).handleSetAddress(addressName); } private static void onLetterText(EntityPlayer player, PacketString packet) { diff --git a/src/main/java/forestry/mail/SaveEventHandlerMail.java b/src/main/java/forestry/mail/SaveEventHandlerMail.java index c29c9f6d8..0e993c214 100755 --- a/src/main/java/forestry/mail/SaveEventHandlerMail.java +++ b/src/main/java/forestry/mail/SaveEventHandlerMail.java @@ -12,7 +12,7 @@ package forestry.mail; import net.minecraft.world.World; -import forestry.core.interfaces.ISaveEventHandler; +import forestry.core.ISaveEventHandler; public class SaveEventHandlerMail implements ISaveEventHandler { diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index ec3330b37..0b2fbfeed 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -33,10 +33,10 @@ import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; import forestry.core.config.ForestryItem; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; +import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.SlotUtil; import forestry.mail.items.ItemLetter; public class TradeStation extends WorldSavedData implements ITradeStation, IInventoryAdapter { @@ -72,23 +72,23 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve @Override public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - return Utils.isIndexInRange(slot, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT); + return SlotUtil.isSlotInRange(slot, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT); } @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (Utils.isIndexInRange(slotIndex, SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { for (int i = 0; i < SLOT_TRADEGOOD_COUNT; i++) { ItemStack tradeGood = getStackInSlot(SLOT_TRADEGOOD + i); - if (StackUtils.isIdenticalItem(tradeGood, itemStack)) { + if (ItemStackUtil.isIdenticalItem(tradeGood, itemStack)) { return true; } } return false; - } else if (Utils.isIndexInRange(slotIndex, SLOT_LETTERS_1, SLOT_LETTERS_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, SLOT_LETTERS_1, SLOT_LETTERS_COUNT)) { Item item = itemStack.getItem(); return item == Items.paper; - } else if (Utils.isIndexInRange(slotIndex, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { Item item = itemStack.getItem(); return item instanceof IStamps; } @@ -199,7 +199,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve @Override public TradeStationInfo getTradeInfo() { - ItemStack[] condensedRequired = StackUtils.condenseStacks(InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); + ItemStack[] condensedRequired = ItemStackUtil.condenseStacks(InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); // Set current state EnumStationState state = EnumStationState.OK; @@ -235,7 +235,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve return EnumStationState.INSUFFICIENT_PAPER; } - int ordersToFill = StackUtils.containsSets(InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT), letter.getAttachments()); + int ordersToFill = ItemStackUtil.containsSets(InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT), letter.getAttachments()); // Not a single match. if (ordersToFill <= 0) { @@ -255,7 +255,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve } // Check for sufficient output buffer - int storable = countStorablePayment(ordersToFill, InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); + int storable = countStorablePayment(ordersToFill, InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); if (storable <= 0) { return EnumStationState.INSUFFICIENT_BUFFER; @@ -305,12 +305,12 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // Store received items for (int i = 0; i < ordersToFill; i++) { - for (ItemStack stack : InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)) { + for (ItemStack stack : InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)) { if (stack == null) { continue; } - InvTools.tryAddStack(inventory, stack.copy(), SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, false); + InventoryUtil.tryAddStack(inventory, stack.copy(), SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, false); } } @@ -352,7 +352,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // How many orders are fillable? float orderCount = 0; - for (ItemStack stack : InvTools.getStacks(inventory, SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { + for (ItemStack stack : InventoryUtil.getStacks(inventory, SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { if (stack != null && stack.isItemEqual(tradegood) && ItemStack.areItemStackTagsEqual(stack, tradegood)) { orderCount += (stack.stackSize / (float) tradegood.stackSize); if (orderCount >= max) { @@ -366,9 +366,9 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve public boolean canReceivePayment() { InventoryAdapter test = inventory.copy(); - ItemStack[] payment = InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); + ItemStack[] payment = InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); - return InvTools.tryAddStacksCopy(test, payment, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true); + return InventoryUtil.tryAddStacksCopy(test, payment, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true); } private int countStorablePayment(int max, ItemStack[] exchange) { @@ -377,7 +377,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve int count = 0; for (int i = 0; i < max; i++) { - if (InvTools.tryAddStacksCopy(test, exchange, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true)) { + if (InventoryUtil.tryAddStacksCopy(test, exchange, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true)) { count++; } else { break; @@ -420,7 +420,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve int amountFound = 0; - for (ItemStack stack : InvTools.getStacks(inventory, SLOT_LETTERS_1, SLOT_LETTERS_COUNT)) { + for (ItemStack stack : InventoryUtil.getStacks(inventory, SLOT_LETTERS_1, SLOT_LETTERS_COUNT)) { if (stack != null) { amountFound += stack.stackSize; } @@ -447,7 +447,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve private boolean canPayPostage(int postage) { int posted = 0; - for (ItemStack stamp : InvTools.getStacks(inventory, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { + for (ItemStack stamp : InventoryUtil.getStacks(inventory, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { if (stamp == null) { continue; } @@ -498,7 +498,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve private int getNumStamps(EnumPostage postage) { int count = 0; - for (ItemStack stamp : InvTools.getStacks(inventory, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { + for (ItemStack stamp : InventoryUtil.getStacks(inventory, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { if (stamp == null) { continue; } @@ -557,8 +557,8 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // Remove stuff until we are only left with the remnants for (int i = 0; i < filled; i++) { - ItemStack[] required = InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); - ItemStack[] condensedRequired = StackUtils.condenseStacks(required); + ItemStack[] required = InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); + ItemStack[] condensedRequired = ItemStackUtil.condenseStacks(required); for (ItemStack req : condensedRequired) { for (int j = 0; j < pool.length; j++) { ItemStack pol = pool[j]; diff --git a/src/main/java/forestry/mail/gui/ContainerMailbox.java b/src/main/java/forestry/mail/gui/ContainerMailbox.java index 34ae86ee0..7a7ac8ce2 100755 --- a/src/main/java/forestry/mail/gui/ContainerMailbox.java +++ b/src/main/java/forestry/mail/gui/ContainerMailbox.java @@ -18,20 +18,20 @@ import net.minecraft.item.ItemStack; import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotOutput; import forestry.core.proxy.Proxies; -import forestry.core.utils.Utils; +import forestry.core.utils.SlotUtil; import forestry.mail.POBox; import forestry.mail.POBoxInfo; -import forestry.mail.gadgets.MachineMailbox; import forestry.mail.network.PacketPOBoxInfo; +import forestry.mail.tiles.TileMailbox; -public class ContainerMailbox extends ContainerTile { +public class ContainerMailbox extends ContainerTile { public static final short SLOT_LETTERS = 0; public static final short SLOT_LETTERS_COUNT = 7 * 12; private final POBox mailInventory; - public ContainerMailbox(InventoryPlayer playerInventory, MachineMailbox tile) { + public ContainerMailbox(InventoryPlayer playerInventory, TileMailbox tile) { super(tile, playerInventory, 35, 145); IInventory inventory = tile.getOrCreateMailInventory(playerInventory.player.worldObj, playerInventory.player.getGameProfile()); @@ -52,7 +52,7 @@ public class ContainerMailbox extends ContainerTile { public ItemStack slotClick(int slotIndex, int button, int par3, EntityPlayer player) { ItemStack stack = super.slotClick(slotIndex, button, par3, player); - if (Utils.isIndexInRange(slotIndex, SLOT_LETTERS, SLOT_LETTERS_COUNT)) { + if (SlotUtil.isSlotInRange(slotIndex, SLOT_LETTERS, SLOT_LETTERS_COUNT)) { if (Proxies.common.isSimulating(player.worldObj) && mailInventory != null) { POBoxInfo info = mailInventory.getPOBoxInfo(); Proxies.net.sendToPlayer(new PacketPOBoxInfo(info), player); diff --git a/src/main/java/forestry/mail/gui/ContainerPhilatelist.java b/src/main/java/forestry/mail/gui/ContainerPhilatelist.java index a53fc1ecf..000f645cc 100755 --- a/src/main/java/forestry/mail/gui/ContainerPhilatelist.java +++ b/src/main/java/forestry/mail/gui/ContainerPhilatelist.java @@ -15,20 +15,20 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.mail.gadgets.MachinePhilatelist; +import forestry.mail.tiles.TilePhilatelist; -public class ContainerPhilatelist extends ContainerTile { +public class ContainerPhilatelist extends ContainerTile { - public ContainerPhilatelist(InventoryPlayer player, MachinePhilatelist tile) { + public ContainerPhilatelist(InventoryPlayer player, TilePhilatelist tile) { super(tile, player, 8, 111); // Filter - addSlotToContainer(new SlotFiltered(tile, MachinePhilatelist.SLOT_FILTER, 80, 19)); + addSlotToContainer(new SlotFiltered(tile, TilePhilatelist.SLOT_FILTER, 80, 19)); // Collected Stamps for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - addSlotToContainer(new SlotOutput(tile, j + i * 9 + MachinePhilatelist.SLOT_BUFFER_1, 8 + j * 18, 46 + i * 18)); + addSlotToContainer(new SlotOutput(tile, j + i * 9 + TilePhilatelist.SLOT_BUFFER_1, 8 + j * 18, 46 + i * 18)); } } } diff --git a/src/main/java/forestry/mail/gui/ContainerTradeName.java b/src/main/java/forestry/mail/gui/ContainerTradeName.java index 3d0f3bfba..d73947462 100755 --- a/src/main/java/forestry/mail/gui/ContainerTradeName.java +++ b/src/main/java/forestry/mail/gui/ContainerTradeName.java @@ -14,11 +14,11 @@ import net.minecraft.entity.player.EntityPlayer; import forestry.api.mail.IMailAddress; import forestry.core.gui.ContainerTile; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; -public class ContainerTradeName extends ContainerTile { +public class ContainerTradeName extends ContainerTile { - public ContainerTradeName(MachineTrader tile) { + public ContainerTradeName(TileTrader tile) { super(tile); } diff --git a/src/main/java/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java index 6521794d4..4ec08bc55 100755 --- a/src/main/java/forestry/mail/gui/ContainerTrader.java +++ b/src/main/java/forestry/mail/gui/ContainerTrader.java @@ -18,11 +18,11 @@ import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotForestry; import forestry.core.gui.slots.SlotOutput; import forestry.mail.TradeStation; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; -public class ContainerTrader extends ContainerTile { +public class ContainerTrader extends ContainerTile { - public ContainerTrader(InventoryPlayer player, MachineTrader tile) { + public ContainerTrader(InventoryPlayer player, TileTrader tile) { super(tile, player, 33, 138); // Trade good diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index a7bb19e94..7b963b06f 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -24,7 +24,7 @@ import forestry.api.mail.EnumAddressee; import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostalCarrier; import forestry.api.mail.PostManager; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.SessionVars; import forestry.core.gui.GuiForestry; import forestry.core.gui.GuiTextBox; @@ -49,7 +49,7 @@ public class GuiLetter extends GuiForestry { private final ArrayList tradeInfoWidgets; public GuiLetter(EntityPlayer player, LetterInventory inventory) { - super(Defaults.TEXTURE_PATH_GUI + "/letter.png", new ContainerLetter(player, inventory), inventory); + super(Constants.TEXTURE_PATH_GUI + "/letter.png", new ContainerLetter(player, inventory), inventory); this.xSize = 194; this.ySize = 227; diff --git a/src/main/java/forestry/mail/gui/GuiMailbox.java b/src/main/java/forestry/mail/gui/GuiMailbox.java index 20d660fa3..ba035cf1e 100755 --- a/src/main/java/forestry/mail/gui/GuiMailbox.java +++ b/src/main/java/forestry/mail/gui/GuiMailbox.java @@ -12,14 +12,14 @@ package forestry.mail.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; -import forestry.mail.gadgets.MachineMailbox; +import forestry.mail.tiles.TileMailbox; -public class GuiMailbox extends GuiForestry { +public class GuiMailbox extends GuiForestry { - public GuiMailbox(InventoryPlayer player, MachineMailbox tile) { - super(Defaults.TEXTURE_PATH_GUI + "/mailbox.png", new ContainerMailbox(player, tile), tile); + public GuiMailbox(InventoryPlayer player, TileMailbox tile) { + super(Constants.TEXTURE_PATH_GUI + "/mailbox.png", new ContainerMailbox(player, tile), tile); this.xSize = 230; this.ySize = 227; } diff --git a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java index 9d4877543..ce6d0da7d 100755 --- a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java +++ b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java @@ -17,9 +17,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; +import forestry.core.render.ForestryResource; import forestry.mail.POBoxInfo; public class GuiMailboxInfo extends Gui { @@ -28,7 +28,7 @@ public class GuiMailboxInfo extends Gui { private final FontRenderer fontRendererObj; private POBoxInfo poInfo; - private final ResourceLocation textureAlert = new ForestryResource(Defaults.TEXTURE_PATH_GUI + "/mailalert.png"); + private final ResourceLocation textureAlert = new ForestryResource(Constants.TEXTURE_PATH_GUI + "/mailalert.png"); private GuiMailboxInfo() { fontRendererObj = Proxies.common.getClientInstance().fontRenderer; diff --git a/src/main/java/forestry/mail/gui/GuiPhilatelist.java b/src/main/java/forestry/mail/gui/GuiPhilatelist.java index de0b178c4..f92b72d39 100755 --- a/src/main/java/forestry/mail/gui/GuiPhilatelist.java +++ b/src/main/java/forestry/mail/gui/GuiPhilatelist.java @@ -12,14 +12,14 @@ package forestry.mail.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; -import forestry.mail.gadgets.MachinePhilatelist; +import forestry.mail.tiles.TilePhilatelist; -public class GuiPhilatelist extends GuiForestry { +public class GuiPhilatelist extends GuiForestry { - public GuiPhilatelist(InventoryPlayer player, MachinePhilatelist tile) { - super(Defaults.TEXTURE_PATH_GUI + "/philatelist.png", new ContainerPhilatelist(player, tile), tile); + public GuiPhilatelist(InventoryPlayer player, TilePhilatelist tile) { + super(Constants.TEXTURE_PATH_GUI + "/philatelist.png", new ContainerPhilatelist(player, tile), tile); this.xSize = 176; this.ySize = 193; } diff --git a/src/main/java/forestry/mail/gui/GuiTradeName.java b/src/main/java/forestry/mail/gui/GuiTradeName.java index 80a678f1c..62123c24c 100755 --- a/src/main/java/forestry/mail/gui/GuiTradeName.java +++ b/src/main/java/forestry/mail/gui/GuiTradeName.java @@ -16,19 +16,19 @@ import net.minecraft.client.gui.GuiTextField; import org.lwjgl.input.Keyboard; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import forestry.mail.gadgets.MachineTrader; import forestry.mail.network.PacketTraderAddress; +import forestry.mail.tiles.TileTrader; -public class GuiTradeName extends GuiForestry { +public class GuiTradeName extends GuiForestry { private GuiTextField addressNameField; - public GuiTradeName(MachineTrader tile) { - super(Defaults.TEXTURE_PATH_GUI + "/tradername.png", new ContainerTradeName(tile), tile); + public GuiTradeName(TileTrader tile) { + super(Constants.TEXTURE_PATH_GUI + "/tradername.png", new ContainerTradeName(tile), tile); this.xSize = 176; this.ySize = 90; } diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index d78c37ea6..b7fca58d7 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -12,15 +12,15 @@ package forestry.mail.gui; import net.minecraft.entity.player.InventoryPlayer; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.utils.StringUtil; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; -public class GuiTrader extends GuiForestry { +public class GuiTrader extends GuiForestry { - public GuiTrader(InventoryPlayer inventoryplayer, MachineTrader tile) { - super(Defaults.TEXTURE_PATH_GUI + "/mailtrader2.png", new ContainerTrader(inventoryplayer, tile), tile); + public GuiTrader(InventoryPlayer inventoryplayer, TileTrader tile) { + super(Constants.TEXTURE_PATH_GUI + "/mailtrader2.png", new ContainerTrader(inventoryplayer, tile), tile); this.xSize = 226; this.ySize = 220; } diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index 21361ebc7..6bf2423e5 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -30,17 +30,17 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; import forestry.api.mail.ILetter; -import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; -import forestry.core.interfaces.IHintSource; +import forestry.core.errors.EnumErrorCode; +import forestry.core.gui.IHintSource; import forestry.core.inventory.ItemInventory; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; +import forestry.core.utils.SlotUtil; import forestry.core.utils.StringUtil; -import forestry.core.utils.Utils; import forestry.mail.Letter; public class ItemLetter extends ItemInventoried { @@ -266,10 +266,10 @@ public class ItemLetter extends ItemInventoried { public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { if (letter.isProcessed()) { return false; - } else if (Utils.isIndexInRange(slotIndex, Letter.SLOT_POSTAGE_1, Letter.SLOT_POSTAGE_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, Letter.SLOT_POSTAGE_1, Letter.SLOT_POSTAGE_COUNT)) { Item item = itemStack.getItem(); return item instanceof ItemStamps; - } else if (Utils.isIndexInRange(slotIndex, Letter.SLOT_ATTACHMENT_1, Letter.SLOT_ATTACHMENT_COUNT)) { + } else if (SlotUtil.isSlotInRange(slotIndex, Letter.SLOT_ATTACHMENT_1, Letter.SLOT_ATTACHMENT_COUNT)) { return !ForestryItem.letters.isItemEqual(itemStack); } return false; diff --git a/src/main/java/forestry/mail/network/PacketTraderAddress.java b/src/main/java/forestry/mail/network/PacketTraderAddress.java index 05de7d589..4a8258430 100644 --- a/src/main/java/forestry/mail/network/PacketTraderAddress.java +++ b/src/main/java/forestry/mail/network/PacketTraderAddress.java @@ -16,7 +16,7 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketId; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; public class PacketTraderAddress extends PacketCoordinates { @@ -26,7 +26,7 @@ public class PacketTraderAddress extends PacketCoordinates { super(data); } - public PacketTraderAddress(MachineTrader tile, String addressName) { + public PacketTraderAddress(TileTrader tile, String addressName) { super(PacketId.TRADING_ADDRESS_SET, tile); this.addressName = addressName; diff --git a/src/main/java/forestry/mail/IMailContainer.java b/src/main/java/forestry/mail/tiles/IMailContainer.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/mail/IMailContainer.java rename to src/main/java/forestry/mail/tiles/IMailContainer.java index 7a9720c13..a99fa9159 --- a/src/main/java/forestry/mail/IMailContainer.java +++ b/src/main/java/forestry/mail/tiles/IMailContainer.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.mail; +package forestry.mail.tiles; public interface IMailContainer { boolean hasMail(); diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/tiles/TileMailbox.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/mail/gadgets/MachineMailbox.java rename to src/main/java/forestry/mail/tiles/TileMailbox.java index c9e540d35..7566ac19e --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/tiles/TileMailbox.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.mail.gadgets; +package forestry.mail.tiles; import java.util.Collection; import java.util.LinkedList; @@ -32,23 +32,22 @@ import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostalState; import forestry.api.mail.PostManager; import forestry.core.config.Config; -import forestry.core.gadgets.TileBase; import forestry.core.inventory.InventoryAdapter; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; +import forestry.core.tiles.TileBase; import forestry.mail.EnumDeliveryState; -import forestry.mail.IMailContainer; import forestry.mail.POBox; import forestry.mail.PostRegistry; import forestry.mail.triggers.MailTriggers; import buildcraft.api.statements.ITriggerExternal; -public class MachineMailbox extends TileBase implements IMailContainer { +public class TileMailbox extends TileBase implements IMailContainer { private boolean isLinked = false; - public MachineMailbox() { + public TileMailbox() { setHints(Config.hints.get("mailbox")); setInternalInventory(new InventoryAdapter(POBox.SLOT_SIZE, "Letters").disableAutomation()); } diff --git a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/tiles/TilePhilatelist.java old mode 100755 new mode 100644 similarity index 84% rename from src/main/java/forestry/mail/gadgets/MachinePhilatelist.java rename to src/main/java/forestry/mail/tiles/TilePhilatelist.java index 587299b46..2aa759172 --- a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java +++ b/src/main/java/forestry/mail/tiles/TilePhilatelist.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.mail.gadgets; +package forestry.mail.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -17,20 +17,20 @@ import net.minecraft.item.ItemStack; import forestry.api.core.ForestryAPI; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; -import forestry.core.gadgets.TileBase; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; -import forestry.core.utils.StackUtils; +import forestry.core.tiles.TileBase; +import forestry.core.utils.InventoryUtil; -public class MachinePhilatelist extends TileBase implements IInventory { +public class TilePhilatelist extends TileBase implements IInventory { // / CONSTANTS public static final short SLOT_FILTER = 0; public static final short SLOT_BUFFER_1 = 1; public static final short SLOT_BUFFER_COUNT = 27; - public MachinePhilatelist() { + public TilePhilatelist() { setInternalInventory(new PhilatelistInventoryAdapter(this)); } @@ -63,11 +63,11 @@ public class MachinePhilatelist extends TileBase implements IInventory { } // Store it. - StackUtils.stowInInventory(stamp, inventory, true, SLOT_BUFFER_1, SLOT_BUFFER_COUNT); + InventoryUtil.stowInInventory(stamp, inventory, true, SLOT_BUFFER_1, SLOT_BUFFER_COUNT); } - private static class PhilatelistInventoryAdapter extends TileInventoryAdapter { - public PhilatelistInventoryAdapter(MachinePhilatelist tile) { + private static class PhilatelistInventoryAdapter extends TileInventoryAdapter { + public PhilatelistInventoryAdapter(TilePhilatelist tile) { super(tile, 28, "INV"); } diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/tiles/TileTrader.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/mail/gadgets/MachineTrader.java rename to src/main/java/forestry/mail/tiles/TileTrader.java index bfc8fca6b..fbcd0bc8f --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/tiles/TileTrader.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.mail.gadgets; +package forestry.mail.tiles; import java.io.IOException; import java.util.Collection; @@ -30,14 +30,14 @@ import forestry.api.core.IErrorLogic; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; -import forestry.core.EnumErrorCode; -import forestry.core.gadgets.TileBase; +import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; +import forestry.core.tiles.TileBase; +import forestry.core.utils.ItemStackUtil; import forestry.mail.MailAddress; import forestry.mail.TradeStation; import forestry.mail.network.PacketTraderAddress; @@ -45,11 +45,11 @@ import forestry.mail.triggers.MailTriggers; import buildcraft.api.statements.ITriggerExternal; -public class MachineTrader extends TileBase { +public class TileTrader extends TileBase { private IMailAddress address; - public MachineTrader() { + public TileTrader() { address = new MailAddress(); setInternalInventory(new TradeStation.TradeStationInventory()); } @@ -175,7 +175,7 @@ public class MachineTrader extends TileBase { if (itemInSlot == null) { continue; } - if (item == null || StackUtils.isIdenticalItem(itemInSlot, item)) { + if (item == null || ItemStackUtil.isIdenticalItem(itemInSlot, item)) { count += itemInSlot.stackSize; } if (count >= itemCount) { @@ -201,7 +201,7 @@ public class MachineTrader extends TileBase { total += 64; } else { total += itemInSlot.getMaxStackSize(); - if (item == null || StackUtils.isIdenticalItem(itemInSlot, item)) { + if (item == null || ItemStackUtil.isIdenticalItem(itemInSlot, item)) { count += itemInSlot.stackSize; } } diff --git a/src/main/java/forestry/mail/triggers/TriggerBuffer.java b/src/main/java/forestry/mail/triggers/TriggerBuffer.java index 0215b4e56..3f29dba7e 100755 --- a/src/main/java/forestry/mail/triggers/TriggerBuffer.java +++ b/src/main/java/forestry/mail/triggers/TriggerBuffer.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.core.triggers.Trigger; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -37,10 +37,10 @@ public class TriggerBuffer extends Trigger { @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { - if (!(tile instanceof MachineTrader)) { + if (!(tile instanceof TileTrader)) { return false; } - return ((MachineTrader) tile).hasOutputBufMin(threshold); + return ((TileTrader) tile).hasOutputBufMin(threshold); } } diff --git a/src/main/java/forestry/mail/triggers/TriggerHasMail.java b/src/main/java/forestry/mail/triggers/TriggerHasMail.java index 4865f8812..6125749fd 100755 --- a/src/main/java/forestry/mail/triggers/TriggerHasMail.java +++ b/src/main/java/forestry/mail/triggers/TriggerHasMail.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.core.triggers.Trigger; -import forestry.mail.IMailContainer; +import forestry.mail.tiles.IMailContainer; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/src/main/java/forestry/mail/triggers/TriggerLowInput.java b/src/main/java/forestry/mail/triggers/TriggerLowInput.java index 0fda7767a..889ea245f 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowInput.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowInput.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.core.triggers.Trigger; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -37,10 +37,10 @@ public class TriggerLowInput extends Trigger { @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { - if (!(tile instanceof MachineTrader)) { + if (!(tile instanceof TileTrader)) { return false; } - return !((MachineTrader) tile).hasInputBufMin(threshold); + return !((TileTrader) tile).hasInputBufMin(threshold); } } diff --git a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java index e1f9c5650..88c885cd8 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.core.triggers.Trigger; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -37,11 +37,11 @@ public class TriggerLowPaper extends Trigger { @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { - if (!(tile instanceof MachineTrader)) { + if (!(tile instanceof TileTrader)) { return false; } - return !((MachineTrader) tile).hasPaperMin(threshold); + return !((TileTrader) tile).hasPaperMin(threshold); } } diff --git a/src/main/java/forestry/mail/triggers/TriggerLowStamps.java b/src/main/java/forestry/mail/triggers/TriggerLowStamps.java index 0b6193c7d..fccf07cf1 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowStamps.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowStamps.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import forestry.core.triggers.Trigger; -import forestry.mail.gadgets.MachineTrader; +import forestry.mail.tiles.TileTrader; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -37,11 +37,11 @@ public class TriggerLowStamps extends Trigger { @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { - if (!(tile instanceof MachineTrader)) { + if (!(tile instanceof TileTrader)) { return false; } - return !((MachineTrader) tile).hasPostageMin(threshold); + return !((TileTrader) tile).hasPostageMin(threshold); } } diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/plugins/ForestryPlugin.java index 660f4d7e0..d4d8a9e5b 100755 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/plugins/ForestryPlugin.java @@ -21,11 +21,11 @@ import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.network.IGuiHandler; -import forestry.core.interfaces.IPickupHandler; -import forestry.core.interfaces.IResupplyHandler; -import forestry.core.interfaces.ISaveEventHandler; +import forestry.core.IPickupHandler; +import forestry.core.IResupplyHandler; +import forestry.core.ISaveEventHandler; import forestry.core.network.IPacketHandler; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; public abstract class ForestryPlugin { @@ -77,7 +77,7 @@ public abstract class ForestryPlugin { protected static void logInvalidIMCMessage(IMCMessage message) { String invalidIMCMessageText = getInvalidIMCMessageText(message); - Proxies.log.warning(invalidIMCMessageText); + Log.warning(invalidIMCMessageText); } public IGuiHandler getGuiHandler() { diff --git a/src/main/java/forestry/plugins/PluginAgriCraft.java b/src/main/java/forestry/plugins/PluginAgriCraft.java index b268714ab..57c460a2c 100644 --- a/src/main/java/forestry/plugins/PluginAgriCraft.java +++ b/src/main/java/forestry/plugins/PluginAgriCraft.java @@ -19,13 +19,13 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import forestry.farming.logic.FarmableBasicAgricraft; -@Plugin(pluginID = "AgriCraft", name = "AgriCraft", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.agricraft.description") +@Plugin(pluginID = "AgriCraft", name = "AgriCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.agricraft.description") public class PluginAgriCraft extends ForestryPlugin { private static final String AgriCraft = "AgriCraft"; diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 8b55e74bc..d16c9096a 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import forestry.apiculture.ArmorApiaristHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -67,35 +66,16 @@ import forestry.api.genetics.IFlowerRegistry; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; +import forestry.apiculture.ArmorApiaristHelper; import forestry.apiculture.GuiHandlerApiculture; import forestry.apiculture.SaveEventHandlerApiculture; import forestry.apiculture.VillageHandlerApiculture; +import forestry.apiculture.blocks.BlockAlveary; +import forestry.apiculture.blocks.BlockBeehives; +import forestry.apiculture.blocks.BlockCandle; +import forestry.apiculture.blocks.BlockStump; import forestry.apiculture.commands.CommandBee; import forestry.apiculture.flowers.FlowerRegistry; -import forestry.apiculture.gadgets.BlockAlveary; -import forestry.apiculture.gadgets.BlockBeehives; -import forestry.apiculture.gadgets.BlockCandle; -import forestry.apiculture.gadgets.BlockStump; -import forestry.apiculture.gadgets.TileApiaristChest; -import forestry.apiculture.gadgets.TileApiary; -import forestry.apiculture.gadgets.TileBeehouse; -import forestry.apiculture.gadgets.TileCandle; -import forestry.apiculture.gadgets.TileSwarm; -import forestry.apiculture.genetics.AlleleEffectAggressive; -import forestry.apiculture.genetics.AlleleEffectCreeper; -import forestry.apiculture.genetics.AlleleEffectExploration; -import forestry.apiculture.genetics.AlleleEffectFertile; -import forestry.apiculture.genetics.AlleleEffectFungification; -import forestry.apiculture.genetics.AlleleEffectGlacial; -import forestry.apiculture.genetics.AlleleEffectHeroic; -import forestry.apiculture.genetics.AlleleEffectIgnition; -import forestry.apiculture.genetics.AlleleEffectMisanthrope; -import forestry.apiculture.genetics.AlleleEffectNone; -import forestry.apiculture.genetics.AlleleEffectPotion; -import forestry.apiculture.genetics.AlleleEffectRadioactive; -import forestry.apiculture.genetics.AlleleEffectRepulsion; -import forestry.apiculture.genetics.AlleleEffectResurrection; -import forestry.apiculture.genetics.AlleleEffectSnowing; import forestry.apiculture.genetics.BeeBranchDefinition; import forestry.apiculture.genetics.BeeDefinition; import forestry.apiculture.genetics.BeeFactory; @@ -104,11 +84,26 @@ import forestry.apiculture.genetics.BeeMutationFactory; import forestry.apiculture.genetics.BeekeepingMode; import forestry.apiculture.genetics.HiveDrop; import forestry.apiculture.genetics.JubilanceFactory; -import forestry.apiculture.items.ItemAlvearyBlock; +import forestry.apiculture.genetics.alleles.AlleleEffectAggressive; +import forestry.apiculture.genetics.alleles.AlleleEffectCreeper; +import forestry.apiculture.genetics.alleles.AlleleEffectExploration; +import forestry.apiculture.genetics.alleles.AlleleEffectFertile; +import forestry.apiculture.genetics.alleles.AlleleEffectFungification; +import forestry.apiculture.genetics.alleles.AlleleEffectGlacial; +import forestry.apiculture.genetics.alleles.AlleleEffectHeroic; +import forestry.apiculture.genetics.alleles.AlleleEffectIgnition; +import forestry.apiculture.genetics.alleles.AlleleEffectMisanthrope; +import forestry.apiculture.genetics.alleles.AlleleEffectNone; +import forestry.apiculture.genetics.alleles.AlleleEffectPotion; +import forestry.apiculture.genetics.alleles.AlleleEffectRadioactive; +import forestry.apiculture.genetics.alleles.AlleleEffectRepulsion; +import forestry.apiculture.genetics.alleles.AlleleEffectResurrection; +import forestry.apiculture.genetics.alleles.AlleleEffectSnowing; import forestry.apiculture.items.ItemArmorApiarist; import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBeealyzer; -import forestry.apiculture.items.ItemCandleBlock; +import forestry.apiculture.items.ItemBlockAlveary; +import forestry.apiculture.items.ItemBlockCandle; import forestry.apiculture.items.ItemHabitatLocator; import forestry.apiculture.items.ItemHiveFrame; import forestry.apiculture.items.ItemHoneycomb; @@ -124,40 +119,47 @@ import forestry.apiculture.multiblock.TileAlvearyStabiliser; import forestry.apiculture.multiblock.TileAlvearySwarmer; import forestry.apiculture.network.PacketHandlerApiculture; import forestry.apiculture.proxy.ProxyApiculture; +import forestry.apiculture.tiles.TileApiaristChest; +import forestry.apiculture.tiles.TileApiary; +import forestry.apiculture.tiles.TileBeeHouse; +import forestry.apiculture.tiles.TileCandle; +import forestry.apiculture.tiles.TileSwarm; import forestry.apiculture.trigger.ApicultureTriggers; import forestry.apiculture.worldgen.HiveDecorator; import forestry.apiculture.worldgen.HiveDescription; import forestry.apiculture.worldgen.HiveGenHelper; import forestry.apiculture.worldgen.HiveRegistry; -import forestry.core.GameMode; +import forestry.core.ISaveEventHandler; +import forestry.core.blocks.BlockBase; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.config.LocalizedConfiguration; +import forestry.core.entities.EntityFXSnow; import forestry.core.fluids.Fluids; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.gadgets.TileAnalyzer; import forestry.core.genetics.alleles.Allele; -import forestry.core.interfaces.ISaveEventHandler; +import forestry.core.items.ItemBlockForestry; import forestry.core.items.ItemForestry; -import forestry.core.items.ItemForestryBlock; import forestry.core.items.ItemOverlay; import forestry.core.items.ItemOverlay.OverlayInfo; import forestry.core.items.ItemScoop; import forestry.core.network.IPacketHandler; import forestry.core.proxy.Proxies; -import forestry.core.render.EntitySnowFX; +import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.render.RenderNaturalistChest; -import forestry.core.utils.ShapedRecipeCustom; -import forestry.core.utils.StackUtils; +import forestry.core.tiles.MachineDefinition; +import forestry.core.tiles.TileAnalyzer; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Log; +import forestry.core.utils.Stack; import forestry.core.utils.StringUtil; -@Plugin(pluginID = "Apiculture", name = "Apiculture", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.apiculture.description") +@Plugin(pluginID = "Apiculture", name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description") public class PluginApiculture extends ForestryPlugin { - @SidedProxy(clientSide = "forestry.apiculture.proxy.ClientProxyApiculture", serverSide = "forestry.apiculture.proxy.ProxyApiculture") + @SidedProxy(clientSide = "forestry.apiculture.proxy.ProxyApicultureClient", serverSide = "forestry.apiculture.proxy.ProxyApiculture") public static ProxyApiculture proxy; private static final String CONFIG_CATEGORY = "apiculture"; private static final String[] EMPTY_STRINGS = new String[0]; @@ -212,16 +214,16 @@ public class PluginApiculture extends ForestryPlugin { MinecraftForge.EVENT_BUS.register(this); - ForestryBlock.apiculture.registerBlock(new BlockBase(Material.iron), ItemForestryBlock.class, "apiculture"); + ForestryBlock.apiculture.registerBlock(new BlockBase(Material.iron), ItemBlockForestry.class, "apiculture"); ForestryBlock.apiculture.block().setCreativeTab(Tabs.tabApiculture); ForestryBlock.apiculture.block().setHarvestLevel("axe", 0); - ForestryBlock.apicultureChest.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "apicultureChest"); + ForestryBlock.apicultureChest.registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "apicultureChest"); ForestryBlock.apicultureChest.block().setCreativeTab(Tabs.tabApiculture); ForestryBlock.apicultureChest.block().setHarvestLevel("axe", 0); - definitionApiary = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_APIARY_META, "forestry.Apiary", TileApiary.class, - ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apiculture.getItemStack(1, Defaults.DEFINITION_APIARY_META), + definitionApiary = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_APIARY_META, "forestry.Apiary", TileApiary.class, + ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_APIARY_META), "XXX", "#C#", "###", @@ -230,10 +232,10 @@ public class PluginApiculture extends ForestryPlugin { 'C', ForestryItem.impregnatedCasing)) .setFaces(0, 1, 2, 2, 4, 4, 0, 7)); - definitionChestLegacy = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_APIARISTCHEST_LEGACY_META, "forestry.ApiaristChest", TileApiaristChest.class).setLegacy()); + definitionChestLegacy = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_APIARISTCHEST_LEGACY_META, "forestry.ApiaristChest", TileApiaristChest.class).setLegacy()); - definitionChest = ((BlockBase) ForestryBlock.apicultureChest.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_APIARISTCHEST_META, "forestry.ApiaristChestNew", TileApiaristChest.class, new RenderNaturalistChest("apiaristchest"), - ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apicultureChest.getItemStack(1, Defaults.DEFINITION_APIARISTCHEST_META), + definitionChest = ((BlockBase) ForestryBlock.apicultureChest.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_APIARISTCHEST_META, "forestry.ApiaristChestNew", TileApiaristChest.class, new RenderNaturalistChest("apiaristchest"), + ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apicultureChest.getItemStack(1, Constants.DEFINITION_APIARISTCHEST_META), " # ", "XYX", "XXX", @@ -242,8 +244,8 @@ public class PluginApiculture extends ForestryPlugin { 'Y', "chestWood")) .setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F)); - definitionBeehouse = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_BEEHOUSE_META, "forestry.Beehouse", TileBeehouse.class, - ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apiculture.getItemStack(1, Defaults.DEFINITION_BEEHOUSE_META), + definitionBeehouse = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_BEEHOUSE_META, "forestry.Beehouse", TileBeeHouse.class, + ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_BEEHOUSE_META), "XXX", "#C#", "###", @@ -252,17 +254,17 @@ public class PluginApiculture extends ForestryPlugin { 'C', "beeComb")) .setFaces(0, 1, 2, 2, 4, 4, 0, 7)); - definitionAnalyzer = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_ANALYZER_META, "forestry.Analyzer", TileAnalyzer.class, - PluginApiculture.proxy.getRendererAnalyzer(Defaults.TEXTURE_PATH_BLOCKS + "/analyzer_"))); + definitionAnalyzer = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_ANALYZER_META, "forestry.Analyzer", TileAnalyzer.class, + PluginApiculture.proxy.getRendererAnalyzer(Constants.TEXTURE_PATH_BLOCKS + "/analyzer_"))); - ForestryBlock.beehives.registerBlock(new BlockBeehives(), ItemForestryBlock.class, "beehives"); + ForestryBlock.beehives.registerBlock(new BlockBeehives(), ItemBlockForestry.class, "beehives"); // Candles - ForestryBlock.candle.registerBlock(new BlockCandle(), ItemCandleBlock.class, "candle"); - ForestryBlock.stump.registerBlock(new BlockStump(), ItemForestryBlock.class, "stump"); + ForestryBlock.candle.registerBlock(new BlockCandle(), ItemBlockCandle.class, "candle"); + ForestryBlock.stump.registerBlock(new BlockStump(), ItemBlockForestry.class, "stump"); // Alveary and Components - ForestryBlock.alveary.registerBlock(new BlockAlveary(), ItemAlvearyBlock.class, "alveary"); + ForestryBlock.alveary.registerBlock(new BlockAlveary(), ItemBlockAlveary.class, "alveary"); ForestryBlock.alveary.block().setHarvestLevel("axe", 0); // Add triggers @@ -296,7 +298,7 @@ public class PluginApiculture extends ForestryPlugin { final String oldConfigRenamed = CONFIG_CATEGORY + ".conf.old"; File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed); if (oldConfigFile.renameTo(oldConfigFileRenamed)) { - Proxies.log.info("Migrated " + CONFIG_CATEGORY + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); + Log.info("Migrated " + CONFIG_CATEGORY + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); } } @@ -316,7 +318,7 @@ public class PluginApiculture extends ForestryPlugin { } beekeepingMode = config.getStringLocalized("beekeeping", "mode", "NORMAL", validBeekeepingModeNames); - Proxies.log.finer("Beekeeping mode read from config: " + beekeepingMode); + Log.finer("Beekeeping mode read from config: " + beekeepingMode); secondPrincessChance = config.getFloatLocalized("beekeeping", "second.princess", secondPrincessChance, 0.0f, 100.0f); @@ -342,7 +344,7 @@ public class PluginApiculture extends ForestryPlugin { Set acceptableFlowers = FlowerManager.flowerRegistry.getAcceptableFlowers(flowerType); if (acceptableFlowers == null || acceptableFlowers.size() == 0) { - Proxies.log.severe("Flower type '" + flowerType + "' has no valid flowers set in apiculture.cfg. Add valid flowers or delete the config to set it to default."); + Log.severe("Flower type '" + flowerType + "' has no valid flowers set in apiculture.cfg. Add valid flowers or delete the config to set it to default."); } } @@ -390,9 +392,9 @@ public class PluginApiculture extends ForestryPlugin { // Register villager stuff VillageHandlerApiculture villageHandler = new VillageHandlerApiculture(); VillagerRegistry.instance().registerVillageCreationHandler(villageHandler); - VillagerRegistry.instance().registerVillagerId(Defaults.ID_VILLAGER_BEEKEEPER); - Proxies.render.registerVillagerSkin(Defaults.ID_VILLAGER_BEEKEEPER, Defaults.TEXTURE_SKIN_BEEKPEEPER); - VillagerRegistry.instance().registerVillageTradeHandler(Defaults.ID_VILLAGER_BEEKEEPER, villageHandler); + VillagerRegistry.instance().registerVillagerId(Constants.ID_VILLAGER_BEEKEEPER); + Proxies.render.registerVillagerSkin(Constants.ID_VILLAGER_BEEKEEPER, Constants.TEXTURE_SKIN_BEEKPEEPER); + VillagerRegistry.instance().registerVillageTradeHandler(Constants.ID_VILLAGER_BEEKEEPER, villageHandler); } proxy.initializeRendering(); @@ -441,7 +443,7 @@ public class PluginApiculture extends ForestryPlugin { for (IFlower flower : flowers) { String name = GameData.getBlockRegistry().getNameForObject(flower.getBlock()); if (name == null) { - Proxies.log.severe("Could not find name for flower: " + flower + " with type: " + flowerType); + Log.severe("Could not find name for flower: " + flower + " with type: " + flowerType); continue; } @@ -477,7 +479,7 @@ public class PluginApiculture extends ForestryPlugin { property = apicultureConfig.get("beekeeping.mode", CONFIG_CATEGORY, "NORMAL"); property.comment = "change beekeeping modes here. possible values EASY, NORMAL, HARD, HARDCORE, INSANE. mods may add additional modes."; beekeepingMode = property.value.trim(); - Proxies.log.finer("Beekeeping mode read from config: " + beekeepingMode); + Log.finer("Beekeeping mode read from config: " + beekeepingMode); property = apicultureConfig.get("beekeeping.secondprincess", CONFIG_CATEGORY, secondPrincessChance); property.comment = "percent chance of second princess drop, for limited/skyblock maps. Acceptable values up to 2 decimals."; @@ -737,9 +739,9 @@ public class PluginApiculture extends ForestryPlugin { if (PluginManager.Module.FACTORY.isEnabled()) { // / SQUEEZER - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeyDrop.getItemStack()}, Fluids.HONEY.getFluid(Defaults.FLUID_PER_HONEY_DROP), + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeyDrop.getItemStack()}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP), ForestryItem.propolis.getItemStack(), 5); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeydew.getItemStack()}, Fluids.HONEY.getFluid(Defaults.FLUID_PER_HONEY_DROP)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeydew.getItemStack()}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP)); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.sand)}, Fluids.LAVA.getFluid(2000)); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.sand, 1, 1)}, Fluids.LAVA.getFluid(2000)); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.dirt)}, Fluids.LAVA.getFluid(1600)); @@ -870,7 +872,7 @@ public class PluginApiculture extends ForestryPlugin { } // ANALYZER - definitionAnalyzer.recipes = createAlyzerRecipes(ForestryBlock.core.block(), Defaults.DEFINITION_ANALYZER_META); + definitionAnalyzer.recipes = createAlyzerRecipes(ForestryBlock.core.block(), Constants.DEFINITION_ANALYZER_META); definitionAnalyzer.register(); definitionApiary.register(); @@ -944,16 +946,16 @@ public class PluginApiculture extends ForestryPlugin { tag.setInteger(BlockCandle.colourTagName, 0xffffff); stack.setTagCompound(tag); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(stack, 7, 12, 12)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.scoop.getItemStack(), 1, 1, 8)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.propolis.getItemStack(), 2, 4, 6)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(), 4, 12, 7)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(1, 4), 2, 10, 7)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(1, 6), 1, 6, 7)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(stack, 7, 12, 12)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.scoop.getItemStack(), 1, 1, 8)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.propolis.getItemStack(), 2, 4, 6)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(), 4, 12, 7)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(1, 4), 2, 10, 7)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(1, 6), 1, 6, 7)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.FOREST.getRainResist().getMemberStack(EnumBeeType.PRINCESS), 1, 1, 5)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.COMMON.getMemberStack(EnumBeeType.DRONE), 1, 2, 8)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.PRINCESS), 1, 1, 5)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.FOREST.getRainResist().getMemberStack(EnumBeeType.PRINCESS), 1, 1, 5)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.COMMON.getMemberStack(EnumBeeType.DRONE), 1, 2, 8)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.PRINCESS), 1, 1, 5)); } private static void createHives() { @@ -1005,7 +1007,7 @@ public class PluginApiculture extends ForestryPlugin { } private static void parseAdditionalFlowers(String list, ArrayList target) { - List flowers = StackUtils.parseItemStackStrings(list, 0); + List flowers = ItemStackUtil.parseItemStackStrings(list, 0); target.addAll(flowers); } @@ -1026,21 +1028,21 @@ public class PluginApiculture extends ForestryPlugin { } private static void parseAcceptedFlowers(String[] acceptedFlowers, String flowerType) { - List acceptedFlowerItemStacks = StackUtils.parseStackStrings(acceptedFlowers, OreDictionary.WILDCARD_VALUE); - for (StackUtils.Stack acceptedFlower : acceptedFlowerItemStacks) { + List acceptedFlowerItemStacks = Stack.parseStackStrings(acceptedFlowers, OreDictionary.WILDCARD_VALUE); + for (Stack acceptedFlower : acceptedFlowerItemStacks) { Block acceptedFlowerBlock = acceptedFlower.getBlock(); int meta = acceptedFlower.getMeta(); if (acceptedFlowerBlock != null) { FlowerManager.flowerRegistry.registerAcceptableFlower(acceptedFlowerBlock, meta, flowerType); } else { - Proxies.log.warning("No block found for '" + acceptedFlower + "' in apiculture config for '" + flowerType + "'."); + Log.warning("No block found for '" + acceptedFlower + "' in apiculture config for '" + flowerType + "'."); } } } private static void parsePlantableFlowers(Property property, String flowerType) { for (String string : property.getStringList()) { - StackUtils.Stack plantableFlower = StackUtils.parseStackString(string, OreDictionary.WILDCARD_VALUE); + Stack plantableFlower = Stack.parseStackString(string, OreDictionary.WILDCARD_VALUE); if (plantableFlower == null) { continue; } @@ -1050,7 +1052,7 @@ public class PluginApiculture extends ForestryPlugin { if (plantableFlowerBlock != null) { FlowerManager.flowerRegistry.registerPlantableFlower(plantableFlowerBlock, meta, 1.0, flowerType); } else { - Proxies.log.warning("No block found for '" + string + "' in config '" + property.getName() + "'."); + Log.warning("No block found for '" + string + "' in config '" + property.getName() + "'."); } } } @@ -1086,7 +1088,7 @@ public class PluginApiculture extends ForestryPlugin { return true; } else if (message.key.equals("add-alveary-slab") && message.isStringMessage()) { String messageString = String.format("Received a '%s' request from mod '%s'. This IMC message has been replaced with the oreDictionary for 'slabWood'. Please contact the author and report this issue.", message.key, message.getSender()); - Proxies.log.warning(messageString); + Log.warning(messageString); return true; } @@ -1097,9 +1099,9 @@ public class PluginApiculture extends ForestryPlugin { @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Pre event) { if (event.map.getTextureType() == 1) { - EntitySnowFX.icons = new IIcon[3]; - for (int i = 0; i < EntitySnowFX.icons.length; i++) { - EntitySnowFX.icons[i] = event.map.registerIcon("forestry:particles/snow." + (i + 1)); + EntityFXSnow.icons = new IIcon[3]; + for (int i = 0; i < EntityFXSnow.icons.length; i++) { + EntityFXSnow.icons[i] = event.map.registerIcon("forestry:particles/snow." + (i + 1)); } } } diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 33e2a7426..513121a46 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -47,23 +47,15 @@ import forestry.arboriculture.FruitProviderRipening; import forestry.arboriculture.GuiHandlerArboriculture; import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodType; +import forestry.arboriculture.blocks.BlockArbFence; +import forestry.arboriculture.blocks.BlockArbStairs; +import forestry.arboriculture.blocks.BlockForestryLeaves; +import forestry.arboriculture.blocks.BlockFruitPod; +import forestry.arboriculture.blocks.BlockLog; +import forestry.arboriculture.blocks.BlockPlanks; +import forestry.arboriculture.blocks.BlockSapling; +import forestry.arboriculture.blocks.BlockSlab; import forestry.arboriculture.commands.CommandTree; -import forestry.arboriculture.gadgets.BlockArbFence; -import forestry.arboriculture.gadgets.BlockArbStairs; -import forestry.arboriculture.gadgets.BlockFruitPod; -import forestry.arboriculture.gadgets.BlockLog; -import forestry.arboriculture.gadgets.BlockPlanks; -import forestry.arboriculture.gadgets.BlockSapling; -import forestry.arboriculture.gadgets.BlockSlab; -import forestry.arboriculture.gadgets.ForestryBlockLeaves; -import forestry.arboriculture.gadgets.TileArboristChest; -import forestry.arboriculture.gadgets.TileFruitPod; -import forestry.arboriculture.gadgets.TileLeaves; -import forestry.arboriculture.gadgets.TileSapling; -import forestry.arboriculture.gadgets.TileWood; -import forestry.arboriculture.genetics.AlleleFruit; -import forestry.arboriculture.genetics.AlleleGrowth; -import forestry.arboriculture.genetics.AlleleLeafEffectNone; import forestry.arboriculture.genetics.GrowthProvider; import forestry.arboriculture.genetics.GrowthProviderTropical; import forestry.arboriculture.genetics.TreeBranchDefinition; @@ -72,42 +64,49 @@ import forestry.arboriculture.genetics.TreeFactory; import forestry.arboriculture.genetics.TreeHelper; import forestry.arboriculture.genetics.TreeMutationFactory; import forestry.arboriculture.genetics.TreekeepingMode; +import forestry.arboriculture.genetics.alleles.AlleleFruit; +import forestry.arboriculture.genetics.alleles.AlleleGrowth; +import forestry.arboriculture.genetics.alleles.AlleleLeafEffectNone; +import forestry.arboriculture.items.ItemBlockLeaves; +import forestry.arboriculture.items.ItemBlockWood; import forestry.arboriculture.items.ItemGermlingGE; import forestry.arboriculture.items.ItemGrafter; -import forestry.arboriculture.items.ItemLeavesBlock; import forestry.arboriculture.items.ItemTreealyzer; -import forestry.arboriculture.items.ItemWoodBlock; import forestry.arboriculture.network.PacketHandlerArboriculture; import forestry.arboriculture.proxy.ProxyArboriculture; -import forestry.core.GameMode; +import forestry.arboriculture.tiles.TileArboristChest; +import forestry.arboriculture.tiles.TileFruitPod; +import forestry.arboriculture.tiles.TileLeaves; +import forestry.arboriculture.tiles.TileSapling; +import forestry.arboriculture.tiles.TileWood; +import forestry.core.blocks.BlockBase; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.MachineDefinition; import forestry.core.genetics.alleles.Allele; -import forestry.core.items.ItemForestryBlock; +import forestry.core.items.ItemBlockForestry; import forestry.core.items.ItemFruit.EnumFruit; import forestry.core.network.IPacketHandler; import forestry.core.proxy.Proxies; +import forestry.core.recipes.RecipeUtil; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.recipes.ShapelessRecipeCustom; import forestry.core.render.RenderNaturalistChest; -import forestry.core.utils.RecipeUtil; -import forestry.core.utils.ShapedRecipeCustom; -import forestry.core.utils.ShapelessRecipeCustom; +import forestry.core.tiles.MachineDefinition; import forestry.factory.recipes.FabricatorRecipe; -@Plugin(pluginID = "Arboriculture", name = "Arboriculture", author = "Binnie & SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.arboriculture.description") +@Plugin(pluginID = "Arboriculture", name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description") public class PluginArboriculture extends ForestryPlugin { - @SidedProxy(clientSide = "forestry.arboriculture.proxy.ClientProxyArboriculture", serverSide = "forestry.arboriculture.proxy.ProxyArboriculture") + @SidedProxy(clientSide = "forestry.arboriculture.proxy.ProxyArboricultureClient", serverSide = "forestry.arboriculture.proxy.ProxyArboriculture") public static ProxyArboriculture proxy; public static String treekeepingMode = "NORMAL"; public static int modelIdSaplings; public static int modelIdLeaves; - public static int modelIdFences; public static int modelIdPods; private static MachineDefinition definitionChest; @@ -137,26 +136,26 @@ public class PluginArboriculture extends ForestryPlugin { super.preInit(); // Wood blocks - ForestryBlock.logs.registerBlock(new BlockLog(false), ItemWoodBlock.class, "logs"); + ForestryBlock.logs.registerBlock(new BlockLog(false), ItemBlockWood.class, "logs"); OreDictionary.registerOre("logWood", ForestryBlock.logs.getWildcard()); - ForestryBlock.planks.registerBlock(new BlockPlanks(false), ItemWoodBlock.class, "planks"); + ForestryBlock.planks.registerBlock(new BlockPlanks(false), ItemBlockWood.class, "planks"); OreDictionary.registerOre("plankWood", ForestryBlock.planks.getWildcard()); - ForestryBlock.slabs.registerBlock(new BlockSlab(false), ItemWoodBlock.class, "slabs"); + ForestryBlock.slabs.registerBlock(new BlockSlab(false), ItemBlockWood.class, "slabs"); OreDictionary.registerOre("slabWood", ForestryBlock.slabs.getWildcard()); - ForestryBlock.fences.registerBlock(new BlockArbFence(false), ItemWoodBlock.class, "fences"); + ForestryBlock.fences.registerBlock(new BlockArbFence(false), ItemBlockWood.class, "fences"); OreDictionary.registerOre("fenceWood", ForestryBlock.fences.getWildcard()); - ForestryBlock.stairs.registerBlock(new BlockArbStairs(ForestryBlock.planks.block(), false), ItemWoodBlock.class, "stairs"); + ForestryBlock.stairs.registerBlock(new BlockArbStairs(ForestryBlock.planks.block(), false), ItemBlockWood.class, "stairs"); OreDictionary.registerOre("stairWood", ForestryBlock.stairs.getWildcard()); - ForestryBlock.logsFireproof.registerBlock(new BlockLog(true), ItemWoodBlock.class, "logsFireproof"); - ForestryBlock.planksFireproof.registerBlock(new BlockPlanks(true), ItemWoodBlock.class, "planksFireproof"); - ForestryBlock.slabsFireproof.registerBlock(new BlockSlab(true), ItemWoodBlock.class, "slabsFireproof"); - ForestryBlock.fencesFireproof.registerBlock(new BlockArbFence(true), ItemWoodBlock.class, "fencesFireproof"); - ForestryBlock.stairsFireproof.registerBlock(new BlockArbStairs(ForestryBlock.planksFireproof.block(), true), ItemWoodBlock.class, "stairsFireproof"); + ForestryBlock.logsFireproof.registerBlock(new BlockLog(true), ItemBlockWood.class, "logsFireproof"); + ForestryBlock.planksFireproof.registerBlock(new BlockPlanks(true), ItemBlockWood.class, "planksFireproof"); + ForestryBlock.slabsFireproof.registerBlock(new BlockSlab(true), ItemBlockWood.class, "slabsFireproof"); + ForestryBlock.fencesFireproof.registerBlock(new BlockArbFence(true), ItemBlockWood.class, "fencesFireproof"); + ForestryBlock.stairsFireproof.registerBlock(new BlockArbStairs(ForestryBlock.planksFireproof.block(), true), ItemBlockWood.class, "stairsFireproof"); for (WoodType woodType : WoodType.VALUES) { woodType.registerLog(ForestryBlock.logs.block(), false); @@ -173,23 +172,23 @@ public class PluginArboriculture extends ForestryPlugin { } // Saplings - ForestryBlock.saplingGE.registerBlock(new BlockSapling(), ItemForestryBlock.class, "saplingGE"); + ForestryBlock.saplingGE.registerBlock(new BlockSapling(), ItemBlockForestry.class, "saplingGE"); OreDictionary.registerOre("treeSapling", ForestryBlock.saplingGE.getWildcard()); // Leaves - ForestryBlock.leaves.registerBlock(new ForestryBlockLeaves(), ItemLeavesBlock.class, "leaves"); + ForestryBlock.leaves.registerBlock(new BlockForestryLeaves(), ItemBlockLeaves.class, "leaves"); OreDictionary.registerOre("treeLeaves", ForestryBlock.leaves.getWildcard()); // Pods - ForestryBlock.pods.registerBlock(new BlockFruitPod(), ItemForestryBlock.class, "pods"); + ForestryBlock.pods.registerBlock(new BlockFruitPod(), ItemBlockForestry.class, "pods"); // Machines - ForestryBlock.arboriculture.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "arboriculture"); + ForestryBlock.arboriculture.registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "arboriculture"); ForestryBlock.arboriculture.block().setCreativeTab(Tabs.tabArboriculture); - definitionChest = ((BlockBase) ForestryBlock.arboriculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_ARBCHEST_META, - "forestry.ArbChest", TileArboristChest.class, new RenderNaturalistChest("arbchest"), - ShapedRecipeCustom.createShapedRecipe(ForestryBlock.arboriculture.getItemStack(1, Defaults.DEFINITION_ARBCHEST_META), + definitionChest = ((BlockBase) ForestryBlock.arboriculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_ARBCHEST_META, + "forestry.ArbChest", TileArboristChest.class, new RenderNaturalistChest("arbchest"), + ShapedRecipeCustom.createShapedRecipe(ForestryBlock.arboriculture.getItemStack(1, Constants.DEFINITION_ARBCHEST_META), " # ", "XYX", "XXX", @@ -228,9 +227,9 @@ public class PluginArboriculture extends ForestryPlugin { definitionChest.register(); if (Config.enableVillagers) { - VillagerRegistry.instance().registerVillagerId(Defaults.ID_VILLAGER_LUMBERJACK); - Proxies.render.registerVillagerSkin(Defaults.ID_VILLAGER_LUMBERJACK, Defaults.TEXTURE_SKIN_LUMBERJACK); - VillagerRegistry.instance().registerVillageTradeHandler(Defaults.ID_VILLAGER_LUMBERJACK, new VillageHandlerArboriculture()); + VillagerRegistry.instance().registerVillagerId(Constants.ID_VILLAGER_LUMBERJACK); + Proxies.render.registerVillagerSkin(Constants.ID_VILLAGER_LUMBERJACK, Constants.TEXTURE_SKIN_LUMBERJACK); + VillagerRegistry.instance().registerVillageTradeHandler(Constants.ID_VILLAGER_LUMBERJACK, new VillageHandlerArboriculture()); } } @@ -323,7 +322,7 @@ public class PluginArboriculture extends ForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.PAPAYA.getStack()}, Fluids.JUICE.getFluid(juiceMultiplier * 3), ForestryItem.mulch.getItemStack(), (int) Math.floor(mulchMultiplier * 0.5f)); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.DATES.getStack()}, Fluids.JUICE.getFluid((int) Math.floor(juiceMultiplier * 0.25)), ForestryItem.mulch.getItemStack(), mulchMultiplier); - RecipeUtil.injectLeveledRecipe(ForestryItem.sapling.getItemStack(), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(ForestryItem.sapling.getItemStack(), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); } // Stairs @@ -426,20 +425,20 @@ public class PluginArboriculture extends ForestryPlugin { } private static void registerDungeonLoot() { - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.grafter.getItemStack(), 1, 1, 8)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.grafter.getItemStack(), 1, 1, 8)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Oak.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Spruce.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Birch.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Larch.getMemberStack(EnumGermlingType.SAPLING), 1, 2, 4)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Lime.getMemberStack(EnumGermlingType.SAPLING), 1, 2, 4)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Oak.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Spruce.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Birch.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Larch.getMemberStack(EnumGermlingType.SAPLING), 1, 2, 4)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Lime.getMemberStack(EnumGermlingType.SAPLING), 1, 2, 4)); if (PluginManager.Module.APICULTURE.isEnabled()) { - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Oak.getMemberStack(EnumGermlingType.POLLEN), 2, 3, 4)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Spruce.getMemberStack(EnumGermlingType.POLLEN), 2, 3, 4)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Birch.getMemberStack(EnumGermlingType.POLLEN), 2, 3, 4)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Larch.getMemberStack(EnumGermlingType.POLLEN), 1, 2, 3)); - ChestGenHooks.addItem(Defaults.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Lime.getMemberStack(EnumGermlingType.POLLEN), 1, 2, 3)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Oak.getMemberStack(EnumGermlingType.POLLEN), 2, 3, 4)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Spruce.getMemberStack(EnumGermlingType.POLLEN), 2, 3, 4)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Birch.getMemberStack(EnumGermlingType.POLLEN), 2, 3, 4)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Larch.getMemberStack(EnumGermlingType.POLLEN), 1, 2, 3)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Lime.getMemberStack(EnumGermlingType.POLLEN), 1, 2, 3)); } } diff --git a/src/main/java/forestry/plugins/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/PluginBiomesOPlenty.java index d05ff02eb..e7d666d30 100644 --- a/src/main/java/forestry/plugins/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/PluginBiomesOPlenty.java @@ -27,17 +27,18 @@ import forestry.api.apiculture.FlowerManager; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.Log; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; import forestry.farming.logic.FarmableGenericSapling; -@Plugin(pluginID = "BiomesOPlenty", name = "BiomesOPlenty", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description") +@Plugin(pluginID = "BiomesOPlenty", name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description") public class PluginBiomesOPlenty extends ForestryPlugin { private static final String BoP = "BiomesOPlenty"; @@ -87,7 +88,7 @@ public class PluginBiomesOPlenty extends ForestryPlugin { for (String key : saplingItemKeys) { Item saplingItem = GameRegistry.findItem(BoP, key); String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); - FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); + FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } if (saplings != null && persimmon != null) { @@ -109,11 +110,11 @@ public class PluginBiomesOPlenty extends ForestryPlugin { int saplingYield = GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"); if (saplings != null) { - RecipeUtil.injectLeveledRecipe(new ItemStack(saplings, 1, OreDictionary.WILDCARD_VALUE), saplingYield, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(saplings, 1, OreDictionary.WILDCARD_VALUE), saplingYield, Fluids.BIOMASS); } if (colorizedSaplings != null) { - RecipeUtil.injectLeveledRecipe(new ItemStack(colorizedSaplings, 1, OreDictionary.WILDCARD_VALUE), saplingYield, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(colorizedSaplings, 1, OreDictionary.WILDCARD_VALUE), saplingYield, Fluids.BIOMASS); } } @@ -211,7 +212,7 @@ public class PluginBiomesOPlenty extends ForestryPlugin { ItemStack blockStack = new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE); BackpackManager.backpackItems[backpackId].add(blockStack); } else { - Proxies.log.warning("Missing block: ", blockName); + Log.warning("Missing block: ", blockName); } } } diff --git a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java index e8c159d0b..b1662bed1 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java @@ -14,14 +14,14 @@ import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.common.Optional; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import buildcraft.api.fuels.BuildcraftFuelRegistry; -@Plugin(pluginID = "BC6|Fuels", name = "BuildCraft 6 Fuels", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") +@Plugin(pluginID = "BC6|Fuels", name = "BuildCraft 6 Fuels", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftFuels extends ForestryPlugin { @Override @@ -42,7 +42,7 @@ public class PluginBuildCraftFuels extends ForestryPlugin { Fluid ethanol = Fluids.ETHANOL.getFluid(); if (ethanol != null) { int ethanolPower = 40; - int ethanolBurnTime = Math.round(Defaults.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); + int ethanolBurnTime = Math.round(Constants.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); BuildcraftFuelRegistry.fuel.addFuel(ethanol, ethanolPower, ethanolBurnTime); } } diff --git a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java index 59bbaf254..0574c182a 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java @@ -12,13 +12,13 @@ package forestry.plugins; import cpw.mods.fml.common.Optional; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import buildcraft.api.recipes.BuildcraftRecipeRegistry; -@Plugin(pluginID = "BC6|Recipes", name = "BuildCraft 6 Recipes", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") +@Plugin(pluginID = "BC6|Recipes", name = "BuildCraft 6 Recipes", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftRecipes extends ForestryPlugin { @Override diff --git a/src/main/java/forestry/plugins/PluginBuildCraftStatements.java b/src/main/java/forestry/plugins/PluginBuildCraftStatements.java index ad2a3f876..b722fbb91 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftStatements.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftStatements.java @@ -18,7 +18,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import buildcraft.api.statements.IStatementContainer; @@ -27,7 +27,7 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; import buildcraft.api.statements.StatementManager; -@Plugin(pluginID = "BC6|Statements", name = "BuildCraft 6 Statements", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") +@Plugin(pluginID = "BC6|Statements", name = "BuildCraft 6 Statements", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public class PluginBuildCraftStatements extends ForestryPlugin implements ITriggerProvider { diff --git a/src/main/java/forestry/plugins/PluginBuildCraftTransport.java b/src/main/java/forestry/plugins/PluginBuildCraftTransport.java index 76a0d4033..27e912bf2 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftTransport.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftTransport.java @@ -15,11 +15,12 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; -@Plugin(pluginID = "BC6|Transport", name = "BuildCraft 6 Transport", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") +@Plugin(pluginID = "BC6|Transport", name = "BuildCraft 6 Transport", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftTransport extends ForestryPlugin { private static final String BCT = "BuildCraft|Transport"; @@ -42,7 +43,7 @@ public class PluginBuildCraftTransport extends ForestryPlugin { if (pipeWaterproof != null) { Proxies.common.addShapelessRecipe(new ItemStack(pipeWaterproof), beeswax); } else { - Proxies.log.fine("No BuildCraft pipe waterproof found."); + Log.fine("No BuildCraft pipe waterproof found."); } } } diff --git a/src/main/java/forestry/plugins/PluginChisel.java b/src/main/java/forestry/plugins/PluginChisel.java index 1166c7070..1c5b259f1 100644 --- a/src/main/java/forestry/plugins/PluginChisel.java +++ b/src/main/java/forestry/plugins/PluginChisel.java @@ -14,10 +14,10 @@ import com.google.common.collect.ImmutableList; import cpw.mods.fml.common.event.FMLInterModComms; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -@Plugin(pluginID = "Chisel", name = "Chisel", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.chisel.description") +@Plugin(pluginID = "Chisel", name = "Chisel", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.chisel.description") public class PluginChisel extends ForestryPlugin { private static final String Chisel = "chisel"; @@ -43,7 +43,7 @@ public class PluginChisel extends ForestryPlugin { "diorite" ); for (String wBlocks : worldgenBlocks) { - FMLInterModComms.sendMessage(Defaults.MOD, "add-backpack-items", String.format("digger@%s:%s", Chisel, wBlocks)); + FMLInterModComms.sendMessage(Constants.MOD, "add-backpack-items", String.format("digger@%s:%s", Chisel, wBlocks)); } } diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 3b74bcb81..1d118f9ab 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -32,9 +32,14 @@ import forestry.api.genetics.AlleleManager; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; import forestry.core.CreativeTabForestry; -import forestry.core.GameMode; +import forestry.core.IPickupHandler; +import forestry.core.ISaveEventHandler; import forestry.core.PickupHandlerCore; import forestry.core.SaveEventHandlerCore; +import forestry.core.blocks.BlockBase; +import forestry.core.blocks.BlockResourceOre; +import forestry.core.blocks.BlockResourceStorage; +import forestry.core.blocks.BlockSoil; import forestry.core.circuits.CircuitRegistry; import forestry.core.circuits.ItemCircuitBoard; import forestry.core.circuits.ItemSolderingIron; @@ -42,42 +47,37 @@ import forestry.core.commands.CommandPlugins; import forestry.core.commands.CommandVersion; import forestry.core.commands.RootCommand; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.BlockResource; -import forestry.core.gadgets.BlockResourceStorageBlock; -import forestry.core.gadgets.BlockSoil; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.gadgets.TileEscritoire; -import forestry.core.genetics.ClimateHelper; +import forestry.core.config.GameMode; import forestry.core.genetics.ItemResearchNote; import forestry.core.genetics.alleles.Allele; import forestry.core.genetics.alleles.AlleleFactory; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.AlleleRegistry; -import forestry.core.interfaces.IPickupHandler; -import forestry.core.interfaces.ISaveEventHandler; import forestry.core.items.ItemArmorNaturalist; import forestry.core.items.ItemAssemblyKit; +import forestry.core.items.ItemBlockForestry; +import forestry.core.items.ItemBlockTyped; import forestry.core.items.ItemElectronTube; import forestry.core.items.ItemForestry; -import forestry.core.items.ItemForestryBlock; import forestry.core.items.ItemForestryPickaxe; import forestry.core.items.ItemForestryShovel; import forestry.core.items.ItemFruit; import forestry.core.items.ItemMisc; import forestry.core.items.ItemOverlay.OverlayInfo; import forestry.core.items.ItemPipette; -import forestry.core.items.ItemTypedBlock; import forestry.core.items.ItemWrench; import forestry.core.proxy.Proxies; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.recipes.ShapelessRecipeCustom; +import forestry.core.tiles.MachineDefinition; +import forestry.core.tiles.TileEscritoire; +import forestry.core.utils.ClimateUtil; import forestry.core.utils.ForestryModEnvWarningCallable; -import forestry.core.utils.ShapedRecipeCustom; -import forestry.core.utils.ShapelessRecipeCustom; -@Plugin(pluginID = "Core", name = "Core", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.core.description") +@Plugin(pluginID = "Core", name = "Core", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.core.description") public class PluginCore extends ForestryPlugin { private static MachineDefinition definitionEscritoire; @@ -96,7 +96,7 @@ public class PluginCore extends ForestryPlugin { AlleleRegistry alleleRegistry = new AlleleRegistry(); AlleleManager.alleleRegistry = alleleRegistry; - AlleleManager.climateHelper = new ClimateHelper(); + AlleleManager.climateHelper = new ClimateUtil(); AlleleManager.alleleFactory = new AlleleFactory(); alleleRegistry.initialize(); } @@ -110,23 +110,23 @@ public class PluginCore extends ForestryPlugin { Allele.helper = alleleHelper = new AlleleHelper(); - ForestryBlock.core.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "core"); + ForestryBlock.core.registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "core"); - definitionEscritoire = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class, + definitionEscritoire = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class, Proxies.render.getRenderEscritoire())); - ForestryBlock.soil.registerBlock(new BlockSoil(), ItemTypedBlock.class, "soil"); + ForestryBlock.soil.registerBlock(new BlockSoil(), ItemBlockTyped.class, "soil"); ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 0); ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 1); - ForestryBlock.resources.registerBlock(new BlockResource(), ItemForestryBlock.class, "resources"); + ForestryBlock.resources.registerBlock(new BlockResourceOre(), ItemBlockForestry.class, "resources"); ForestryBlock.resources.block().setHarvestLevel("pickaxe", 1); OreDictionary.registerOre("oreApatite", ForestryBlock.resources.getItemStack(1, 0)); OreDictionary.registerOre("oreCopper", ForestryBlock.resources.getItemStack(1, 1)); OreDictionary.registerOre("oreTin", ForestryBlock.resources.getItemStack(1, 2)); - ForestryBlock.resourceStorage.registerBlock(new BlockResourceStorageBlock(), ItemForestryBlock.class, "resourceStorage"); + ForestryBlock.resourceStorage.registerBlock(new BlockResourceStorage(), ItemBlockForestry.class, "resourceStorage"); ForestryBlock.resourceStorage.block().setHarvestLevel("pickaxe", 0); OreDictionary.registerOre("blockApatite", ForestryBlock.resourceStorage.getItemStack(1, 0)); @@ -424,7 +424,7 @@ public class PluginCore extends ForestryPlugin { Proxies.common.addRecipe(new ItemStack(Items.string), "#", "#", "#", '#', ForestryItem.craftingMaterial.getItemStack(1, 2)); // / Pipette - Proxies.common.addRecipe(ForestryItem.pipette.getItemStack(), " #", " X ", "X ", 'X', "paneGlass", '#', new ItemStack(Blocks.wool, 1, Defaults.WILDCARD)); + Proxies.common.addRecipe(ForestryItem.pipette.getItemStack(), " #", " X ", "X ", 'X', "paneGlass", '#', new ItemStack(Blocks.wool, 1, Constants.WILDCARD)); // Storage Blocks Proxies.common.addRecipe(ForestryBlock.resourceStorage.getItemStack(1, 0), "###", "###", "###", '#', "gemApatite"); diff --git a/src/main/java/forestry/plugins/PluginEnderIO.java b/src/main/java/forestry/plugins/PluginEnderIO.java index 0f18b45b7..081e86fb7 100644 --- a/src/main/java/forestry/plugins/PluginEnderIO.java +++ b/src/main/java/forestry/plugins/PluginEnderIO.java @@ -6,12 +6,12 @@ import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.common.event.FMLInterModComms; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -@Plugin(pluginID = "EnderIO", name = "EnderIO", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.enderIO.description") +@Plugin(pluginID = "EnderIO", name = "EnderIO", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.enderIO.description") public class PluginEnderIO extends ForestryPlugin { private static final String EnderIO = "EnderIO"; @@ -38,7 +38,7 @@ public class PluginEnderIO extends ForestryPlugin { public void doInit() { Fluid ethanol = Fluids.ETHANOL.getFluid(); if (ethanol != null) { - int ethanolBurnTime = Math.round(Defaults.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); + int ethanolBurnTime = Math.round(Constants.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); addFuel(ethanol, 40, ethanolBurnTime); } diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index df0f9ec9b..3e6086e73 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -17,38 +17,38 @@ import net.minecraft.init.Items; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.network.IGuiHandler; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.blocks.BlockBase; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.items.ItemForestryBlock; -import forestry.core.utils.ShapedRecipeCustom; +import forestry.core.config.GameMode; +import forestry.core.items.ItemBlockForestry; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.tiles.MachineDefinition; import forestry.energy.GuiHandlerEnergy; -import forestry.energy.gadgets.EngineBronze; -import forestry.energy.gadgets.EngineClockwork; -import forestry.energy.gadgets.EngineCopper; -import forestry.energy.gadgets.EngineDefinition; import forestry.energy.proxy.ProxyEnergy; +import forestry.energy.tiles.EngineDefinition; +import forestry.energy.tiles.TileEngineBiogas; +import forestry.energy.tiles.TileEngineClockwork; +import forestry.energy.tiles.TileEnginePeat; -@Plugin(pluginID = "Energy", name = "Energy", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.energy.description") +@Plugin(pluginID = "Energy", name = "Energy", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.energy.description") public class PluginEnergy extends ForestryPlugin { - @SidedProxy(clientSide = "forestry.energy.proxy.ClientProxyEnergy", serverSide = "forestry.energy.proxy.ProxyEnergy") + @SidedProxy(clientSide = "forestry.energy.proxy.ProxyEnergyClient", serverSide = "forestry.energy.proxy.ProxyEnergy") public static ProxyEnergy proxy; - private static MachineDefinition definitionEngineCopper; - private static MachineDefinition definitionEngineBronze; + private static MachineDefinition definitionEnginePeat; + private static MachineDefinition definitionEngineBiogas; private static MachineDefinition definitionEngineClockwork; @Override public void preInit() { super.preInit(); - ForestryBlock.engine.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "engine"); + ForestryBlock.engine.registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "engine"); - definitionEngineCopper = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINECOPPER_META, "forestry.EngineCopper", EngineCopper.class, - PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_copper_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINECOPPER_META), + definitionEnginePeat = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Constants.DEFINITION_ENGINE_PEAT_META, "forestry.EngineCopper", TileEnginePeat.class, + PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_copper_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_PEAT_META), "###", " X ", "YVY", @@ -56,9 +56,9 @@ public class PluginEnergy extends ForestryPlugin { 'X', "blockGlass", 'Y', "gearCopper", 'V', Blocks.piston))); - definitionEngineBronze = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINEBRONZE_META, "forestry.EngineBronze", EngineBronze.class, - PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_bronze_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINEBRONZE_META), + definitionEngineBiogas = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Constants.DEFINITION_ENGINE_BIOGAS_META, "forestry.EngineBronze", TileEngineBiogas.class, + PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_bronze_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_BIOGAS_META), "###", " X ", "YVY", @@ -70,7 +70,7 @@ public class PluginEnergy extends ForestryPlugin { ShapedRecipeCustom clockworkRecipe = null; if (GameMode.getGameMode().getBooleanSetting("energy.engine.clockwork")) { clockworkRecipe = ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINECLOCKWORK_META), + ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_CLOCKWORK_META), "###", " X ", "ZVY", @@ -81,16 +81,16 @@ public class PluginEnergy extends ForestryPlugin { 'V', Blocks.piston); } - definitionEngineClockwork = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINECLOCKWORK_META, "forestry.EngineClockwork", EngineClockwork.class, - PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_clock_"), clockworkRecipe)); + definitionEngineClockwork = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Constants.DEFINITION_ENGINE_CLOCKWORK_META, "forestry.EngineClockwork", TileEngineClockwork.class, + PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_clock_"), clockworkRecipe)); } @Override public void doInit() { super.doInit(); - definitionEngineCopper.register(); - definitionEngineBronze.register(); + definitionEnginePeat.register(); + definitionEngineBiogas.register(); definitionEngineClockwork.register(); } diff --git a/src/main/java/forestry/plugins/PluginErebus.java b/src/main/java/forestry/plugins/PluginErebus.java index 1b93902c9..31b781480 100644 --- a/src/main/java/forestry/plugins/PluginErebus.java +++ b/src/main/java/forestry/plugins/PluginErebus.java @@ -16,12 +16,12 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -@Plugin(pluginID = "Erebus", name = "Erebus", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.erebus.description") +@Plugin(pluginID = "Erebus", name = "Erebus", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.erebus.description") public class PluginErebus extends ForestryPlugin { private static final String EREBUS = "erebus"; @@ -40,9 +40,9 @@ public class PluginErebus extends ForestryPlugin { protected void registerRecipes() { super.registerRecipes(); Item materials = GameRegistry.findItem(EREBUS, "materials"); - ItemStack honeyDrip = new ItemStack(materials,1,21); + ItemStack honeyDrip = new ItemStack(materials, 1, 21); if (PluginManager.Module.FACTORY.isEnabled()) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{honeyDrip}, Fluids.HONEY.getFluid(Defaults.FLUID_PER_HONEY_DROP), + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{honeyDrip}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP), ForestryItem.propolis.getItemStack(), 5); } diff --git a/src/main/java/forestry/plugins/PluginExtraUtilities.java b/src/main/java/forestry/plugins/PluginExtraUtilities.java index 53bf32d17..44a594cfc 100644 --- a/src/main/java/forestry/plugins/PluginExtraUtilities.java +++ b/src/main/java/forestry/plugins/PluginExtraUtilities.java @@ -23,14 +23,14 @@ import forestry.api.farming.Farmables; import forestry.api.farming.IFarmable; import forestry.core.circuits.Circuit; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicEnder; import forestry.farming.logic.FarmableGenericCrop; -@Plugin(pluginID = "ExtraUtilities", name = "ExtraUtilities", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.extrautilities.description") +@Plugin(pluginID = "ExtraUtilities", name = "ExtraUtilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.extrautilities.description") public class PluginExtraUtilities extends ForestryPlugin { private static final String ExU = "ExtraUtilities"; diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index 465ae5d13..f77d74636 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -24,41 +24,42 @@ import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitLayout; import forestry.api.recipes.RecipeManagers; -import forestry.core.GameMode; +import forestry.core.blocks.BlockBase; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.items.ItemForestryBlock; -import forestry.core.items.ItemNBTTile; +import forestry.core.items.ItemBlockForestry; +import forestry.core.items.ItemBlockNBT; import forestry.core.network.IPacketHandler; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; -import forestry.core.utils.ShapedRecipeCustom; +import forestry.core.recipes.RecipeUtil; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.recipes.craftguide.CraftGuideIntegration; +import forestry.core.tiles.MachineDefinition; +import forestry.core.utils.Log; import forestry.factory.DummyManagers; import forestry.factory.GuiHandlerFactory; import forestry.factory.circuits.CircuitSpeedUpgrade; -import forestry.factory.gadgets.MachineBottler; -import forestry.factory.gadgets.MachineCarpenter; -import forestry.factory.gadgets.MachineCentrifuge; -import forestry.factory.gadgets.MachineFabricator; -import forestry.factory.gadgets.MachineFermenter; -import forestry.factory.gadgets.MachineMoistener; -import forestry.factory.gadgets.MachineRaintank; -import forestry.factory.gadgets.MachineSqueezer; -import forestry.factory.gadgets.MachineStill; -import forestry.factory.gadgets.MillRainmaker; -import forestry.factory.gadgets.TileWorktable; import forestry.factory.network.PacketHandlerFactory; -import forestry.factory.recipes.craftguide.CraftGuideIntegration; +import forestry.factory.tiles.TileBottler; +import forestry.factory.tiles.TileCarpenter; +import forestry.factory.tiles.TileCentrifuge; +import forestry.factory.tiles.TileFabricator; +import forestry.factory.tiles.TileFermenter; +import forestry.factory.tiles.TileMillRainmaker; +import forestry.factory.tiles.TileMoistener; +import forestry.factory.tiles.TileRaintank; +import forestry.factory.tiles.TileSqueezer; +import forestry.factory.tiles.TileStill; +import forestry.factory.tiles.TileWorktable; import forestry.factory.triggers.FactoryTriggers; -@Plugin(pluginID = "Factory", name = "Factory", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.factory.description") +@Plugin(pluginID = "Factory", name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description") public class PluginFactory extends ForestryPlugin { private static MachineDefinition definitionBottler; @@ -78,13 +79,13 @@ public class PluginFactory extends ForestryPlugin { super.setupAPI(); RecipeManagers.craftingProviders = ImmutableList.of( - RecipeManagers.carpenterManager = new MachineCarpenter.RecipeManager(), - RecipeManagers.centrifugeManager = new MachineCentrifuge.RecipeManager(), - RecipeManagers.fabricatorManager = new MachineFabricator.RecipeManager(), - RecipeManagers.fermenterManager = new MachineFermenter.RecipeManager(), - RecipeManagers.moistenerManager = new MachineMoistener.RecipeManager(), - RecipeManagers.squeezerManager = new MachineSqueezer.RecipeManager(), - RecipeManagers.stillManager = new MachineStill.RecipeManager() + RecipeManagers.carpenterManager = new TileCarpenter.RecipeManager(), + RecipeManagers.centrifugeManager = new TileCentrifuge.RecipeManager(), + RecipeManagers.fabricatorManager = new TileFabricator.RecipeManager(), + RecipeManagers.fermenterManager = new TileFermenter.RecipeManager(), + RecipeManagers.moistenerManager = new TileMoistener.RecipeManager(), + RecipeManagers.squeezerManager = new TileSqueezer.RecipeManager(), + RecipeManagers.stillManager = new TileStill.RecipeManager() ); } @@ -112,13 +113,13 @@ public class PluginFactory extends ForestryPlugin { public void preInit() { super.preInit(); - ForestryBlock.factoryTESR.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "factory"); + ForestryBlock.factoryTESR.registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "factory"); BlockBase factoryTESR = ((BlockBase) ForestryBlock.factoryTESR.block()); - definitionBottler = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_BOTTLER_META, "forestry.Bottler", MachineBottler.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/bottler_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_BOTTLER_META), + definitionBottler = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_BOTTLER_META, "forestry.Bottler", TileBottler.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/bottler_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_BOTTLER_META), "X#X", "#Y#", "X#X", @@ -126,9 +127,9 @@ public class PluginFactory extends ForestryPlugin { 'X', ForestryItem.canEmpty, 'Y', ForestryItem.sturdyCasing))); - definitionCarpenter = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_CARPENTER_META, "forestry.Carpenter", MachineCarpenter.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/carpenter_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_CARPENTER_META), + definitionCarpenter = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_CARPENTER_META, "forestry.Carpenter", TileCarpenter.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/carpenter_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_CARPENTER_META), "X#X", "XYX", "X#X", @@ -136,9 +137,9 @@ public class PluginFactory extends ForestryPlugin { 'X', "ingotBronze", 'Y', ForestryItem.sturdyCasing))); - definitionCentrifuge = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_CENTRIFUGE_META, "forestry.Centrifuge", MachineCentrifuge.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/centrifuge_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_CENTRIFUGE_META), + definitionCentrifuge = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_CENTRIFUGE_META, "forestry.Centrifuge", TileCentrifuge.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/centrifuge_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_CENTRIFUGE_META), "X#X", "XYX", "X#X", @@ -146,9 +147,9 @@ public class PluginFactory extends ForestryPlugin { 'X', "ingotCopper", 'Y', ForestryItem.sturdyCasing.getItemStack()))); - definitionFermenter = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_FERMENTER_META, "forestry.Fermenter", MachineFermenter.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/fermenter_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_FERMENTER_META), + definitionFermenter = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_FERMENTER_META, "forestry.Fermenter", TileFermenter.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/fermenter_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_FERMENTER_META), "X#X", "#Y#", "X#X", @@ -156,9 +157,9 @@ public class PluginFactory extends ForestryPlugin { 'X', "gearBronze", 'Y', ForestryItem.sturdyCasing))); - definitionMoistener = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_MOISTENER_META, "forestry.Moistener", MachineMoistener.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/moistener_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_MOISTENER_META), + definitionMoistener = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_MOISTENER_META, "forestry.Moistener", TileMoistener.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/moistener_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_MOISTENER_META), "X#X", "#Y#", "X#X", @@ -166,9 +167,9 @@ public class PluginFactory extends ForestryPlugin { 'X', "gearCopper", 'Y', ForestryItem.sturdyCasing))); - definitionSqueezer = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_SQUEEZER_META, "forestry.Squeezer", MachineSqueezer.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/squeezer_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_SQUEEZER_META), + definitionSqueezer = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_SQUEEZER_META, "forestry.Squeezer", TileSqueezer.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/squeezer_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_SQUEEZER_META), "X#X", "XYX", "X#X", @@ -176,9 +177,9 @@ public class PluginFactory extends ForestryPlugin { 'X', "ingotTin", 'Y', ForestryItem.sturdyCasing.getItemStack()))); - definitionStill = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_STILL_META, "forestry.Still", MachineStill.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/still_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_STILL_META), + definitionStill = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_STILL_META, "forestry.Still", TileStill.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/still_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_STILL_META), "X#X", "#Y#", "X#X", @@ -186,9 +187,9 @@ public class PluginFactory extends ForestryPlugin { 'X', "dustRedstone", 'Y', ForestryItem.sturdyCasing))); - definitionRainmaker = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_RAINMAKER_META, "forestry.Rainmaker", MillRainmaker.class, - Proxies.render.getRenderMill(Defaults.TEXTURE_PATH_BLOCKS + "/rainmaker_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryTESR.getItemStack(1, Defaults.DEFINITION_RAINMAKER_META), + definitionRainmaker = factoryTESR.addDefinition(new MachineDefinition(Constants.DEFINITION_RAINMAKER_META, "forestry.Rainmaker", TileMillRainmaker.class, + Proxies.render.getRenderMill(Constants.TEXTURE_PATH_BLOCKS + "/rainmaker_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.factoryTESR.getItemStack(1, Constants.DEFINITION_RAINMAKER_META), "X#X", "#Y#", "X#X", @@ -196,13 +197,13 @@ public class PluginFactory extends ForestryPlugin { 'X', "gearTin", 'Y', ForestryItem.hardenedCasing))); - ForestryBlock.factoryPlain.registerBlock(new BlockBase(Material.iron), ItemNBTTile.class, "factory2"); + ForestryBlock.factoryPlain.registerBlock(new BlockBase(Material.iron), ItemBlockNBT.class, "factory2"); BlockBase factoryPlain = ((BlockBase) ForestryBlock.factoryPlain.block()); - definitionFabricator = factoryPlain.addDefinition(new MachineDefinition(Defaults.DEFINITION_FABRICATOR_META, "forestry.Fabricator", MachineFabricator.class, + definitionFabricator = factoryPlain.addDefinition(new MachineDefinition(Constants.DEFINITION_FABRICATOR_META, "forestry.Fabricator", TileFabricator.class, ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.factoryPlain.getItemStack(1, Defaults.DEFINITION_FABRICATOR_META), + ForestryBlock.factoryPlain.getItemStack(1, Constants.DEFINITION_FABRICATOR_META), "X#X", "#Y#", "XZX", @@ -212,8 +213,8 @@ public class PluginFactory extends ForestryPlugin { 'Z', "chestWood")) .setFaces(0, 1, 2, 3, 4, 4)); - definitionRaintank = factoryPlain.addDefinition(new MachineDefinition(Defaults.DEFINITION_RAINTANK_META, "forestry.Raintank", MachineRaintank.class, - ShapedRecipeCustom.createShapedRecipe(ForestryBlock.factoryPlain.getItemStack(1, Defaults.DEFINITION_RAINTANK_META), + definitionRaintank = factoryPlain.addDefinition(new MachineDefinition(Constants.DEFINITION_RAINTANK_META, "forestry.Raintank", TileRaintank.class, + ShapedRecipeCustom.createShapedRecipe(ForestryBlock.factoryPlain.getItemStack(1, Constants.DEFINITION_RAINTANK_META), "X#X", "XYX", "X#X", @@ -222,8 +223,8 @@ public class PluginFactory extends ForestryPlugin { 'Y', ForestryItem.sturdyCasing)) .setFaces(0, 1, 0, 0, 0, 0)); - definitionWorktable = factoryPlain.addDefinition(new MachineDefinition(Defaults.DEFINITION_WORKTABLE_META, "forestry.Worktable", TileWorktable.class, - ShapedRecipeCustom.createShapedRecipe(ForestryBlock.factoryPlain.getItemStack(1, Defaults.DEFINITION_WORKTABLE_META), + definitionWorktable = factoryPlain.addDefinition(new MachineDefinition(Constants.DEFINITION_WORKTABLE_META, "forestry.Worktable", TileWorktable.class, + ShapedRecipeCustom.createShapedRecipe(ForestryBlock.factoryPlain.getItemStack(1, Constants.DEFINITION_WORKTABLE_META), "B", "W", "C", @@ -270,7 +271,7 @@ public class PluginFactory extends ForestryPlugin { if (Proxies.common.isModLoaded("craftguide")) { CraftGuideIntegration.register(); } else { - Proxies.log.info("Skipping CraftGuide integration."); + Log.info("Skipping CraftGuide integration."); } } @@ -308,10 +309,10 @@ public class PluginFactory extends ForestryPlugin { "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite"}; if (PluginManager.Module.APICULTURE.isEnabled()) { - FluidStack liquidGlass = Fluids.GLASS.getFluid(Defaults.BUCKET_VOLUME); + FluidStack liquidGlass = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME); for (int i = 0; i < 16; i++) { - RecipeManagers.fabricatorManager.addRecipe(ForestryItem.waxCast.getItemStack(1, Defaults.WILDCARD), liquidGlass, new ItemStack(Blocks.stained_glass, 4, 15 - i), new Object[]{"#", "X", '#', dyes[i], - 'X', ForestryItem.propolis.getItemStack(1, Defaults.WILDCARD)}); + RecipeManagers.fabricatorManager.addRecipe(ForestryItem.waxCast.getItemStack(1, Constants.WILDCARD), liquidGlass, new ItemStack(Blocks.stained_glass, 4, 15 - i), new Object[]{"#", "X", '#', dyes[i], + 'X', ForestryItem.propolis.getItemStack(1, Constants.WILDCARD)}); } } @@ -331,8 +332,8 @@ public class PluginFactory extends ForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.snowball), ForestryItem.craftingMaterial.getItemStack(4, 5)}, Fluids.ICE.getFluid(4000)); // STILL - RecipeManagers.stillManager.addRecipe(Defaults.STILL_DESTILLATION_DURATION, Fluids.BIOMASS.getFluid(Defaults.STILL_DESTILLATION_INPUT), - Fluids.ETHANOL.getFluid(Defaults.STILL_DESTILLATION_OUTPUT)); + RecipeManagers.stillManager.addRecipe(Constants.STILL_DESTILLATION_DURATION, Fluids.BIOMASS.getFluid(Constants.STILL_DESTILLATION_INPUT), + Fluids.ETHANOL.getFluid(Constants.STILL_DESTILLATION_OUTPUT)); // convert old honey to new honey RecipeManagers.stillManager.addRecipe(1, Fluids.LEGACY_HONEY.getFluid(1000), Fluids.HONEY.getFluid(1000)); @@ -344,14 +345,14 @@ public class PluginFactory extends ForestryPlugin { // FERMENTER for (int i = 0; i < 6; i++) { - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.sapling, 1, i), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.sapling, 1, i), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); } - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.cactus), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cactus"), Fluids.BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Items.wheat), GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Items.reeds), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cane"), Fluids.BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.brown_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.red_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.cactus), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cactus"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(Items.wheat), GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(Items.reeds), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cane"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.brown_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.red_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); // FABRICATOR @@ -366,7 +367,7 @@ public class PluginFactory extends ForestryPlugin { "###", '#', "logWood"); RecipeManagers.carpenterManager.addRecipe(50, Fluids.SEEDOIL.getFluid(500), null, - ForestryBlock.core.getItemStack(1, Defaults.DEFINITION_ESCRITOIRE_META), + ForestryBlock.core.getItemStack(1, Constants.DEFINITION_ESCRITOIRE_META), "# ", "###", "# #", diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 848abc618..818f83fe2 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -37,17 +37,18 @@ import forestry.api.farming.Farmables; import forestry.api.farming.IFarmable; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; -import forestry.core.items.ItemTypedBlock; -import forestry.core.proxy.Proxies; -import forestry.core.utils.ShapedRecipeCustom; +import forestry.core.items.ItemBlockTyped; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.utils.Log; import forestry.farming.EventHandlerFarming; import forestry.farming.GuiHandlerFarming; +import forestry.farming.blocks.BlockFarm; +import forestry.farming.blocks.BlockMushroom; import forestry.farming.circuits.CircuitFarmLogic; -import forestry.farming.gadgets.BlockMushroom; -import forestry.farming.items.ItemFarmBlock; +import forestry.farming.items.ItemBlockFarm; import forestry.farming.logic.FarmLogicArboreal; import forestry.farming.logic.FarmLogicCereal; import forestry.farming.logic.FarmLogicCocoa; @@ -67,20 +68,19 @@ import forestry.farming.logic.FarmableGourd; import forestry.farming.logic.FarmableStacked; import forestry.farming.logic.FarmableVanillaSapling; import forestry.farming.logic.FarmableVanillaShroom; -import forestry.farming.multiblock.BlockFarm; -import forestry.farming.multiblock.EnumFarmBlockTexture; -import forestry.farming.multiblock.TileControl; -import forestry.farming.multiblock.TileFarmPlain; -import forestry.farming.multiblock.TileGearbox; -import forestry.farming.multiblock.TileHatch; -import forestry.farming.multiblock.TileValve; import forestry.farming.proxy.ProxyFarming; +import forestry.farming.render.EnumFarmBlockTexture; +import forestry.farming.tiles.TileControl; +import forestry.farming.tiles.TileFarmPlain; +import forestry.farming.tiles.TileGearbox; +import forestry.farming.tiles.TileHatch; +import forestry.farming.tiles.TileValve; import forestry.farming.triggers.FarmingTriggers; -@Plugin(pluginID = "Farming", name = "Farming", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.farming.description") +@Plugin(pluginID = "Farming", name = "Farming", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.farming.description") public class PluginFarming extends ForestryPlugin { - @SidedProxy(clientSide = "forestry.farming.proxy.ClientProxyFarming", serverSide = "forestry.farming.proxy.ProxyFarming") + @SidedProxy(clientSide = "forestry.farming.proxy.ProxyFarmingClient", serverSide = "forestry.farming.proxy.ProxyFarming") public static ProxyFarming proxy; public static int modelIdFarmBlock; public static ItemStack farmFertilizer; @@ -89,7 +89,7 @@ public class PluginFarming extends ForestryPlugin { public void preInit() { super.preInit(); - ForestryBlock.mushroom.registerBlock(new BlockMushroom(), ItemTypedBlock.class, "mushroom"); + ForestryBlock.mushroom.registerBlock(new BlockMushroom(), ItemBlockTyped.class, "mushroom"); Farmables.farmables.put("farmArboreal", new ArrayList()); Farmables.farmables.get("farmArboreal").add(new FarmableVanillaSapling()); @@ -125,9 +125,9 @@ public class PluginFarming extends ForestryPlugin { Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(Items.potato), Blocks.potatoes, 7)); Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(Items.carrot), Blocks.carrots, 7)); - ForestryBlock.farm.registerBlock(new BlockFarm(), ItemFarmBlock.class, "ffarm"); + ForestryBlock.farm.registerBlock(new BlockFarm(), ItemBlockFarm.class, "ffarm"); /*Item.itemsList[ForestryBlock.farm] = null; - Item.itemsList[ForestryBlock.farm] = (new ItemFarmBlock(ForestryBlock.farm - 256, "ffarm"));*/ + Item.itemsList[ForestryBlock.farm] = (new ItemBlockFarm(ForestryBlock.farm - 256, "ffarm"));*/ ForestryBlock.farm.block().setHarvestLevel("pickaxe", 0); proxy.initializeRendering(); @@ -188,12 +188,12 @@ public class PluginFarming extends ForestryPlugin { String[] tokens = message.getStringValue().split("@"); String errormsg = getInvalidIMCMessageText(message); if (tokens.length != 2) { - Proxies.log.warning(errormsg); + Log.warning(errormsg); return true; } if (!Farmables.farmables.containsKey(tokens[0])) { - Proxies.log.warning("%s For non-existent farm %s.", errormsg, tokens[0]); + Log.warning("%s For non-existent farm %s.", errormsg, tokens[0]); return true; } @@ -203,7 +203,7 @@ public class PluginFarming extends ForestryPlugin { Matcher matcher = Pattern.compile("(.+?)\\.(-?[0-9][0-9]?)(?:\\.(.+?)\\.(-?[0-9][0-9]?))?").matcher(itemString); if (!matcher.matches()) { - Proxies.log.warning("%s For farm '%s': unable to parse string.", errormsg, tokens[0]); + Log.warning("%s For farm '%s': unable to parse string.", errormsg, tokens[0]); return true; } @@ -233,7 +233,7 @@ public class PluginFarming extends ForestryPlugin { farmables.add(new FarmableGenericSapling(sapling, saplingMeta, windfallStack)); } } catch (Exception ex) { - Proxies.log.warning("%s for farm '%s': %s", errormsg, tokens[0], ex.getMessage()); + Log.warning("%s for farm '%s': %s", errormsg, tokens[0], ex.getMessage()); } return true; @@ -242,18 +242,18 @@ public class PluginFarming extends ForestryPlugin { String[] tokens = message.getStringValue().split("@"); String errormsg = getInvalidIMCMessageText(message); if (tokens.length != 2) { - Proxies.log.warning(errormsg); + Log.warning(errormsg); return true; } if (!Farmables.farmables.containsKey(tokens[0])) { - Proxies.log.warning("%s For non-existent farm %s.", errormsg, tokens[0]); + Log.warning("%s For non-existent farm %s.", errormsg, tokens[0]); return true; } String[] items = tokens[1].split("[\\.]+"); if (items.length != 4) { - Proxies.log.warning("%s For farm '%s': id definitions did not match.", errormsg, tokens[0]); + Log.warning("%s For farm '%s': id definitions did not match.", errormsg, tokens[0]); return true; } @@ -272,7 +272,7 @@ public class PluginFarming extends ForestryPlugin { crop, Integer.parseInt(items[3]))); } catch (Exception ex) { - Proxies.log.warning("%s for farm '%s': %s", errormsg, tokens[0], ex.getMessage()); + Log.warning("%s for farm '%s': %s", errormsg, tokens[0], ex.getMessage()); } return true; diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/plugins/PluginFluids.java index 184a36092..b0e46295b 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/plugins/PluginFluids.java @@ -35,19 +35,20 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; -import forestry.core.GameMode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.BlockForestryFluid; import forestry.core.fluids.Fluids; +import forestry.core.fluids.LiquidRegistryHelper; import forestry.core.items.ItemLiquidContainer; import forestry.core.proxy.Proxies; -import forestry.core.utils.LiquidHelper; +import forestry.core.utils.Log; import static forestry.core.items.ItemLiquidContainer.EnumContainerType; -@Plugin(pluginID = "Fluids", name = "Fluids", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.fluids.description") +@Plugin(pluginID = "Fluids", name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.fluids.description") public class PluginFluids extends ForestryPlugin { private static final List forestryFluidsWithBlocks = new ArrayList(); @@ -77,7 +78,7 @@ public class PluginFluids extends ForestryPlugin { } } else { GameRegistry.UniqueIdentifier blockID = GameRegistry.findUniqueIdentifierFor(fluidBlock); - Proxies.log.severe("Pre-existing {0} fluid block detected, deferring to {1}:{2}, " + Log.severe("Pre-existing {0} fluid block detected, deferring to {1}:{2}, " + "this may cause issues if the server/client have different mod load orders, " + "recommended that you disable all but one instance of {0} fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name); } @@ -135,11 +136,11 @@ public class PluginFluids extends ForestryPlugin { continue; } - LiquidHelper.injectLiquidContainer(fluidType, container.getItemStack()); + LiquidRegistryHelper.registerLiquidContainer(fluidType, container.getItemStack()); } for (ItemStack filledContainer : fluidType.getOtherContainers()) { - LiquidHelper.injectLiquidContainer(fluidType, filledContainer); + LiquidRegistryHelper.registerLiquidContainer(fluidType, filledContainer); } } diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index f3c7675fa..f0732a9dc 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -18,12 +18,12 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.food.BeverageManager; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; +import forestry.core.fluids.LiquidRegistryHelper; import forestry.core.items.ItemForestryFood; import forestry.core.proxy.Proxies; -import forestry.core.utils.LiquidHelper; import forestry.food.BeverageEffect; import forestry.food.GuiHandlerFood; import forestry.food.items.ItemAmbrosia; @@ -31,7 +31,7 @@ import forestry.food.items.ItemBeverage; import forestry.food.items.ItemBeverage.BeverageInfo; import forestry.food.items.ItemInfuser; -@Plugin(pluginID = "Food", name = "Food", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.food.description") +@Plugin(pluginID = "Food", name = "Food", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.food.description") public class PluginFood extends ForestryPlugin { @Override @@ -68,7 +68,7 @@ public class PluginFood extends ForestryPlugin { ItemStack meadBottle = ForestryItem.beverage.getItemStack(); BeverageInfo.saveEffects(meadBottle, Collections.singletonList(BeverageEffect.weakAlcoholic)); - LiquidHelper.injectLiquidContainer(Fluids.SHORT_MEAD, Defaults.BUCKET_VOLUME, meadBottle, new ItemStack(Items.glass_bottle)); + LiquidRegistryHelper.registerLiquidContainer(Fluids.SHORT_MEAD, Constants.BUCKET_VOLUME, meadBottle, new ItemStack(Items.glass_bottle)); } @Override diff --git a/src/main/java/forestry/plugins/PluginGrowthCraft.java b/src/main/java/forestry/plugins/PluginGrowthCraft.java index 56a0f3334..4abfe6aab 100644 --- a/src/main/java/forestry/plugins/PluginGrowthCraft.java +++ b/src/main/java/forestry/plugins/PluginGrowthCraft.java @@ -20,15 +20,15 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.FarmableBasicGrowthCraft; -@Plugin(pluginID = "Growthcraft", name = "Growthcraft", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.growthcraft.description") +@Plugin(pluginID = "Growthcraft", name = "Growthcraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.growthcraft.description") public class PluginGrowthCraft extends ForestryPlugin { private static final String GC = "Growthcraft"; @@ -54,7 +54,7 @@ public class PluginGrowthCraft extends ForestryPlugin { ItemStack hopSeed = GameRegistry.findItemStack("Growthcraft|Hops", "grc.hopSeeds", 1); ItemStack riceSeed = GameRegistry.findItemStack("Growthcraft|Rice", "grc.rice", 1); - if ( appleSeed != null) { + if (appleSeed != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{appleSeed}, Fluids.SEEDOIL.getFluid(seedamount)); BackpackManager.backpackItems[2].add(appleSeed); } @@ -71,10 +71,10 @@ public class PluginGrowthCraft extends ForestryPlugin { BackpackManager.backpackItems[2].add(riceSeed); } - ItemStack hops = GameRegistry.findItemStack("Growthcraft|Hops","grc.hops", 1); + ItemStack hops = GameRegistry.findItemStack("Growthcraft|Hops", "grc.hops", 1); if (hops != null) { - RecipeUtil.injectLeveledRecipe(hops, saplingYield, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(hops, saplingYield, Fluids.BIOMASS); BackpackManager.backpackItems[2].add(hops); } @@ -84,7 +84,7 @@ public class PluginGrowthCraft extends ForestryPlugin { } Block riceBlock = GameRegistry.findBlock("Growthcraft|Rice", "grc.riceBlock"); if (riceBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(riceBlock, 7, true,false)); //need to set paddyfield to 7 + Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(riceBlock, 7, true, false)); //need to set paddyfield to 7 } ItemStack emptyComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 0); @@ -102,29 +102,29 @@ public class PluginGrowthCraft extends ForestryPlugin { ItemStack bambooShoot = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bambooShoot", 1); ItemStack bambooShootFood = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bambooShootFood", 1); if (bamboo != null) { - RecipeUtil.injectLeveledRecipe(bamboo, saplingYield, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(bamboo, saplingYield, Fluids.BIOMASS); BackpackManager.backpackItems[2].add(bamboo); } if (bambooShoot != null) { - RecipeUtil.injectLeveledRecipe(bambooShoot, saplingYield, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(bambooShoot, saplingYield, Fluids.BIOMASS); BackpackManager.backpackItems[2].add(bambooShoot); } if (bambooShootFood != null) { - RecipeUtil.injectLeveledRecipe(bambooShootFood, saplingYield, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(bambooShootFood, saplingYield, Fluids.BIOMASS); BackpackManager.backpackItems[2].add(bambooShootFood); } - ItemStack grapes = GameRegistry.findItemStack("Growthcraft|Grapes","grc.grapes",1); //squeeze + ItemStack grapes = GameRegistry.findItemStack("Growthcraft|Grapes", "grc.grapes", 1); //squeeze if (grapes != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{grapes}, Fluids.JUICE.getFluid(juiceAmount)); } - Block grapeBlock = GameRegistry.findBlock("Growthcraft|Grapes","grc.grapeBlock"); + Block grapeBlock = GameRegistry.findBlock("Growthcraft|Grapes", "grc.grapeBlock"); if (grapeBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(grapeBlock, 0,false,true)); + Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(grapeBlock, 0, false, true)); } - ItemStack bambooLeaves = GameRegistry.findItemStack("Growthcraft|Bamboo","grc.bambooLeaves",1); + ItemStack bambooLeaves = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bambooLeaves", 1); if (bambooLeaves != null) { BackpackManager.backpackItems[2].add(bambooLeaves); } diff --git a/src/main/java/forestry/plugins/PluginHarvestCraft.java b/src/main/java/forestry/plugins/PluginHarvestCraft.java index ef01e5fbc..393ae640f 100644 --- a/src/main/java/forestry/plugins/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/PluginHarvestCraft.java @@ -22,16 +22,16 @@ import forestry.api.farming.Farmables; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.RecipeManagers; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; -@Plugin(pluginID = "HarvestCraft", name = "HarvestCraft", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.harvestcraft.description") +@Plugin(pluginID = "HarvestCraft", name = "HarvestCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.harvestcraft.description") public class PluginHarvestCraft extends ForestryPlugin { private static final String HC = "harvestcraft"; @@ -305,7 +305,7 @@ public class PluginHarvestCraft extends ForestryPlugin { for (String plantName : plants.build()) { ItemStack plant = GameRegistry.findItemStack(HC, plantName + "Item", 1); if (plant != null) { - RecipeUtil.injectLeveledRecipe(plant, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(plant, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); } } @@ -338,7 +338,7 @@ public class PluginHarvestCraft extends ForestryPlugin { ItemStack hcHoneyItem = GameRegistry.findItemStack(HC, "honeyItem", 1); if (hcHoneyItem != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{hcHoneyItem}, Fluids.HONEY.getFluid(Defaults.FLUID_PER_HONEY_DROP)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{hcHoneyItem}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP)); } ItemStack hcBeeswaxItem = GameRegistry.findItemStack(HC, "beeswaxItem", 1); diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 925ac6998..847e8f1de 100644 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -33,27 +33,28 @@ import forestry.api.storage.BackpackManager; import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.core.GameMode; +import forestry.core.blocks.BlockBase; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.MachineDefinition; +import forestry.core.fluids.LiquidRegistryHelper; import forestry.core.proxy.Proxies; -import forestry.core.utils.LiquidHelper; -import forestry.core.utils.RecipeUtil; -import forestry.core.utils.ShapedRecipeCustom; -import forestry.core.utils.StackUtils; +import forestry.core.recipes.RecipeUtil; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.tiles.MachineDefinition; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Log; import forestry.energy.circuits.CircuitElectricBoost; import forestry.energy.circuits.CircuitElectricChoke; import forestry.energy.circuits.CircuitElectricEfficiency; import forestry.energy.circuits.CircuitFireDampener; -import forestry.energy.gadgets.EngineDefinition; -import forestry.energy.gadgets.EngineTin; -import forestry.energy.gadgets.MachineGenerator; +import forestry.energy.tiles.EngineDefinition; +import forestry.energy.tiles.TileEngineElectric; +import forestry.energy.tiles.TileGenerator; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicRubber; @@ -61,14 +62,14 @@ import ic2.api.item.IC2Items; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.Recipes; -@Plugin(pluginID = "IC2", name = "IndustrialCraft2", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.ic2.description") +@Plugin(pluginID = "IC2", name = "IndustrialCraft2", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.ic2.description") public class PluginIC2 extends ForestryPlugin { public static PluginIC2 instance; // Forestry stuff private static MachineDefinition definitionGenerator; - private static MachineDefinition definitionEngineTin; + private static MachineDefinition definitionEngineElectric; // IC2 stuff private static ItemStack plantBall; @@ -119,9 +120,9 @@ public class PluginIC2 extends ForestryPlugin { public void preInit() { super.preInit(); - definitionEngineTin = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINETIN_META, "forestry.EngineTin", EngineTin.class, - PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_tin_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINETIN_META), + definitionEngineElectric = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Constants.DEFINITION_ENGINE_ELECTRIC_META, "forestry.EngineTin", TileEngineElectric.class, + PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + "/engine_tin_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_ENGINE_ELECTRIC_META), "###", " X ", "YVY", @@ -130,9 +131,9 @@ public class PluginIC2 extends ForestryPlugin { 'Y', "gearTin", 'V', Blocks.piston))); - definitionGenerator = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_GENERATOR_META, "forestry.Generator", MachineGenerator.class, - Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/generator_"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_GENERATOR_META), + definitionGenerator = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_GENERATOR_META, "forestry.Generator", TileGenerator.class, + Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/generator_"), ShapedRecipeCustom.createShapedRecipe( + ForestryBlock.engine.getItemStack(1, Constants.DEFINITION_GENERATOR_META), "X#X", "XYX", "X#X", @@ -145,7 +146,7 @@ public class PluginIC2 extends ForestryPlugin { lavaCell = IC2Items.getItem("lavaCell"); waterCell = IC2Items.getItem("waterCell"); } else { - Proxies.log.fine("IC2 empty cell could not be found. Skipped adding IC2 liquid containers."); + Log.fine("IC2 empty cell could not be found. Skipped adding IC2 liquid containers."); } // rubber chain @@ -185,10 +186,10 @@ public class PluginIC2 extends ForestryPlugin { Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beePrincessGE.getItemStack())); } } else { - Proxies.log.severe("IC2 Recipes.recyclerBlacklist not found."); + Log.severe("IC2 Recipes.recyclerBlacklist not found."); } - definitionEngineTin.register(); + definitionEngineElectric.register(); definitionGenerator.register(); Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1"); @@ -261,45 +262,45 @@ public class PluginIC2 extends ForestryPlugin { } if (plantBall != null) { - RecipeUtil.injectLeveledRecipe(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS); } if (compressedPlantBall != null) { - RecipeUtil.injectLeveledRecipe(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS); } if (resin != null) { RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.propolis.getItemStack(), ImmutableMap.of(resin, 1.0f)); } else { - Proxies.log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin."); + Log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin."); } if (rubbersapling != null) { - RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); } else { - Proxies.log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass."); + Log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass."); } if (rubbersapling != null && resin != null) { - String saplingName = GameData.getBlockRegistry().getNameForObject(StackUtils.getBlock(rubbersapling)); + String saplingName = GameData.getBlockRegistry().getNameForObject(ItemStackUtil.getBlock(rubbersapling)); String resinName = GameData.getItemRegistry().getNameForObject(resin.getItem()); String imc = String.format("farmArboreal@%s.%s.%s.%s", saplingName, rubbersapling.getItemDamage(), resinName, resin.getItemDamage()); - Proxies.log.finest("Sending IMC '%s'.", imc); - FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", imc); + Log.finest("Sending IMC '%s'.", imc); + FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", imc); } FluidStack biogas = FluidRegistry.getFluidStack("ic2biogas", 1000); if (biogas != null && PluginManager.Module.ENERGY.isEnabled()) { FuelManager.bronzeEngineFuel.put(biogas.getFluid(), new EngineBronzeFuel(Fluids.BIOMASS.getFluid(), - Defaults.ENGINE_FUEL_VALUE_BIOMASS, (int) ((Defaults.ENGINE_CYCLE_DURATION_BIOMASS * GameMode.getGameMode().getFloatSetting("fuel.biomass.biogas"))), 1)); + Constants.ENGINE_FUEL_VALUE_BIOMASS, (int) ((Constants.ENGINE_CYCLE_DURATION_BIOMASS * GameMode.getGameMode().getFloatSetting("fuel.biomass.biogas"))), 1)); } if (lavaCell != null) { - LiquidHelper.injectTinContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell); + LiquidRegistryHelper.registerTinContainer(Fluids.LAVA, Constants.BUCKET_VOLUME, lavaCell, emptyCell); } if (waterCell != null) { - LiquidHelper.injectTinContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell); + LiquidRegistryHelper.registerTinContainer(Fluids.WATER, Constants.BUCKET_VOLUME, waterCell, emptyCell); ItemStack bogEarthCan = GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"); if (bogEarthCan.stackSize > 0) { diff --git a/src/main/java/forestry/plugins/PluginImmersiveEngineering.java b/src/main/java/forestry/plugins/PluginImmersiveEngineering.java index 54494c8ac..a8f10473f 100644 --- a/src/main/java/forestry/plugins/PluginImmersiveEngineering.java +++ b/src/main/java/forestry/plugins/PluginImmersiveEngineering.java @@ -17,13 +17,13 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import forestry.farming.logic.FarmableGenericCrop; -@Plugin(pluginID = "ImmersiveEngineering", name = "ImmersiveEngineering", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.immersiveengineering.description") +@Plugin(pluginID = "ImmersiveEngineering", name = "ImmersiveEngineering", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.immersiveengineering.description") public class PluginImmersiveEngineering extends ForestryPlugin { private static final String ImEng = "ImmersiveEngineering"; diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 3fca030fe..c7420cbf0 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -33,26 +33,24 @@ import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Defaults; +import forestry.core.blocks.BlockBase; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.config.LocalizedConfiguration; import forestry.core.fluids.Fluids; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.MachineDefinition; import forestry.core.genetics.Branch; import forestry.core.genetics.alleles.Allele; -import forestry.core.items.ItemForestryBlock; -import forestry.core.proxy.Proxies; +import forestry.core.items.ItemBlockForestry; +import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.render.RenderNaturalistChest; -import forestry.core.utils.ShapedRecipeCustom; -import forestry.core.utils.Utils; +import forestry.core.tiles.MachineDefinition; +import forestry.core.utils.EntityUtil; +import forestry.core.utils.Log; import forestry.lepidopterology.ButterflySpawner; import forestry.lepidopterology.GuiHandlerLepidopterology; -import forestry.lepidopterology.MatingRecipe; import forestry.lepidopterology.commands.CommandButterfly; import forestry.lepidopterology.entities.EntityButterfly; -import forestry.lepidopterology.gadgets.TileLepidopteristChest; import forestry.lepidopterology.genetics.AlleleButterflySpecies; import forestry.lepidopterology.genetics.AlleleEffectNone; import forestry.lepidopterology.genetics.ButterflyHelper; @@ -60,11 +58,13 @@ import forestry.lepidopterology.genetics.ButterflyTemplates; import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemFlutterlyzer; import forestry.lepidopterology.proxy.ProxyLepidopterology; +import forestry.lepidopterology.recipes.MatingRecipe; +import forestry.lepidopterology.tiles.TileLepidopteristChest; -@Plugin(pluginID = "Lepidopterology", name = "Lepidopterology", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.lepidopterology.description") +@Plugin(pluginID = "Lepidopterology", name = "Lepidopterology", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.lepidopterology.description") public class PluginLepidopterology extends ForestryPlugin { - @SidedProxy(clientSide = "forestry.lepidopterology.proxy.ClientProxyLepidopterology", serverSide = "forestry.lepidopterology.proxy.ProxyLepidopterology") + @SidedProxy(clientSide = "forestry.lepidopterology.proxy.ProxyLepidopterologyClient", serverSide = "forestry.lepidopterology.proxy.ProxyLepidopterology") public static ProxyLepidopterology proxy; private static final String CONFIG_CATEGORY = "lepidopterology"; public static int spawnConstraint = 100; @@ -84,7 +84,7 @@ public class PluginLepidopterology extends ForestryPlugin { @Override public void preInit() { - ForestryBlock.lepidopterology.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "lepidopterology"); + ForestryBlock.lepidopterology.registerBlock(new BlockBase(Material.iron, true), ItemBlockForestry.class, "lepidopterology"); ForestryBlock.lepidopterology.block().setCreativeTab(Tabs.tabLepidopterology); createAlleles(); @@ -110,7 +110,7 @@ public class PluginLepidopterology extends ForestryPlugin { final String oldConfigRenamed = CONFIG_CATEGORY + ".conf.old"; File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed); if (oldConfigFile.renameTo(oldConfigFileRenamed)) { - Proxies.log.info("Migrated " + CONFIG_CATEGORY + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); + Log.info("Migrated " + CONFIG_CATEGORY + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); } } @@ -118,20 +118,20 @@ public class PluginLepidopterology extends ForestryPlugin { PluginCore.rootCommand.addChildCommand(new CommandButterfly()); - Utils.registerEntity(EntityButterfly.class, "butterflyGE", 0, 0x000000, 0xffffff, 50, 1, true); + EntityUtil.registerEntity(EntityButterfly.class, "butterflyGE", 0, 0x000000, 0xffffff, 50, 1, true); proxy.initializeRendering(); registerTemplates(); BlockBase lepidopterology = ((BlockBase) ForestryBlock.lepidopterology.block()); - MachineDefinition definitionChest = lepidopterology.addDefinition(new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, new RenderNaturalistChest("lepichest"), + MachineDefinition definitionChest = lepidopterology.addDefinition(new MachineDefinition(Constants.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, new RenderNaturalistChest("lepichest"), ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.lepidopterology.getItemStack(1, Defaults.DEFINITION_LEPICHEST_META), + ForestryBlock.lepidopterology.getItemStack(1, Constants.DEFINITION_LEPICHEST_META), " # ", "XYX", "XXX", '#', "blockGlass", - 'X', ForestryItem.butterflyGE.getItemStack(1, Defaults.WILDCARD), + 'X', ForestryItem.butterflyGE.getItemStack(1, Constants.WILDCARD), 'Y', "chestWood")) .setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F)); definitionChest.register(); diff --git a/src/main/java/forestry/plugins/PluginMagicalCrops.java b/src/main/java/forestry/plugins/PluginMagicalCrops.java index 97d976aea..839974685 100644 --- a/src/main/java/forestry/plugins/PluginMagicalCrops.java +++ b/src/main/java/forestry/plugins/PluginMagicalCrops.java @@ -20,15 +20,15 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; -import forestry.core.GameMode; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.FarmableGenericCrop; -@Plugin(pluginID = "MagicalCrops", name = "MagicalCrops", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.magicalcrops.description") +@Plugin(pluginID = "MagicalCrops", name = "MagicalCrops", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.magicalcrops.description") public class PluginMagicalCrops extends ForestryPlugin { private static final String MagCrop = "magicalcrops"; @@ -233,8 +233,8 @@ public class PluginMagicalCrops extends ForestryPlugin { Item cropProduce = GameRegistry.findItem(MagCrop, MagCrop + "_CropProduce"); if (cropProduce != null) { int juiceAmount = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple"); - ItemStack produce = new ItemStack(GameRegistry.findItem(MagCrop, MagCrop + "_CropProduce"), 1, Defaults.WILDCARD); - RecipeUtil.injectLeveledRecipe(produce, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + ItemStack produce = new ItemStack(GameRegistry.findItem(MagCrop, MagCrop + "_CropProduce"), 1, Constants.WILDCARD); + RecipeUtil.addFermenterRecipes(produce, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{produce}, Fluids.JUICE.getFluid(juiceAmount)); } } @@ -249,8 +249,9 @@ public class PluginMagicalCrops extends ForestryPlugin { Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seed, crop, 7)); } } + private static void addBetaRecipes(String seedSuffix, String cropSuffix, String name) { - ItemStack seed = GameRegistry.findItemStack(MagCrop, MagCrop +"_"+ name + seedSuffix, 1); + ItemStack seed = GameRegistry.findItemStack(MagCrop, MagCrop + "_" + name + seedSuffix, 1); Block crop = GameRegistry.findBlock(MagCrop, MagCrop + "_" + name + cropSuffix); if (seed != null && crop != null && Config.isMagicalCropsSupportEnabled()) { Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seed, crop, 7)); diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index 70e903cf6..46a74d17d 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -21,18 +21,18 @@ import forestry.api.mail.EnumAddressee; import forestry.api.mail.EnumPostage; import forestry.api.mail.PostManager; import forestry.api.recipes.RecipeManagers; +import forestry.core.ISaveEventHandler; +import forestry.core.blocks.BlockBase; import forestry.core.config.Config; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; -import forestry.core.gadgets.BlockBase; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.interfaces.ISaveEventHandler; -import forestry.core.items.ItemForestryBlock; +import forestry.core.items.ItemBlockForestry; import forestry.core.network.IPacketHandler; import forestry.core.proxy.Proxies; -import forestry.core.utils.ShapedRecipeCustom; +import forestry.core.recipes.ShapedRecipeCustom; +import forestry.core.tiles.MachineDefinition; import forestry.mail.GuiHandlerMail; import forestry.mail.PacketHandlerMail; import forestry.mail.PostRegistry; @@ -40,16 +40,16 @@ import forestry.mail.PostalCarrier; import forestry.mail.SaveEventHandlerMail; import forestry.mail.TickHandlerMailClient; import forestry.mail.commands.CommandMail; -import forestry.mail.gadgets.MachineMailbox; -import forestry.mail.gadgets.MachinePhilatelist; -import forestry.mail.gadgets.MachineTrader; import forestry.mail.items.ItemCatalogue; import forestry.mail.items.ItemLetter; import forestry.mail.items.ItemStamps; import forestry.mail.items.ItemStamps.StampInfo; +import forestry.mail.tiles.TileMailbox; +import forestry.mail.tiles.TilePhilatelist; +import forestry.mail.tiles.TileTrader; import forestry.mail.triggers.MailTriggers; -@Plugin(pluginID = "Mail", name = "Mail", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.mail.description") +@Plugin(pluginID = "Mail", name = "Mail", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.mail.description") public class PluginMail extends ForestryPlugin { private static MachineDefinition definitionMailbox; @@ -74,9 +74,9 @@ public class PluginMail extends ForestryPlugin { new TickHandlerMailClient(); - ForestryBlock.mail.registerBlock(new BlockBase(Material.iron), ItemForestryBlock.class, "mail"); + ForestryBlock.mail.registerBlock(new BlockBase(Material.iron), ItemBlockForestry.class, "mail"); - ShapedRecipeCustom recipe = ShapedRecipeCustom.createShapedRecipe(ForestryBlock.mail.getItemStack(1, Defaults.DEFINITION_MAILBOX_META), + ShapedRecipeCustom recipe = ShapedRecipeCustom.createShapedRecipe(ForestryBlock.mail.getItemStack(1, Constants.DEFINITION_MAILBOX_META), " # ", "#Y#", "XXX", '#', "ingotTin", 'X', "chestWood", @@ -84,10 +84,10 @@ public class PluginMail extends ForestryPlugin { BlockBase mail = ((BlockBase) ForestryBlock.mail.block()); - definitionMailbox = mail.addDefinition(new MachineDefinition(Defaults.DEFINITION_MAILBOX_META, "forestry.Mailbox", MachineMailbox.class, recipe).setFaces(0, 1, 2, 2, 2, 2, 0, 7)); + definitionMailbox = mail.addDefinition(new MachineDefinition(Constants.DEFINITION_MAILBOX_META, "forestry.Mailbox", TileMailbox.class, recipe).setFaces(0, 1, 2, 2, 2, 2, 0, 7)); recipe = ShapedRecipeCustom.createShapedRecipe( - ForestryBlock.mail.getItemStack(1, Defaults.DEFINITION_TRADESTATION_META), + ForestryBlock.mail.getItemStack(1, Constants.DEFINITION_TRADESTATION_META), "Z#Z", "#Y#", "XWX", @@ -96,9 +96,9 @@ public class PluginMail extends ForestryPlugin { 'Y', ForestryItem.sturdyCasing, 'Z', ForestryItem.tubes.getItemStack(1, 3), 'W', ForestryItem.circuitboards.getItemStack(1, 2)); - definitionTradestation = mail.addDefinition(new MachineDefinition(Defaults.DEFINITION_TRADESTATION_META, "forestry.Tradestation", MachineTrader.class, recipe).setFaces(0, 1, 2, 3, 4, 4, 0, 7)); + definitionTradestation = mail.addDefinition(new MachineDefinition(Constants.DEFINITION_TRADESTATION_META, "forestry.Tradestation", TileTrader.class, recipe).setFaces(0, 1, 2, 3, 4, 4, 0, 7)); - definitionPhilatelist = mail.addDefinition(new MachineDefinition(Defaults.DEFINITION_PHILATELIST_META, "forestry.Philatelist", MachinePhilatelist.class) + definitionPhilatelist = mail.addDefinition(new MachineDefinition(Constants.DEFINITION_PHILATELIST_META, "forestry.Philatelist", TilePhilatelist.class) .setFaces(0, 1, 2, 3, 2, 2, 0, 7)); } @@ -154,7 +154,7 @@ public class PluginMail extends ForestryPlugin { Item stampGlue; if (PluginManager.Module.APICULTURE.isEnabled()) { - Proxies.common.addShapelessRecipe(ForestryItem.letters.getItemStack(), Items.paper, ForestryItem.propolis.getItemStack(1, Defaults.WILDCARD)); + Proxies.common.addShapelessRecipe(ForestryItem.letters.getItemStack(), Items.paper, ForestryItem.propolis.getItemStack(1, Constants.WILDCARD)); stampGlue = ForestryItem.honeyDrop.item(); } else { Proxies.common.addShapelessRecipe(ForestryItem.letters.getItemStack(), Items.paper, Items.slime_ball); @@ -180,12 +180,12 @@ public class PluginMail extends ForestryPlugin { } // Recycling - Proxies.common.addRecipe(new ItemStack(Items.paper), "###", '#', ForestryItem.letters.getItemStack(1, Defaults.WILDCARD)); + Proxies.common.addRecipe(new ItemStack(Items.paper), "###", '#', ForestryItem.letters.getItemStack(1, Constants.WILDCARD)); // Carpenter RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.getFluid(250), null, ForestryItem.letters.getItemStack(), "###", "###", '#', ForestryItem.woodPulp); - Proxies.common.addShapelessRecipe(ForestryItem.catalogue.getItemStack(), ForestryItem.stamps.getItemStack(1, Defaults.WILDCARD), new ItemStack(Items.book)); + Proxies.common.addShapelessRecipe(ForestryItem.catalogue.getItemStack(), ForestryItem.stamps.getItemStack(1, Constants.WILDCARD), new ItemStack(Items.book)); } @Override diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 9dbbb9375..69c31896d 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -39,11 +39,11 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.Forestry; import forestry.api.core.ForestryAPI; -import forestry.core.interfaces.IPickupHandler; -import forestry.core.interfaces.IResupplyHandler; -import forestry.core.interfaces.ISaveEventHandler; +import forestry.core.IPickupHandler; +import forestry.core.IResupplyHandler; +import forestry.core.ISaveEventHandler; import forestry.core.network.IPacketHandler; -import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; public class PluginManager { @@ -144,7 +144,7 @@ public class PluginManager { } private static void registerHandlers(ForestryPlugin plugin) { - Proxies.log.fine("Registering Handlers for Plugin: {0}", plugin); + Log.fine("Registering Handlers for Plugin: {0}", plugin); IGuiHandler guiHandler = plugin.getGuiHandler(); if (guiHandler != null) { @@ -196,13 +196,13 @@ public class PluginManager { } if (!isEnabled(config, m)) { it.remove(); - Proxies.log.info("Module disabled: {0}", m); + Log.info("Module disabled: {0}", m); continue; } ForestryPlugin plugin = m.instance; if (!plugin.isAvailable()) { it.remove(); - Proxies.log.info("Module {0} failed to load: {1}", plugin, plugin.getFailMessage()); + Log.info("Module {0} failed to load: {1}", plugin, plugin.getFailMessage()); continue; } } @@ -217,7 +217,7 @@ public class PluginManager { if (!toLoad.containsAll(deps)) { it.remove(); changed = true; - Proxies.log.warning("Module {0} is missing dependencies: {1}", m, deps); + Log.warning("Module {0} is missing dependencies: {1}", m, deps); continue; } } @@ -243,17 +243,17 @@ public class PluginManager { for (Module m : loadedModules) { ForestryPlugin plugin = m.instance; - Proxies.log.fine("Setup Start: {0}", plugin); + Log.fine("Setup Start: {0}", plugin); plugin.setupAPI(); - Proxies.log.fine("Setup Complete: {0}", plugin); + Log.fine("Setup Complete: {0}", plugin); } stage = Stage.SETUP_DISABLED; for (Module m : unloadedModules) { ForestryPlugin plugin = m.instance; - Proxies.log.fine("Disabled-Setup Start: {0}", plugin); + Log.fine("Disabled-Setup Start: {0}", plugin); plugin.disabledSetupAPI(); - Proxies.log.fine("Disabled-Setup Complete: {0}", plugin); + Log.fine("Disabled-Setup Complete: {0}", plugin); } } @@ -261,7 +261,7 @@ public class PluginManager { stage = Stage.PRE_INIT; for (Module m : loadedModules) { ForestryPlugin plugin = m.instance; - Proxies.log.fine("Pre-Init Start: {0}", plugin); + Log.fine("Pre-Init Start: {0}", plugin); registerHandlers(plugin); plugin.preInit(); plugin.registerItems(); @@ -272,7 +272,7 @@ public class PluginManager { plugin.registerBackpackItems(); plugin.registerCrates(); } - Proxies.log.fine("Pre-Init Complete: {0}", plugin); + Log.fine("Pre-Init Complete: {0}", plugin); } } @@ -280,10 +280,10 @@ public class PluginManager { stage = Stage.INIT; for (Module m : loadedModules) { ForestryPlugin plugin = m.instance; - Proxies.log.fine("Init Start: {0}", plugin); + Log.fine("Init Start: {0}", plugin); plugin.doInit(); plugin.registerRecipes(); - Proxies.log.fine("Init Complete: {0}", plugin); + Log.fine("Init Complete: {0}", plugin); } } @@ -291,9 +291,9 @@ public class PluginManager { stage = Stage.POST_INIT; for (Module m : loadedModules) { ForestryPlugin plugin = m.instance; - Proxies.log.fine("Post-Init Start: {0}", plugin); + Log.fine("Post-Init Start: {0}", plugin); plugin.postInit(); - Proxies.log.fine("Post-Init Complete: {0}", plugin); + Log.fine("Post-Init Complete: {0}", plugin); } stage = Stage.FINISHED; diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java index 2571d7012..1766c98a8 100755 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -28,15 +28,15 @@ import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.config.ForestryItem; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.FarmableGenericCrop; -@Plugin(pluginID = "Natura", name = "Natura", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.natura.description") +@Plugin(pluginID = "Natura", name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.natura.description") public class PluginNatura extends ForestryPlugin { private static final String NATURA = "Natura"; @@ -89,11 +89,11 @@ public class PluginNatura extends ForestryPlugin { for (String key : saplingItemKeys) { Item saplingItem = GameRegistry.findItem(NATURA, key); - ItemStack saplingWild = new ItemStack(saplingItem, 1, Defaults.WILDCARD); - RecipeUtil.injectLeveledRecipe(saplingWild, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); + ItemStack saplingWild = new ItemStack(saplingItem, 1, Constants.WILDCARD); + RecipeUtil.addFermenterRecipes(saplingWild, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); - FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); + FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } berryBlight = GameRegistry.findItemStack(NATURA, "berryBlight", 1); @@ -255,7 +255,7 @@ public class PluginNatura extends ForestryPlugin { } if (itemBarley != null) { - RecipeUtil.injectLeveledRecipe(itemBarley, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(itemBarley, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); if (GameMode.getGameMode().getStackSetting("recipe.output.compost.wheat").stackSize > 0) { ItemStack compostWheat = GameMode.getGameMode().getStackSetting("recipe.output.compost.wheat"); Proxies.common.addRecipe(compostWheat, " X ", "X#X", " X ", '#', Blocks.dirt, 'X', itemBarley); diff --git a/src/main/java/forestry/plugins/PluginPlantMegaPack.java b/src/main/java/forestry/plugins/PluginPlantMegaPack.java index f07f9ddf7..905a371d4 100644 --- a/src/main/java/forestry/plugins/PluginPlantMegaPack.java +++ b/src/main/java/forestry/plugins/PluginPlantMegaPack.java @@ -23,16 +23,16 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.FlowerManager; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; import forestry.farming.logic.FarmableStacked; -@Plugin(pluginID = "PlantMegaPack", name = "PlantMegaPack", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.plantmegapack.description") +@Plugin(pluginID = "PlantMegaPack", name = "PlantMegaPack", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.plantmegapack.description") public class PluginPlantMegaPack extends ForestryPlugin { private static final String PlantMP = "plantmegapack"; @@ -362,7 +362,7 @@ public class PluginPlantMegaPack extends ForestryPlugin { Block reedBlock = GameRegistry.findBlock(PlantMP, reedLike); ItemStack reedStack = GameRegistry.findItemStack(PlantMP, reedLike, 1); if (reedBlock != null && reedStack != null) { - RecipeUtil.injectLeveledRecipe(reedStack, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(reedStack, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); Farmables.farmables.get("farmPoales").add(new FarmableStacked(reedBlock, 14, 4)); } } @@ -433,7 +433,7 @@ public class PluginPlantMegaPack extends ForestryPlugin { for (String wPlant : waterPlant) { ItemStack waterPlantStack = GameRegistry.findItemStack(PlantMP, wPlant, 1); if (waterPlantStack != null) { - RecipeUtil.injectLeveledRecipe(waterPlantStack, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(waterPlantStack, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); } } } diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 39ad57be0..54da41be2 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -57,21 +57,22 @@ import forestry.api.storage.BackpackManager; import forestry.api.storage.EnumBackpackType; import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.StorageManager; -import forestry.core.config.Defaults; +import forestry.core.IPickupHandler; +import forestry.core.IResupplyHandler; +import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.config.LocalizedConfiguration; import forestry.core.fluids.Fluids; -import forestry.core.interfaces.IPickupHandler; -import forestry.core.interfaces.IResupplyHandler; import forestry.core.items.ItemCrated; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Log; import forestry.core.utils.StringUtil; -import forestry.factory.gadgets.MachineCarpenter; +import forestry.factory.tiles.TileCarpenter; import forestry.storage.BackpackDefinition; -import forestry.storage.BackpackHelper; +import forestry.storage.BackpackInterface; import forestry.storage.CrateRegistry; import forestry.storage.GuiHandlerStorage; import forestry.storage.PickupHandlerStorage; @@ -81,13 +82,13 @@ import forestry.storage.items.ItemNaturalistBackpack.BackpackDefinitionApiarist; import forestry.storage.items.ItemNaturalistBackpack.BackpackDefinitionLepidopterist; import forestry.storage.proxy.ProxyStorage; -@Plugin(pluginID = "Storage", name = "Storage", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.storage.description") +@Plugin(pluginID = "Storage", name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description") public class PluginStorage extends ForestryPlugin { private static final List crates = new ArrayList(); private static final String CONFIG_CATEGORY = "backpacks"; - @SidedProxy(clientSide = "forestry.storage.proxy.ClientProxyStorage", serverSide = "forestry.storage.proxy.ProxyStorage") + @SidedProxy(clientSide = "forestry.storage.proxy.ProxyStorageClient", serverSide = "forestry.storage.proxy.ProxyStorage") public static ProxyStorage proxy; private final ArrayList minerItems = new ArrayList(); private final ArrayList diggerItems = new ArrayList(); @@ -103,7 +104,7 @@ public class PluginStorage extends ForestryPlugin { StorageManager.crateRegistry = new CrateRegistry(); - BackpackManager.backpackInterface = new BackpackHelper(); + BackpackManager.backpackInterface = new BackpackInterface(); BackpackManager.backpackItems = new ArrayList[6]; @@ -162,7 +163,7 @@ public class PluginStorage extends ForestryPlugin { final String oldConfigRenamed = CONFIG_CATEGORY + ".conf.old"; File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed); if (oldConfigFile.renameTo(oldConfigFileRenamed)) { - Proxies.log.info("Migrated " + CONFIG_CATEGORY + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); + Log.info("Migrated " + CONFIG_CATEGORY + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'."); } } @@ -235,7 +236,7 @@ public class PluginStorage extends ForestryPlugin { } private static void old_parseBackpackItems(String list, IBackpackDefinition backpackDefinition) { - List backpackItems = StackUtils.parseItemStackStrings(list, 0); + List backpackItems = ItemStackUtil.parseItemStackStrings(list, 0); backpackDefinition.addValidItems(backpackItems); } @@ -313,7 +314,7 @@ public class PluginStorage extends ForestryPlugin { digger.addValidOreDictNames(diggerOreDictNames); digger.addValidItems(Arrays.asList( - new ItemStack(Blocks.dirt, 1, Defaults.WILDCARD), + new ItemStack(Blocks.dirt, 1, Constants.WILDCARD), new ItemStack(Blocks.gravel), new ItemStack(Items.flint), new ItemStack(Blocks.netherrack), @@ -332,7 +333,7 @@ public class PluginStorage extends ForestryPlugin { new ItemStack(Blocks.red_flower), new ItemStack(Blocks.yellow_flower), new ItemStack(Blocks.cactus), - new ItemStack(Blocks.tallgrass, 1, Defaults.WILDCARD), + new ItemStack(Blocks.tallgrass, 1, Constants.WILDCARD), new ItemStack(Blocks.vine), new ItemStack(Blocks.pumpkin), new ItemStack(Blocks.melon_block), @@ -367,7 +368,7 @@ public class PluginStorage extends ForestryPlugin { new ItemStack(Items.slime_ball), new ItemStack(Items.dye, 1, 0), new ItemStack(Blocks.hay_block), - new ItemStack(Blocks.wool, 1, Defaults.WILDCARD), + new ItemStack(Blocks.wool, 1, Constants.WILDCARD), new ItemStack(Items.ender_eye), new ItemStack(Items.magma_cream), new ItemStack(Items.speckled_melon), @@ -387,13 +388,13 @@ public class PluginStorage extends ForestryPlugin { new ItemStack(Blocks.torch), new ItemStack(Blocks.redstone_torch), new ItemStack(Blocks.redstone_lamp), - new ItemStack(Blocks.stonebrick, 1, Defaults.WILDCARD), + new ItemStack(Blocks.stonebrick, 1, Constants.WILDCARD), new ItemStack(Blocks.sandstone, 1, 1), new ItemStack(Blocks.sandstone, 1, 2), new ItemStack(Blocks.brick_block), new ItemStack(Blocks.clay), - new ItemStack(Blocks.hardened_clay, 1, Defaults.WILDCARD), - new ItemStack(Blocks.stained_hardened_clay, 1, Defaults.WILDCARD), + new ItemStack(Blocks.hardened_clay, 1, Constants.WILDCARD), + new ItemStack(Blocks.stained_hardened_clay, 1, Constants.WILDCARD), new ItemStack(Blocks.packed_ice), new ItemStack(Blocks.nether_brick), new ItemStack(Blocks.crafting_table), @@ -403,7 +404,7 @@ public class PluginStorage extends ForestryPlugin { new ItemStack(Blocks.dropper), new ItemStack(Blocks.ladder), new ItemStack(Blocks.iron_bars), - new ItemStack(Blocks.quartz_block, 1, Defaults.WILDCARD), + new ItemStack(Blocks.quartz_block, 1, Constants.WILDCARD), new ItemStack(Items.sign), new ItemStack(Items.item_frame) )); @@ -429,7 +430,7 @@ public class PluginStorage extends ForestryPlugin { backpackConf.comment = StringUtil.localizeAndFormat("config.backpacks.item.stacks.format", backpackName); String[] backpackItemList = backpackConf.getStringList(); - backpackItems = StackUtils.parseItemStackStrings(backpackItemList, OreDictionary.WILDCARD_VALUE); + backpackItems = ItemStackUtil.parseItemStackStrings(backpackItemList, OreDictionary.WILDCARD_VALUE); } { @@ -464,7 +465,7 @@ public class PluginStorage extends ForestryPlugin { } public static void createCrateRecipes() { - MachineCarpenter.RecipeManager carpenterManager = (MachineCarpenter.RecipeManager) RecipeManagers.carpenterManager; + TileCarpenter.RecipeManager carpenterManager = (TileCarpenter.RecipeManager) RecipeManagers.carpenterManager; for (ItemCrated crate : crates) { ItemStack itemStack = new ItemStack(crate); if (crate.usesOreDict()) { @@ -486,12 +487,12 @@ public class PluginStorage extends ForestryPlugin { if (!BackpackManager.definitions.containsKey(tokens[0])) { String errorMessage = getInvalidIMCMessageText(message); - Proxies.log.warning("%s For non-existent backpack %s.", errorMessage, tokens[0]); + Log.warning("%s For non-existent backpack %s.", errorMessage, tokens[0]); return true; } IBackpackDefinition backpackDefinition = BackpackManager.definitions.get(tokens[0]); - List itemStacks = StackUtils.parseItemStackStrings(tokens[1], 0); + List itemStacks = ItemStackUtil.parseItemStackStrings(tokens[1], 0); backpackDefinition.addValidItems(itemStacks); return true; @@ -571,7 +572,7 @@ public class PluginStorage extends ForestryPlugin { '#', Blocks.wool, 'X', Items.string, 'V', "stickWood", - 'Y', ForestryBlock.apicultureChest.getItemStack(1, Defaults.DEFINITION_APIARISTCHEST_META)); + 'Y', ForestryBlock.apicultureChest.getItemStack(1, Constants.DEFINITION_APIARISTCHEST_META)); } if (PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) { @@ -583,7 +584,7 @@ public class PluginStorage extends ForestryPlugin { '#', Blocks.wool, 'X', Items.string, 'V', "stickWood", - 'Y', ForestryBlock.lepidopterology.getItemStack(1, Defaults.DEFINITION_LEPICHEST_META)); + 'Y', ForestryBlock.lepidopterology.getItemStack(1, Constants.DEFINITION_LEPICHEST_META)); } // Miner's Backpack diff --git a/src/main/java/forestry/plugins/PluginWitchery.java b/src/main/java/forestry/plugins/PluginWitchery.java index 823825d3c..411bd6499 100644 --- a/src/main/java/forestry/plugins/PluginWitchery.java +++ b/src/main/java/forestry/plugins/PluginWitchery.java @@ -26,15 +26,15 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.FlowerManager; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; -import forestry.core.GameMode; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; +import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import forestry.core.utils.RecipeUtil; +import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; -@Plugin(pluginID = "Witchery", name = "Witchery", author = "Nirek", url = Defaults.URL, unlocalizedDescription = "for.plugin.witchery.description") +@Plugin(pluginID = "Witchery", name = "Witchery", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.witchery.description") public class PluginWitchery extends ForestryPlugin { private static final String Witch = "witchery"; @@ -72,10 +72,10 @@ public class PluginWitchery extends ForestryPlugin { int seedamount = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed"); Item saplingItem = GameRegistry.findItem(Witch, "witchsapling"); - ItemStack saplingStack = new ItemStack(saplingItem, 1, Defaults.WILDCARD); - RecipeUtil.injectLeveledRecipe(saplingStack, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + ItemStack saplingStack = new ItemStack(saplingItem, 1, Constants.WILDCARD); + RecipeUtil.addFermenterRecipes(saplingStack, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); - FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); + FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); for (String flowerAcceptName : flowersAccept) { Block flowerBlock = GameRegistry.findBlock(Witch, flowerAcceptName); diff --git a/src/main/java/forestry/storage/BackpackHelper.java b/src/main/java/forestry/storage/BackpackInterface.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/storage/BackpackHelper.java rename to src/main/java/forestry/storage/BackpackInterface.java index 5bc85d7f2..4d9aea410 --- a/src/main/java/forestry/storage/BackpackHelper.java +++ b/src/main/java/forestry/storage/BackpackInterface.java @@ -18,7 +18,7 @@ import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.IBackpackInterface; import forestry.storage.items.ItemBackpack; -public class BackpackHelper implements IBackpackInterface { +public class BackpackInterface implements IBackpackInterface { @Override public Item addBackpack(IBackpackDefinition definition, EnumBackpackType type) { diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index f772a5e47..e0f388ff7 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -17,18 +17,19 @@ import net.minecraft.item.ItemStack; import forestry.api.storage.ICrateRegistry; import forestry.core.items.ItemCrated; import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; import forestry.plugins.PluginStorage; public class CrateRegistry implements ICrateRegistry { private static void registerCrate(ItemStack stack, String uid, boolean useOreDict) { if (stack == null || stack.getItem() == null) { - Proxies.log.severe("Tried to make a crate without an item"); + Log.severe("Tried to make a crate without an item"); return; } if (uid == null) { - Proxies.log.severe("Tried to make a crate without a uid"); + Log.severe("Tried to make a crate without a uid"); return; } diff --git a/src/main/java/forestry/storage/GuiHandlerStorage.java b/src/main/java/forestry/storage/GuiHandlerStorage.java index 1d08037d0..4b3e90c5a 100755 --- a/src/main/java/forestry/storage/GuiHandlerStorage.java +++ b/src/main/java/forestry/storage/GuiHandlerStorage.java @@ -18,7 +18,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; import forestry.core.GuiHandlerBase; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiNaturalistInventory; import forestry.core.gui.IPagedInventory; import forestry.core.inventory.ItemInventoryBackpack; @@ -64,7 +64,7 @@ public class GuiHandlerStorage extends GuiHandlerBase { return null; } ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot("rootBees"); - PagedBackpackInventory inventory = new PagedBackpackInventory(player, Defaults.SLOTS_BACKPACK_APIARIST, equipped, cleanId); + PagedBackpackInventory inventory = new PagedBackpackInventory(player, Constants.SLOTS_BACKPACK_APIARIST, equipped, cleanId); return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistBackpack(player, inventory, guiData), inventory, guiData, 5); case BackpackGUI: @@ -87,7 +87,7 @@ public class GuiHandlerStorage extends GuiHandlerBase { return null; } speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot("rootButterflies"); - inventory = new PagedBackpackInventory(player, Defaults.SLOTS_BACKPACK_APIARIST, equipped, id); + inventory = new PagedBackpackInventory(player, Constants.SLOTS_BACKPACK_APIARIST, equipped, id); return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistBackpack(player, inventory, guiData), inventory, guiData, 5); default: @@ -125,7 +125,7 @@ public class GuiHandlerStorage extends GuiHandlerBase { return null; } - return new ContainerNaturalistBackpack(player, new PagedBackpackInventory(player, Defaults.SLOTS_BACKPACK_APIARIST, equipped, cleanId), guiData); + return new ContainerNaturalistBackpack(player, new PagedBackpackInventory(player, Constants.SLOTS_BACKPACK_APIARIST, equipped, cleanId), guiData); case BackpackGUI: equipped = getBackpackItem(player); @@ -149,7 +149,7 @@ public class GuiHandlerStorage extends GuiHandlerBase { return null; } - return new ContainerNaturalistBackpack(player, new PagedBackpackInventory(player, Defaults.SLOTS_BACKPACK_APIARIST, equipped, cleanId), guiData); + return new ContainerNaturalistBackpack(player, new PagedBackpackInventory(player, Constants.SLOTS_BACKPACK_APIARIST, equipped, cleanId), guiData); default: return null; diff --git a/src/main/java/forestry/storage/PickupHandlerStorage.java b/src/main/java/forestry/storage/PickupHandlerStorage.java index 0c89d2493..f1d688ea8 100755 --- a/src/main/java/forestry/storage/PickupHandlerStorage.java +++ b/src/main/java/forestry/storage/PickupHandlerStorage.java @@ -15,7 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.api.storage.IBackpackDefinition; -import forestry.core.interfaces.IPickupHandler; +import forestry.core.IPickupHandler; import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.ContainerNaturalistBackpack; import forestry.storage.items.ItemBackpack; diff --git a/src/main/java/forestry/storage/ResupplyHandler.java b/src/main/java/forestry/storage/ResupplyHandler.java index bdb3174c6..45e1e6e8a 100755 --- a/src/main/java/forestry/storage/ResupplyHandler.java +++ b/src/main/java/forestry/storage/ResupplyHandler.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.Event; import forestry.api.storage.BackpackResupplyEvent; -import forestry.core.interfaces.IResupplyHandler; +import forestry.core.IResupplyHandler; import forestry.core.inventory.ItemInventory; import forestry.core.inventory.ItemInventoryBackpack; import forestry.storage.items.ItemBackpack; diff --git a/src/main/java/forestry/storage/gui/GuiBackpack.java b/src/main/java/forestry/storage/gui/GuiBackpack.java index 72dd90f0e..3805431b2 100755 --- a/src/main/java/forestry/storage/gui/GuiBackpack.java +++ b/src/main/java/forestry/storage/gui/GuiBackpack.java @@ -12,13 +12,13 @@ package forestry.storage.gui; import net.minecraft.inventory.IInventory; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; public class GuiBackpack extends GuiForestry { public GuiBackpack(ContainerBackpack container) { - this(Defaults.TEXTURE_PATH_GUI + "/backpack.png", container); + this(Constants.TEXTURE_PATH_GUI + "/backpack.png", container); } protected GuiBackpack(String texture, ContainerBackpack container) { diff --git a/src/main/java/forestry/storage/gui/GuiBackpackT2.java b/src/main/java/forestry/storage/gui/GuiBackpackT2.java index 9f2d3d87e..89317a4ae 100755 --- a/src/main/java/forestry/storage/gui/GuiBackpackT2.java +++ b/src/main/java/forestry/storage/gui/GuiBackpackT2.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.storage.gui; -import forestry.core.config.Defaults; +import forestry.core.config.Constants; public class GuiBackpackT2 extends GuiBackpack { public GuiBackpackT2(ContainerBackpack container) { - super(Defaults.TEXTURE_PATH_GUI + "/backpackT2.png", container); + super(Constants.TEXTURE_PATH_GUI + "/backpackT2.png", container); xSize = 176; ySize = 192; diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 0360f58eb..e34486cd8 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -33,8 +33,7 @@ import forestry.api.storage.BackpackStowEvent; import forestry.api.storage.EnumBackpackType; import forestry.api.storage.IBackpackDefinition; import forestry.core.config.Config; -import forestry.core.config.Defaults; -import forestry.core.inventory.InvTools; +import forestry.core.config.Constants; import forestry.core.inventory.ItemInventory; import forestry.core.inventory.ItemInventoryBackpack; import forestry.core.inventory.wrappers.IInvSlot; @@ -43,6 +42,8 @@ import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.InventoryUtil; import forestry.core.utils.StringUtil; import forestry.storage.BackpackMode; @@ -124,7 +125,7 @@ public class ItemBackpack extends ItemInventoried { return stack; } - ItemStack remainder = InvTools.moveItemStack(stack, inventory); + ItemStack remainder = InventoryUtil.moveItemStack(stack, inventory); stack.stackSize = remainder == null ? 0 : remainder.stackSize; return null; @@ -142,7 +143,7 @@ public class ItemBackpack extends ItemInventoried { private static IInventory getInventoryHit(World world, int x, int y, int z, int side) { TileEntity targeted = world.getTileEntity(x, y, z); - return InvTools.getInventoryFromTile(targeted, ForgeDirection.getOrientation(side)); + return TileUtil.getInventoryFromTile(targeted, ForgeDirection.getOrientation(side)); } private boolean evaluateTileHit(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) { @@ -182,7 +183,7 @@ public class ItemBackpack extends ItemInventoried { continue; } - ItemStack remaining = InvTools.moveItemStack(packStack, target); + ItemStack remaining = InventoryUtil.moveItemStack(packStack, target); slot.setStackInSlot(remaining); } } @@ -199,17 +200,17 @@ public class ItemBackpack extends ItemInventoried { continue; } - ItemStack remaining = InvTools.moveItemStack(targetStack, backpackInventory); + ItemStack remaining = InventoryUtil.moveItemStack(targetStack, backpackInventory); slot.setStackInSlot(remaining); } } protected void openGui(EntityPlayer entityplayer) { - if (getBackpackSize() == Defaults.SLOTS_BACKPACK_DEFAULT) { + if (getBackpackSize() == Constants.SLOTS_BACKPACK_DEFAULT) { entityplayer.openGui(ForestryAPI.instance, GuiId.BackpackGUI.ordinal(), entityplayer.worldObj, (int) entityplayer.posX, (int) entityplayer.posY, (int) entityplayer.posZ); - } else if (getBackpackSize() == Defaults.SLOTS_BACKPACK_T2) { + } else if (getBackpackSize() == Constants.SLOTS_BACKPACK_T2) { entityplayer.openGui(ForestryAPI.instance, GuiId.BackpackT2GUI.ordinal(), entityplayer.worldObj, (int) entityplayer.posX, (int) entityplayer.posY, (int) entityplayer.posZ); } @@ -308,12 +309,12 @@ public class ItemBackpack extends ItemInventoried { private static int getSlotsForType(EnumBackpackType type) { switch (type) { case APIARIST: - return Defaults.SLOTS_BACKPACK_APIARIST; + return Constants.SLOTS_BACKPACK_APIARIST; case T2: - return Defaults.SLOTS_BACKPACK_T2; + return Constants.SLOTS_BACKPACK_T2; case T1: default: - return Defaults.SLOTS_BACKPACK_DEFAULT; + return Constants.SLOTS_BACKPACK_DEFAULT; } } diff --git a/src/main/java/forestry/storage/proxy/ClientProxyStorage.java b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java similarity index 79% rename from src/main/java/forestry/storage/proxy/ClientProxyStorage.java rename to src/main/java/forestry/storage/proxy/ProxyStorageClient.java index 03ca3049e..53c45eeb4 100644 --- a/src/main/java/forestry/storage/proxy/ClientProxyStorage.java +++ b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java @@ -13,11 +13,11 @@ package forestry.storage.proxy; import net.minecraftforge.client.MinecraftForgeClient; import forestry.core.items.ItemCrated; -import forestry.core.render.CrateRenderingHandler; +import forestry.core.render.RenderCrateItem; -public class ClientProxyStorage extends ProxyStorage { +public class ProxyStorageClient extends ProxyStorage { - private static final CrateRenderingHandler crateRenderer = new CrateRenderingHandler(); + private static final RenderCrateItem crateRenderer = new RenderCrateItem(); @Override public void registerCrateForRendering(ItemCrated crate) { diff --git a/test/ItemStackTest.java b/test/ItemStackTest.java index 8b858e2d7..142d5d6fb 100644 --- a/test/ItemStackTest.java +++ b/test/ItemStackTest.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemFirework; import net.minecraft.item.ItemStack; import forestry.apiculture.items.ItemHoneycomb; -import forestry.core.utils.StackUtils; +import forestry.core.utils.ItemStackUtil; import org.junit.Assert; import org.junit.Before; @@ -34,15 +34,15 @@ public class ItemStackTest { @Test public void testEquality() { - Assert.assertTrue("Equal ItemStacks are identical.", StackUtils.isIdenticalItem(comb1, comb1)); - Assert.assertTrue("Equal ItemStacks are identical.", StackUtils.isIdenticalItem(comb2, comb2)); - Assert.assertFalse("Unequal ItemStacks are not identical.", StackUtils.isIdenticalItem(comb1, comb2)); + Assert.assertTrue("Equal ItemStacks are identical.", ItemStackUtil.isIdenticalItem(comb1, comb1)); + Assert.assertTrue("Equal ItemStacks are identical.", ItemStackUtil.isIdenticalItem(comb2, comb2)); + Assert.assertFalse("Unequal ItemStacks are not identical.", ItemStackUtil.isIdenticalItem(comb1, comb2)); // OreDict crashes when minecraft hasn't loaded -// Assert.assertTrue("Different combs are crafting equivalent with Ore Dictionary.", StackUtils.isCraftingEquivalent(comb1, comb2, true, false)); -// Assert.assertFalse("Different combs are not crafting equivalent without Ore Dictionary.", StackUtils.isCraftingEquivalent(comb1, comb2, false, false)); +// Assert.assertTrue("Different combs are crafting equivalent with Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(comb1, comb2, true, false)); +// Assert.assertFalse("Different combs are not crafting equivalent without Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(comb1, comb2, false, false)); // -// Assert.assertFalse("Different items are not crafting equivalent with Ore Dictionary.", StackUtils.isCraftingEquivalent(firework, comb1, true, false)); -// Assert.assertFalse("Different items are not crafting equivalent without Ore Dictionary.", StackUtils.isCraftingEquivalent(firework, comb1, false, false)); +// Assert.assertFalse("Different items are not crafting equivalent with Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(firework, comb1, true, false)); +// Assert.assertFalse("Different items are not crafting equivalent without Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(firework, comb1, false, false)); } }