From 3ed915f9d5cd84e55157a3ba108eb070b5ed3be0 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 15 Jan 2017 18:41:45 +0100 Subject: [PATCH] Fix soil item model and start to move craftgui --- src/main/java/binnie/botany/core/BotanyGUI.java | 2 +- .../botany => botany/craftgui}/ControlColourDisplay.java | 2 +- .../botany => botany/craftgui}/ControlColourMixBox.java | 2 +- .../botany => botany/craftgui}/ControlColourMixItem.java | 2 +- .../craftgui}/ControlColourMixSymbol.java | 2 +- .../botany => botany/craftgui}/ControlColourOption.java | 2 +- .../botany => botany/craftgui}/PageColourMix.java | 2 +- .../craftgui}/PageColourMixResultant.java | 2 +- .../craftgui}/PageSpeciesFlowerGenome.java | 2 +- .../craftgui}/WindowBotanistDatabase.java | 2 +- src/main/java/binnie/botany/gardening/BlockSoil.java | 8 +++----- .../java/binnie/genetics/gui/AnalystPageAppearance.java | 2 +- 12 files changed, 14 insertions(+), 16 deletions(-) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/ControlColourDisplay.java (97%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/ControlColourMixBox.java (95%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/ControlColourMixItem.java (97%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/ControlColourMixSymbol.java (98%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/ControlColourOption.java (97%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/PageColourMix.java (97%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/PageColourMixResultant.java (97%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/PageSpeciesFlowerGenome.java (99%) rename src/main/java/binnie/{craftgui/botany => botany/craftgui}/WindowBotanistDatabase.java (99%) diff --git a/src/main/java/binnie/botany/core/BotanyGUI.java b/src/main/java/binnie/botany/core/BotanyGUI.java index 81f0bdc9..3bffcfec 100644 --- a/src/main/java/binnie/botany/core/BotanyGUI.java +++ b/src/main/java/binnie/botany/core/BotanyGUI.java @@ -1,7 +1,7 @@ package binnie.botany.core; +import binnie.botany.craftgui.WindowBotanistDatabase; import binnie.core.gui.IBinnieGUID; -import binnie.craftgui.botany.WindowBotanistDatabase; import binnie.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/craftgui/botany/ControlColourDisplay.java b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java similarity index 97% rename from src/main/java/binnie/craftgui/botany/ControlColourDisplay.java rename to src/main/java/binnie/botany/craftgui/ControlColourDisplay.java index b4bdf6d2..cd594f19 100644 --- a/src/main/java/binnie/craftgui/botany/ControlColourDisplay.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.botany.api.IFlowerColour; import binnie.craftgui.controls.core.Control; diff --git a/src/main/java/binnie/craftgui/botany/ControlColourMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java similarity index 95% rename from src/main/java/binnie/craftgui/botany/ControlColourMixBox.java rename to src/main/java/binnie/botany/craftgui/ControlColourMixBox.java index a1423322..5db71711 100644 --- a/src/main/java/binnie/craftgui/botany/ControlColourMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.craftgui.controls.listbox.ControlListBox; diff --git a/src/main/java/binnie/craftgui/botany/ControlColourMixItem.java b/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java similarity index 97% rename from src/main/java/binnie/craftgui/botany/ControlColourMixItem.java rename to src/main/java/binnie/botany/craftgui/ControlColourMixItem.java index 8d236a97..e2afd2e8 100644 --- a/src/main/java/binnie/craftgui/botany/ControlColourMixItem.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.core.genetics.BreedingSystem; diff --git a/src/main/java/binnie/craftgui/botany/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java similarity index 98% rename from src/main/java/binnie/craftgui/botany/ControlColourMixSymbol.java rename to src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index e2bc46a2..2f21ede6 100644 --- a/src/main/java/binnie/craftgui/botany/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.craftgui.controls.core.Control; diff --git a/src/main/java/binnie/craftgui/botany/ControlColourOption.java b/src/main/java/binnie/botany/craftgui/ControlColourOption.java similarity index 97% rename from src/main/java/binnie/craftgui/botany/ControlColourOption.java rename to src/main/java/binnie/botany/craftgui/ControlColourOption.java index a4170d8e..861bd00c 100644 --- a/src/main/java/binnie/craftgui/botany/ControlColourOption.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourOption.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.botany.api.IFlowerColour; import binnie.craftgui.controls.listbox.ControlList; diff --git a/src/main/java/binnie/craftgui/botany/PageColourMix.java b/src/main/java/binnie/botany/craftgui/PageColourMix.java similarity index 97% rename from src/main/java/binnie/craftgui/botany/PageColourMix.java rename to src/main/java/binnie/botany/craftgui/PageColourMix.java index 7cd75753..b5144cda 100644 --- a/src/main/java/binnie/craftgui/botany/PageColourMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMix.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColour; diff --git a/src/main/java/binnie/craftgui/botany/PageColourMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java similarity index 97% rename from src/main/java/binnie/craftgui/botany/PageColourMixResultant.java rename to src/main/java/binnie/botany/craftgui/PageColourMixResultant.java index 6e9e76c1..e9334a4a 100644 --- a/src/main/java/binnie/craftgui/botany/PageColourMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColour; diff --git a/src/main/java/binnie/craftgui/botany/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java similarity index 99% rename from src/main/java/binnie/craftgui/botany/PageSpeciesFlowerGenome.java rename to src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index 0f877d3b..61167e03 100644 --- a/src/main/java/binnie/craftgui/botany/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; diff --git a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java similarity index 99% rename from src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java rename to src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 6f0492c6..af31f430 100644 --- a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -1,4 +1,4 @@ -package binnie.craftgui.botany; +package binnie.botany.craftgui; import binnie.Binnie; import binnie.botany.Botany; diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 76beeb21..b90bd78b 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -116,9 +116,8 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { - int index = 0; - for (EnumMoisture moisture : EnumMoisture.values()) { - for (EnumAcidity acidity : EnumAcidity.values()) { + for (EnumAcidity acidity : EnumAcidity.values()) { + for (EnumMoisture moisture : EnumMoisture.values()) { String modelName = ""; if (acidity != EnumAcidity.Neutral) { modelName += acidity.getName(); @@ -132,8 +131,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { if (modelName.isEmpty()) { modelName = "normal"; } - manager.registerItemModel(item, index, type.getName() + (weedKilled ? "NoWeed" : "") + "/" + modelName); - index++; + manager.registerItemModel(item, moisture.ordinal() + acidity.ordinal() * 3, type.getName() + (weedKilled ? "NoWeed" : "") + "/" + modelName); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java index 900115ac..f27f95e4 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java @@ -1,7 +1,7 @@ package binnie.genetics.gui; import binnie.botany.api.IFlower; -import binnie.craftgui.botany.ControlColourDisplay; +import binnie.botany.craftgui.ControlColourDisplay; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea;