From 49d80c847e4d6baeec98dceb38326ed1fc2c7446 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 25 Jan 2017 15:01:41 +0100 Subject: [PATCH] Move some craftguis --- .../core/liquid/ItemFluidContainer.java | 41 +++++++++++-------- .../machines/storage/WindowCompartment.java | 2 +- .../core/machines/storage/WindowTest.java | 2 +- .../carpentry/BlockStainedDesign.java | 8 +++- .../extratrees/core/ExtraTreesGUID.java | 18 ++++---- .../brewery/DistilleryRecipeWrapper.java | 2 +- .../binnie/extratrees/item/ItemHammer.java | 20 +++++---- .../craftgui}/ControlBlockIconDisplay.java | 2 +- .../craftgui}/ControlBreweryProgress.java | 2 +- .../craftgui}/ControlDistilleryProgress.java | 2 +- .../craftgui}/ControlFruitPressProgress.java | 2 +- .../craftgui}/ControlLumbermillProgress.java | 2 +- .../item/craftgui}/ControlRecipeSlot.java | 2 +- .../item/craftgui}/ControlTileSelect.java | 2 +- .../item/craftgui}/DialogBreweryRecipe.java | 2 +- .../item/craftgui}/PageFruit.java | 2 +- .../item/craftgui}/PagePlanksOverview.java | 2 +- .../item/craftgui}/PagePlanksTrees.java | 2 +- .../item/craftgui}/PageSpeciesImage.java | 2 +- .../item/craftgui}/PageSpeciesTreeGenome.java | 2 +- .../item/craftgui}/PageWood.java | 2 +- .../craftgui}/WindowArboristDatabase.java | 2 +- .../item/craftgui}/WindowBrewery.java | 2 +- .../item/craftgui}/WindowDistillery.java | 2 +- .../WindowLepidopteristDatabase.java | 2 +- .../item/craftgui}/WindowLumbermill.java | 2 +- .../item/craftgui}/WindowPress.java | 2 +- .../item/craftgui}/WindowSetSquare.java | 2 +- .../item/craftgui}/WindowWoodworker.java | 2 +- .../craftgui}/ControlDropDownMenu.java | 2 +- .../craftgui}/ControlDropdownButton.java | 2 +- .../craftgui}/ControlFluidDisplay.java | 2 +- .../kitchen/craftgui}/ControlSlotFluid.java | 2 +- .../craftgui}/ControlSlotGlassware.java | 2 +- .../kitchen/craftgui}/ControlTankSlot.java | 2 +- .../kitchen/craftgui}/WindowBottleRack.java | 2 +- .../binnie/genetics/core/GeneticsGUI.java | 22 +++++----- .../genetics/gui/AnalystPageProducts.java | 2 +- .../machine/craftgui}/ControlGene.java | 2 +- .../machine/craftgui}/ControlGeneScroll.java | 2 +- .../craftgui}/ControlProcessTemporary.java | 2 +- .../craftgui}/ControlSequencerProgress.java | 2 +- .../craftgui}/ControlSplicerProgress.java | 2 +- .../machine/craftgui}/WindowAcclimatiser.java | 2 +- .../machine/craftgui}/WindowAnalyser.java | 2 +- .../machine/craftgui}/WindowGeneBank.java | 2 +- .../machine/craftgui}/WindowGeneBankNEI.java | 2 +- .../machine/craftgui}/WindowGeneProject.java | 2 +- .../machine/craftgui}/WindowGenepool.java | 2 +- .../craftgui}/WindowGenomeAssembler.java | 2 +- .../machine/craftgui}/WindowIncubator.java | 2 +- .../machine/craftgui}/WindowInoculator.java | 2 +- .../machine/craftgui}/WindowIsolator.java | 2 +- .../machine/craftgui}/WindowMachine.java | 2 +- .../machine/craftgui}/WindowPolymeriser.java | 2 +- .../machine/craftgui}/WindowSequencer.java | 2 +- .../machine/craftgui}/WindowSplicer.java | 2 +- 57 files changed, 114 insertions(+), 99 deletions(-) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/ControlBlockIconDisplay.java (92%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/ControlBreweryProgress.java (98%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/ControlDistilleryProgress.java (98%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/ControlFruitPressProgress.java (98%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/ControlLumbermillProgress.java (98%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/ControlRecipeSlot.java (96%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/ControlTileSelect.java (99%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/DialogBreweryRecipe.java (87%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/PageFruit.java (97%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/PagePlanksOverview.java (98%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/PagePlanksTrees.java (96%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/PageSpeciesImage.java (95%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/PageSpeciesTreeGenome.java (99%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/PageWood.java (96%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowArboristDatabase.java (99%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowBrewery.java (97%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowDistillery.java (97%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowLepidopteristDatabase.java (98%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowLumbermill.java (97%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowPress.java (98%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowSetSquare.java (94%) rename src/main/java/binnie/{craftgui/extratrees/dictionary => extratrees/item/craftgui}/WindowWoodworker.java (98%) rename src/main/java/binnie/{craftgui/extratrees/kitchen => extratrees/kitchen/craftgui}/ControlDropDownMenu.java (92%) rename src/main/java/binnie/{craftgui/extratrees/kitchen => extratrees/kitchen/craftgui}/ControlDropdownButton.java (96%) rename src/main/java/binnie/{craftgui/extratrees/kitchen => extratrees/kitchen/craftgui}/ControlFluidDisplay.java (98%) rename src/main/java/binnie/{craftgui/extratrees/kitchen => extratrees/kitchen/craftgui}/ControlSlotFluid.java (98%) rename src/main/java/binnie/{craftgui/extratrees/kitchen => extratrees/kitchen/craftgui}/ControlSlotGlassware.java (94%) rename src/main/java/binnie/{craftgui/extratrees/kitchen => extratrees/kitchen/craftgui}/ControlTankSlot.java (96%) rename src/main/java/binnie/{craftgui/extratrees/kitchen => extratrees/kitchen/craftgui}/WindowBottleRack.java (96%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/ControlGene.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/ControlGeneScroll.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/ControlProcessTemporary.java (95%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/ControlSequencerProgress.java (97%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/ControlSplicerProgress.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowAcclimatiser.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowAnalyser.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowGeneBank.java (99%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowGeneBankNEI.java (89%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowGeneProject.java (94%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowGenepool.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowGenomeAssembler.java (95%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowIncubator.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowInoculator.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowIsolator.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowMachine.java (92%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowPolymeriser.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowSequencer.java (98%) rename src/main/java/binnie/{craftgui/genetics/machine => genetics/machine/craftgui}/WindowSplicer.java (98%) diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 7c7e707e..db0b149b 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -15,9 +15,14 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import scala.concurrent.OnCompleteRunnable; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -149,24 +154,24 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister, public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0); } - -// @Override -// public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) { -// if (this.isDrinkable(stack)) { -// player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); -// } -// return stack; -// } - -// @Override -// public int func_150905_g(final ItemStack p_150905_1_) { -// return 0; -// } -// -// @Override -// public float func_150906_h(final ItemStack p_150906_1_) { -// return 0.0f; -// } + + @Override + public ActionResult onItemRightClick(ItemStack stack, World worldIn, EntityPlayer player, EnumHand hand) { + if (player.canEat(false) && this.isDrinkable(stack)) { + player.setActiveHand(hand); + return new ActionResult(EnumActionResult.SUCCESS, stack); + } + return new ActionResult(EnumActionResult.PASS, stack); + } + + public float getSaturationModifier(ItemStack stack){ + return 0.0F; + } + + @Override + public int getHealAmount(ItemStack stack) { + return 0; + } private boolean isDrinkable(final ItemStack stack) { final FluidStack fluid = this.getLiquid(stack); diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 81520e92..ce5186bf 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -26,7 +26,6 @@ import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; import binnie.craftgui.events.EventTextEdit; import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.genetics.machine.WindowMachine; import binnie.craftgui.minecraft.Dialog; import binnie.craftgui.minecraft.EnumColor; import binnie.craftgui.minecraft.IWindowAffectsShiftClick; @@ -41,6 +40,7 @@ import binnie.craftgui.minecraft.control.ControlTabIcon; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITexture; import binnie.craftgui.window.Panel; +import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java index 573bf790..11a42395 100644 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ b/src/main/java/binnie/core/machines/storage/WindowTest.java @@ -2,8 +2,8 @@ package binnie.core.machines.storage; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.craftgui.genetics.machine.WindowMachine; import binnie.craftgui.minecraft.Window; +import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 360419b0..1c2858f3 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -8,6 +8,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -38,10 +39,15 @@ public class BlockStainedDesign extends BlockDesign { return false; } + @Override + public boolean canRenderInLayer(BlockRenderLayer layer) { + return layer == BlockRenderLayer.TRANSLUCENT; + } + @SideOnly(Side.CLIENT) @Override public int getRenderPasses() { - return 1; + return 2; } @Override diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index ca14968a..4441e7b3 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -1,16 +1,16 @@ package binnie.extratrees.core; import binnie.core.gui.IBinnieGUID; -import binnie.craftgui.extratrees.dictionary.WindowArboristDatabase; -import binnie.craftgui.extratrees.dictionary.WindowBrewery; -import binnie.craftgui.extratrees.dictionary.WindowDistillery; -import binnie.craftgui.extratrees.dictionary.WindowLepidopteristDatabase; -import binnie.craftgui.extratrees.dictionary.WindowLumbermill; -import binnie.craftgui.extratrees.dictionary.WindowPress; -import binnie.craftgui.extratrees.dictionary.WindowSetSquare; -import binnie.craftgui.extratrees.dictionary.WindowWoodworker; -import binnie.craftgui.extratrees.kitchen.WindowBottleRack; import binnie.craftgui.minecraft.Window; +import binnie.extratrees.item.craftgui.WindowArboristDatabase; +import binnie.extratrees.item.craftgui.WindowBrewery; +import binnie.extratrees.item.craftgui.WindowDistillery; +import binnie.extratrees.item.craftgui.WindowLepidopteristDatabase; +import binnie.extratrees.item.craftgui.WindowLumbermill; +import binnie.extratrees.item.craftgui.WindowPress; +import binnie.extratrees.item.craftgui.WindowSetSquare; +import binnie.extratrees.item.craftgui.WindowWoodworker; +import binnie.extratrees.kitchen.craftgui.WindowBottleRack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java index ab0ab0e2..feb78335 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java @@ -2,7 +2,7 @@ package binnie.extratrees.integration.jei.distillery.brewery; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.geometry.IPoint; -import binnie.craftgui.extratrees.dictionary.ControlDistilleryProgress; +import binnie.extratrees.item.craftgui.ControlDistilleryProgress; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index fe0e646e..dde7735d 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,19 +1,17 @@ package binnie.extratrees.item; import binnie.extratrees.api.IToolHammer; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemHammer extends Item implements IToolHammer { - boolean isDurableHammer; - -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = ExtraTrees.proxy.getIcon(register, this.isDurableHammer ? "durableHammer" : "carpentryHammer"); -// } +public class ItemHammer extends Item implements IToolHammer, IItemModelRegister { + private boolean isDurableHammer; public ItemHammer(final boolean durable) { this.isDurableHammer = false; @@ -24,6 +22,12 @@ public class ItemHammer extends Item implements IToolHammer { this.setMaxDamage(durable ? 1562 : 251); setRegistryName(durable ? "durableHammer" : "hammer"); } + + @Override + @SideOnly(Side.CLIENT) + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, isDurableHammer ? "durableHammer" : "carpentryHammer"); + } @Override public String getItemStackDisplayName(final ItemStack i) { diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/item/craftgui/ControlBlockIconDisplay.java similarity index 92% rename from src/main/java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java rename to src/main/java/binnie/extratrees/item/craftgui/ControlBlockIconDisplay.java index 068a46a6..cf8f0dcd 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/item/craftgui/ControlBlockIconDisplay.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/item/craftgui/ControlBreweryProgress.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java rename to src/main/java/binnie/extratrees/item/craftgui/ControlBreweryProgress.java index 6f85b749..f3d105f2 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/item/craftgui/ControlBreweryProgress.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.machines.Machine; import binnie.core.util.ItemStackSet; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/item/craftgui/ControlDistilleryProgress.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java rename to src/main/java/binnie/extratrees/item/craftgui/ControlDistilleryProgress.java index 4cda80f8..2b918ef1 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/item/craftgui/ControlDistilleryProgress.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.machines.Machine; import binnie.craftgui.core.CraftGUI; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/item/craftgui/ControlFruitPressProgress.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java rename to src/main/java/binnie/extratrees/item/craftgui/ControlFruitPressProgress.java index 3152aac6..8c29a2ec 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/item/craftgui/ControlFruitPressProgress.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/item/craftgui/ControlLumbermillProgress.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java rename to src/main/java/binnie/extratrees/item/craftgui/ControlLumbermillProgress.java index 3f7a0925..a894eca0 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/item/craftgui/ControlLumbermillProgress.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/item/craftgui/ControlRecipeSlot.java similarity index 96% rename from src/main/java/binnie/craftgui/extratrees/dictionary/ControlRecipeSlot.java rename to src/main/java/binnie/extratrees/item/craftgui/ControlRecipeSlot.java index ecdb7f43..f464cfbc 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/item/craftgui/ControlRecipeSlot.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java b/src/main/java/binnie/extratrees/item/craftgui/ControlTileSelect.java similarity index 99% rename from src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java rename to src/main/java/binnie/extratrees/item/craftgui/ControlTileSelect.java index 75b55d25..7d393b27 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/item/craftgui/ControlTileSelect.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/DialogBreweryRecipe.java b/src/main/java/binnie/extratrees/item/craftgui/DialogBreweryRecipe.java similarity index 87% rename from src/main/java/binnie/craftgui/extratrees/dictionary/DialogBreweryRecipe.java rename to src/main/java/binnie/extratrees/item/craftgui/DialogBreweryRecipe.java index 2ad3f7e1..5ac32b7c 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/DialogBreweryRecipe.java +++ b/src/main/java/binnie/extratrees/item/craftgui/DialogBreweryRecipe.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.craftgui.core.IWidget; import binnie.craftgui.minecraft.Dialog; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PageFruit.java b/src/main/java/binnie/extratrees/item/craftgui/PageFruit.java similarity index 97% rename from src/main/java/binnie/craftgui/extratrees/dictionary/PageFruit.java rename to src/main/java/binnie/extratrees/item/craftgui/PageFruit.java index bae6aded..8bc410c0 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageFruit.java +++ b/src/main/java/binnie/extratrees/item/craftgui/PageFruit.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PagePlanksOverview.java b/src/main/java/binnie/extratrees/item/craftgui/PagePlanksOverview.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/PagePlanksOverview.java rename to src/main/java/binnie/extratrees/item/craftgui/PagePlanksOverview.java index e9e246bb..7b479169 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/item/craftgui/PagePlanksOverview.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.BinnieCore; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PagePlanksTrees.java b/src/main/java/binnie/extratrees/item/craftgui/PagePlanksTrees.java similarity index 96% rename from src/main/java/binnie/craftgui/extratrees/dictionary/PagePlanksTrees.java rename to src/main/java/binnie/extratrees/item/craftgui/PagePlanksTrees.java index 2d9d63f1..24b19621 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/item/craftgui/PagePlanksTrees.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesImage.java b/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesImage.java similarity index 95% rename from src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesImage.java rename to src/main/java/binnie/extratrees/item/craftgui/PageSpeciesImage.java index 3c92ad5a..ec0f9058 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesImage.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesTreeGenome.java similarity index 99% rename from src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java rename to src/main/java/binnie/extratrees/item/craftgui/PageSpeciesTreeGenome.java index d5d01d39..b91a694f 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesTreeGenome.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PageWood.java b/src/main/java/binnie/extratrees/item/craftgui/PageWood.java similarity index 96% rename from src/main/java/binnie/craftgui/extratrees/dictionary/PageWood.java rename to src/main/java/binnie/extratrees/item/craftgui/PageWood.java index 70be70b1..b1dd3aad 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageWood.java +++ b/src/main/java/binnie/extratrees/item/craftgui/PageWood.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/item/craftgui/WindowArboristDatabase.java similarity index 99% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowArboristDatabase.java index 61a6e4f4..06a0b366 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowArboristDatabase.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowBrewery.java b/src/main/java/binnie/extratrees/item/craftgui/WindowBrewery.java similarity index 97% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowBrewery.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowBrewery.java index 4a834a9f..f5b16afd 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowBrewery.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowDistillery.java b/src/main/java/binnie/extratrees/item/craftgui/WindowDistillery.java similarity index 97% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowDistillery.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowDistillery.java index a4094d66..0c20c80f 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowDistillery.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/item/craftgui/WindowLepidopteristDatabase.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowLepidopteristDatabase.java index a6150a45..f0e35f20 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowLepidopteristDatabase.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLumbermill.java b/src/main/java/binnie/extratrees/item/craftgui/WindowLumbermill.java similarity index 97% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowLumbermill.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowLumbermill.java index 1d3ea490..5909ae32 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowLumbermill.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java b/src/main/java/binnie/extratrees/item/craftgui/WindowPress.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowPress.java index a9eff482..b2e24617 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowPress.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowSetSquare.java b/src/main/java/binnie/extratrees/item/craftgui/WindowSetSquare.java similarity index 94% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowSetSquare.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowSetSquare.java index 2ab679ed..769e0fb6 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowSetSquare.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowWoodworker.java b/src/main/java/binnie/extratrees/item/craftgui/WindowWoodworker.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/dictionary/WindowWoodworker.java rename to src/main/java/binnie/extratrees/item/craftgui/WindowWoodworker.java index 35da41cd..57745517 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/item/craftgui/WindowWoodworker.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.dictionary; +package binnie.extratrees.item.craftgui; import binnie.core.AbstractMod; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlDropDownMenu.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java similarity index 92% rename from src/main/java/binnie/craftgui/extratrees/kitchen/ControlDropDownMenu.java rename to src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java index 908d56f6..1fbbc240 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlDropDownMenu.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.kitchen; +package binnie.extratrees.kitchen.craftgui; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlDropdownButton.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java similarity index 96% rename from src/main/java/binnie/craftgui/extratrees/kitchen/ControlDropdownButton.java rename to src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java index f49607c6..c73e8e3f 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlDropdownButton.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.kitchen; +package binnie.extratrees.kitchen.craftgui; import binnie.craftgui.controls.button.ControlButton; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java rename to src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java index 539d2e8b..0ccd287c 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.kitchen; +package binnie.extratrees.kitchen.craftgui; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.Attribute; diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java similarity index 98% rename from src/main/java/binnie/craftgui/extratrees/kitchen/ControlSlotFluid.java rename to src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 8e81deea..cbd8ebe8 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.kitchen; +package binnie.extratrees.kitchen.craftgui; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.Attribute; diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlSlotGlassware.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java similarity index 94% rename from src/main/java/binnie/craftgui/extratrees/kitchen/ControlSlotGlassware.java rename to src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java index 68875640..399e185e 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlSlotGlassware.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.kitchen; +package binnie.extratrees.kitchen.craftgui; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlTankSlot.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java similarity index 96% rename from src/main/java/binnie/craftgui/extratrees/kitchen/ControlTankSlot.java rename to src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index 950d414a..d63abb97 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.kitchen; +package binnie.extratrees.kitchen.craftgui; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/WindowBottleRack.java b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java similarity index 96% rename from src/main/java/binnie/craftgui/extratrees/kitchen/WindowBottleRack.java rename to src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java index 59f3a55e..0f9bdbac 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/WindowBottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java @@ -1,4 +1,4 @@ -package binnie.craftgui.extratrees.kitchen; +package binnie.extratrees.kitchen.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/src/main/java/binnie/genetics/core/GeneticsGUI.java index 26dee0df..7ffa8d6c 100644 --- a/src/main/java/binnie/genetics/core/GeneticsGUI.java +++ b/src/main/java/binnie/genetics/core/GeneticsGUI.java @@ -1,19 +1,19 @@ package binnie.genetics.core; import binnie.core.gui.IBinnieGUID; -import binnie.craftgui.genetics.machine.WindowAcclimatiser; -import binnie.craftgui.genetics.machine.WindowAnalyser; -import binnie.craftgui.genetics.machine.WindowGeneBank; -import binnie.craftgui.genetics.machine.WindowGeneBankNEI; -import binnie.craftgui.genetics.machine.WindowGenepool; -import binnie.craftgui.genetics.machine.WindowIncubator; -import binnie.craftgui.genetics.machine.WindowInoculator; -import binnie.craftgui.genetics.machine.WindowIsolator; -import binnie.craftgui.genetics.machine.WindowPolymeriser; -import binnie.craftgui.genetics.machine.WindowSequencer; -import binnie.craftgui.genetics.machine.WindowSplicer; import binnie.craftgui.minecraft.Window; import binnie.genetics.gui.WindowAnalyst; +import binnie.genetics.machine.craftgui.WindowAcclimatiser; +import binnie.genetics.machine.craftgui.WindowAnalyser; +import binnie.genetics.machine.craftgui.WindowGeneBank; +import binnie.genetics.machine.craftgui.WindowGeneBankNEI; +import binnie.genetics.machine.craftgui.WindowGenepool; +import binnie.genetics.machine.craftgui.WindowIncubator; +import binnie.genetics.machine.craftgui.WindowInoculator; +import binnie.genetics.machine.craftgui.WindowIsolator; +import binnie.genetics.machine.craftgui.WindowPolymeriser; +import binnie.genetics.machine.craftgui.WindowSequencer; +import binnie.genetics.machine.craftgui.WindowSplicer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java index bd78546b..bf92d6d7 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java @@ -10,8 +10,8 @@ import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.geometry.CraftGUIUtil; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IPoint; -import binnie.craftgui.extratrees.kitchen.ControlFluidDisplay; import binnie.craftgui.minecraft.control.ControlItemDisplay; +import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay; import binnie.genetics.Genetics; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBee; diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/ControlGene.java rename to src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 7677766e..bb5f0b21 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java rename to src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 95640cef..202191b3 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.Binnie; import binnie.core.genetics.BreedingSystem; diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlProcessTemporary.java b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java similarity index 95% rename from src/main/java/binnie/craftgui/genetics/machine/ControlProcessTemporary.java rename to src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java index 1d998d9c..3ecb7bae 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlProcessTemporary.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlSequencerProgress.java b/src/main/java/binnie/genetics/machine/craftgui/ControlSequencerProgress.java similarity index 97% rename from src/main/java/binnie/craftgui/genetics/machine/ControlSequencerProgress.java rename to src/main/java/binnie/genetics/machine/craftgui/ControlSequencerProgress.java index b8cffd9d..9d7755f2 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlSequencerProgress.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.machines.Machine; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlSplicerProgress.java b/src/main/java/binnie/genetics/machine/craftgui/ControlSplicerProgress.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/ControlSplicerProgress.java rename to src/main/java/binnie/genetics/machine/craftgui/ControlSplicerProgress.java index 68b324e4..9c84c0e5 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlSplicerProgress.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlSplicerProgress.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/craftgui/WindowAcclimatiser.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowAcclimatiser.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowAcclimatiser.java index 990515a3..fa33b33e 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowAcclimatiser.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.Position; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/craftgui/WindowAnalyser.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowAnalyser.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowAnalyser.java index 3050fb9e..db828870 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowAnalyser.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.Position; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java similarity index 99% rename from src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index d9e649bc..429e8b05 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBankNEI.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java similarity index 89% rename from src/main/java/binnie/craftgui/genetics/machine/WindowGeneBankNEI.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java index e568dbed..e705afbf 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBankNEI.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneProject.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java similarity index 94% rename from src/main/java/binnie/craftgui/genetics/machine/WindowGeneProject.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java index e2abc28f..b1aa0afa 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneProject.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGenepool.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGenepool.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowGenepool.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowGenepool.java index 5e3164f3..e7ae9e5b 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGenepool.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.Position; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGenomeAssembler.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java similarity index 95% rename from src/main/java/binnie/craftgui/genetics/machine/WindowGenomeAssembler.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java index 7b8954fa..21d65561 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGenomeAssembler.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowIncubator.java b/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowIncubator.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java index bc9c556d..65e1300c 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.Position; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowInoculator.java b/src/main/java/binnie/genetics/machine/craftgui/WindowInoculator.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowInoculator.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowInoculator.java index 03250c9f..2fe343ad 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowInoculator.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.CraftGUIUtil; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowIsolator.java b/src/main/java/binnie/genetics/machine/craftgui/WindowIsolator.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowIsolator.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowIsolator.java index c0f6aa84..58f46401 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowIsolator.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.Position; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowMachine.java b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java similarity index 92% rename from src/main/java/binnie/craftgui/genetics/machine/WindowMachine.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java index 2535abf1..68b8567d 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowMachine.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/craftgui/WindowPolymeriser.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowPolymeriser.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowPolymeriser.java index 49577eec..9fdf138b 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowPolymeriser.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.Position; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowSequencer.java b/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowSequencer.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java index 2a57aedf..c8b16af8 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowSplicer.java b/src/main/java/binnie/genetics/machine/craftgui/WindowSplicer.java similarity index 98% rename from src/main/java/binnie/craftgui/genetics/machine/WindowSplicer.java rename to src/main/java/binnie/genetics/machine/craftgui/WindowSplicer.java index 621e89b1..c7036f7d 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowSplicer.java @@ -1,4 +1,4 @@ -package binnie.craftgui.genetics.machine; +package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.core.geometry.CraftGUIUtil;