mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 11:29:23 +00:00
Fix soil item model and start to move craftgui
This commit is contained in:
1 parent
de2dc3dabb
commit
3ed915f9d5
12 files changed
+14
-16
No files matched your search
@@ -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;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IFlowerColour;
|
||||
import binnie.craftgui.controls.core.Control;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.craftgui.controls.listbox.ControlListBox;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.core.genetics.BreedingSystem;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.craftgui.controls.core.Control;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IFlowerColour;
|
||||
import binnie.craftgui.controls.listbox.ControlList;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.botany.api.IFlowerColour;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.botany.api.IFlowerColour;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.botany.api.EnumFlowerChromosome;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.craftgui.botany;
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.botany.Botany;
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user