diff --git a/botany/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/botany/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 4cc291b3..5b70c440 100644 --- a/botany/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -4,14 +4,6 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeSet; -import binnie.botany.api.BotanyAPI; -import binnie.botany.api.genetics.EnumFlowerColor; -import binnie.core.api.genetics.IFieldKitPlugin; -import binnie.core.api.gui.IPoint; -import binnie.core.api.gui.ITexture; -import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.minecraft.StandardTexture; -import binnie.core.texture.BinnieCoreTexture; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,14 +16,22 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import binnie.core.Binnie; +import binnie.botany.api.BotanyAPI; import binnie.botany.api.genetics.EnumFlowerChromosome; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.api.genetics.EnumFlowerStage; import binnie.botany.api.genetics.IBotanistTracker; import binnie.botany.core.BotanyCore; +import binnie.core.Binnie; +import binnie.core.api.genetics.IFieldKitPlugin; +import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.ITexture; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.genetics.Tolerance; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.resource.textures.StandardTexture; +import binnie.core.texture.BinnieCoreTexture; import binnie.core.util.I18N; public class FlowerBreedingSystem extends BreedingSystem { diff --git a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java index 3c91ca69..bb84a4e2 100644 --- a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java +++ b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java @@ -13,9 +13,9 @@ import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.database.DatabaseConstants; import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.CraftGUITextureSheet; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.CraftGUITextureSheet; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.util.I18N; public class ControlColorMixSymbol extends Control implements ITooltip { diff --git a/core/src/main/java/binnie/core/gui/CraftGUI.java b/core/src/main/java/binnie/core/gui/CraftGUI.java index 58f97a17..f47848f4 100644 --- a/core/src/main/java/binnie/core/gui/CraftGUI.java +++ b/core/src/main/java/binnie/core/gui/CraftGUI.java @@ -4,10 +4,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.renderer.TextureRenderer; -import binnie.core.gui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.gui.resource.stylesheet.StyleSheetManager; @SideOnly(Side.CLIENT) public class CraftGUI { public static final TextureRenderer RENDER = new TextureRenderer(); - public static CraftGUIResourceManager resourceManager; + public static StyleSheetManager styleSheetManager; } diff --git a/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java b/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java index 4e7fe490..abc3c06b 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java @@ -13,7 +13,7 @@ import binnie.core.gui.events.EventValueChanged; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlCheckbox extends Control implements IControlValue { private boolean value; diff --git a/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java b/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java index ea44419b..50fadd29 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java @@ -14,7 +14,7 @@ import binnie.core.gui.events.EventKey; import binnie.core.gui.events.EventMouse; import binnie.core.gui.events.EventTextEdit; import binnie.core.gui.events.EventWidget; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; @SideOnly(Side.CLIENT) public class ControlTextEdit extends Control implements IControlValue { diff --git a/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java b/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java index 5915cc93..9ed4fabc 100644 --- a/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java +++ b/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java @@ -13,7 +13,7 @@ import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventButtonClicked; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.TextJustification; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlButton extends Control { @Nullable diff --git a/core/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java index 674d89ba..53cbc25c 100644 --- a/core/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java +++ b/core/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java @@ -8,7 +8,7 @@ import binnie.core.gui.CraftGUI; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.events.EventMouse; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlOption extends Control implements IControlValue { private T value; diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java index c8968946..5e6aa44f 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java @@ -9,7 +9,7 @@ import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Area; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlScrollBar extends Control { protected final IControlScrollable scrollable; diff --git a/core/src/main/java/binnie/core/gui/controls/tab/ControlTab.java b/core/src/main/java/binnie/core/gui/controls/tab/ControlTab.java index 903bbf7f..431f6da0 100644 --- a/core/src/main/java/binnie/core/gui/controls/tab/ControlTab.java +++ b/core/src/main/java/binnie/core/gui/controls/tab/ControlTab.java @@ -1,12 +1,13 @@ package binnie.core.gui.controls.tab; -import binnie.core.api.gui.IArea; -import binnie.core.api.gui.ITexture; -import binnie.core.gui.geometry.Point; import net.minecraft.client.util.ITooltipFlag; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.api.gui.Alignment; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITexture; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; @@ -15,11 +16,11 @@ import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.events.EventMouse; import binnie.core.gui.events.EventValueChanged; -import binnie.core.api.gui.Alignment; +import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.gui.minecraft.control.ControlTabIcon; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlTab extends Control implements ITooltip, IControlValue { protected T value; diff --git a/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java index a732e655..7cca62db 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java +++ b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java @@ -10,10 +10,10 @@ import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.CraftGUITexture; -import binnie.core.gui.resource.minecraft.CraftGUITextureSheet; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITextureSheet; +import binnie.core.gui.resource.textures.StandardTexture; class ControlBreedingProgress extends Control { private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.CONTROLS); diff --git a/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java index 23a6ccf2..f07ca799 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java @@ -17,9 +17,9 @@ import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.CraftGUITextureSheet; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.CraftGUITextureSheet; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.util.I18N; class ControlMutationSymbol extends Control implements ITooltip { diff --git a/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java index 4c278311..08edf5d5 100644 --- a/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java @@ -9,8 +9,8 @@ import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventValueChanged; import binnie.core.gui.events.EventWidget; import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.texture.BinnieCoreTexture; import forestry.api.genetics.IChromosomeType; import net.minecraft.client.util.ITooltipFlag; diff --git a/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java b/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java index 2fffb3f3..38bde024 100644 --- a/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java @@ -7,9 +7,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import binnie.core.api.genetics.IBreedingSystem; -import binnie.core.genetics.ManagerGenetics; -import binnie.core.gui.geometry.Point; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; @@ -26,15 +23,18 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.core.Binnie; import binnie.core.AbstractMod; +import binnie.core.Binnie; import binnie.core.BinnieCore; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.genetics.ManagerGenetics; import binnie.core.gui.CraftGUI; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventValueChanged; import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.minecraft.InventoryType; import binnie.core.gui.minecraft.Window; @@ -42,8 +42,8 @@ import binnie.core.gui.minecraft.WindowInventory; import binnie.core.gui.minecraft.control.ControlImage; import binnie.core.gui.minecraft.control.ControlPlayerInventory; import binnie.core.gui.minecraft.control.ControlSlot; -import binnie.core.gui.resource.StyleSheetPunnett; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.stylesheet.StyleSheetManager; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.texture.BinnieCoreTexture; import binnie.core.util.I18N; @@ -96,7 +96,7 @@ public class WindowFieldKit extends Window { @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(I18N.localise("binniecore.gui.fieldkit.title")); - CraftGUI.RENDER.setStyleSheet(new StyleSheetPunnett()); + CraftGUI.RENDER.setStyleSheet(StyleSheetManager.getSheet(StyleSheetManager.PUNNETT_SHEET)); WindowInventory inventory = this.getWindowInventory(); inventory.createSlot(INDIVIDUAL_SLOT); inventory.createSlot(PAPER_SLOT); diff --git a/core/src/main/java/binnie/core/gui/minecraft/Dialog.java b/core/src/main/java/binnie/core/gui/minecraft/Dialog.java index 48ff431e..5673c03e 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/Dialog.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Dialog.java @@ -11,7 +11,7 @@ import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventMouse; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; @SideOnly(Side.CLIENT) public abstract class Dialog extends Control { diff --git a/core/src/main/java/binnie/core/gui/minecraft/Window.java b/core/src/main/java/binnie/core/gui/minecraft/Window.java index 8fea354f..21056df3 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/Window.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Window.java @@ -18,8 +18,8 @@ import com.mojang.authlib.GameProfile; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.Binnie; import binnie.core.AbstractMod; +import binnie.core.Binnie; import binnie.core.BinnieCore; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; @@ -39,10 +39,10 @@ import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.gui.minecraft.control.ControlUser; import binnie.core.gui.minecraft.control.EnumHighlighting; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.StyleSheetManager; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.CraftGUITexture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.CraftGUITexture; +import binnie.core.gui.resource.textures.StandardTexture; +import binnie.core.gui.resource.stylesheet.StyleSheetManager; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventoryMachine; import binnie.core.machines.network.INetwork; @@ -89,7 +89,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG for (final EnumHighlighting h : EnumHighlighting.values()) { ControlSlot.highlighting.put(h, new ArrayList<>()); } - CraftGUI.RENDER.setStyleSheet(StyleSheetManager.getDefault()); + CraftGUI.RENDER.setStyleSheet(StyleSheetManager.getDefaultSheet()); this.titleButtonLeft = -14; if (this.showHelpButton()) { new ControlHelp(this, this.titleButtonLeft += 22, 8); diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java index 86b2b9d5..32782ed4 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java @@ -21,7 +21,7 @@ import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.MinecraftTooltip; import binnie.core.gui.minecraft.Window; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.power.IPoweredMachine; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java index 36eeba70..b35fe4b9 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java @@ -18,7 +18,7 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.CustomSlot; import binnie.core.gui.minecraft.MinecraftTooltip; import binnie.core.gui.minecraft.Window; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.errors.ErrorState; public class ControlErrorState extends Control implements ITooltip { diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java index 315af18a..d2ee1f33 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java @@ -10,7 +10,7 @@ import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlHelp extends Control implements ITooltip { public ControlHelp(final IWidget parent, final int x, final int y) { diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java index 58325331..e5a2c3c3 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java @@ -7,7 +7,7 @@ import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.textures.Texture; public class ControlImage extends Control { private Object key; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java index da8942f4..1824da4f 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java @@ -10,7 +10,7 @@ import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlInfo extends Control implements ITooltip { private String info; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java index 3495a212..ab47c292 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java @@ -33,7 +33,7 @@ import binnie.core.gui.minecraft.GuiCraftGUI; import binnie.core.gui.minecraft.MinecraftTooltip; import binnie.core.gui.minecraft.Window; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.TankSlot; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java index 9543fa66..9792f0b1 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java @@ -2,7 +2,7 @@ package binnie.core.gui.minecraft.control; import binnie.core.gui.IWidget; import binnie.core.api.gui.Alignment; -import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.textures.Texture; public class ControlMachineProgress extends ControlProgress { public ControlMachineProgress(final IWidget parent, final int x, final int y, final Texture base, final Texture progress, final Alignment dir) { diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java index a730222d..f50983ae 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java @@ -10,7 +10,7 @@ import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.power.PowerSystem; public class ControlPowerSystem extends Control implements ITooltip { diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java index 7ae79c51..4c39d50b 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.api.gui.Alignment; -import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.textures.Texture; public class ControlProgress extends ControlProgressBase { private Texture progressBlank; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java index 18c587c9..b126a038 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java @@ -1,24 +1,24 @@ package binnie.core.gui.minecraft.control; -import binnie.core.api.gui.IArea; -import binnie.core.api.gui.IPoint; -import binnie.core.api.gui.ITexture; -import binnie.core.gui.geometry.Point; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.api.gui.Alignment; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.ITexture; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Border; -import binnie.core.api.gui.Alignment; +import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlSlide extends Control { private IArea expanded; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java index f7c03a85..22f9d69e 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java @@ -6,8 +6,6 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import binnie.core.api.gui.IArea; -import binnie.core.gui.geometry.Point; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.multiplayer.PlayerControllerMP; @@ -21,18 +19,20 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.api.gui.IArea; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.CustomSlot; import binnie.core.gui.minecraft.GuiCraftGUI; import binnie.core.gui.minecraft.InventoryType; import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.WindowInventory; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.SlotValidator; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java index 7cd48fb3..df4e14bc 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java @@ -20,7 +20,7 @@ import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public abstract class ControlSlotBase extends Control implements ITooltip { private ControlItemDisplay itemDisplay; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java index 9b00d94a..2edaae2a 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java @@ -9,7 +9,7 @@ import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.Window; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java index 5334d05a..8b5cb1ad 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java @@ -12,7 +12,7 @@ import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlUser extends Control implements ITooltip { private final String username; diff --git a/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java b/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java index a35111c8..40fefbce 100644 --- a/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java +++ b/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java @@ -2,11 +2,6 @@ package binnie.core.gui.renderer; import javax.annotation.Nullable; -import binnie.core.api.gui.IArea; -import binnie.core.api.gui.IBorder; -import binnie.core.api.gui.IPoint; -import binnie.core.api.gui.ITexture; -import binnie.core.gui.geometry.Area; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -18,9 +13,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import binnie.core.BinnieCore; -import binnie.core.gui.IWidget; import binnie.core.api.gui.Alignment; -import binnie.core.gui.resource.IStyleSheet; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.IBorder; +import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.ITexture; +import binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.resource.stylesheet.IStyleSheet; +import binnie.core.gui.resource.stylesheet.StyleSheetManager; @SideOnly(Side.CLIENT) public class TextureRenderer { @@ -121,6 +122,9 @@ public class TextureRenderer { if (key instanceof ITexture) { return (ITexture) key; } + if (!styleSheet.hasTexture(key)) { + return StyleSheetManager.getDefaultTexture(key); + } return this.styleSheet.getTexture(key); } diff --git a/core/src/main/java/binnie/core/gui/resource/GeneticsGUITexture.java b/core/src/main/java/binnie/core/gui/resource/GeneticsGUITexture.java deleted file mode 100644 index 426ca25b..00000000 --- a/core/src/main/java/binnie/core/gui/resource/GeneticsGUITexture.java +++ /dev/null @@ -1,6 +0,0 @@ -package binnie.core.gui.resource; - -public enum GeneticsGUITexture { - CHROMOSOME, - CHROMOSOME_OVERLAY -} diff --git a/core/src/main/java/binnie/core/gui/resource/IStyleSheet.java b/core/src/main/java/binnie/core/gui/resource/IStyleSheet.java deleted file mode 100644 index 35ce70a0..00000000 --- a/core/src/main/java/binnie/core/gui/resource/IStyleSheet.java +++ /dev/null @@ -1,9 +0,0 @@ -package binnie.core.gui.resource; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IStyleSheet { - @SideOnly(Side.CLIENT) - Texture getTexture(Object object); -} diff --git a/core/src/main/java/binnie/core/gui/resource/StyleSheet.java b/core/src/main/java/binnie/core/gui/resource/StyleSheet.java deleted file mode 100644 index 7577e334..00000000 --- a/core/src/main/java/binnie/core/gui/resource/StyleSheet.java +++ /dev/null @@ -1,24 +0,0 @@ -package binnie.core.gui.resource; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class StyleSheet implements IStyleSheet { - protected Map textures; - - public StyleSheet() { - this.textures = new HashMap<>(); - } - - @Override - @SideOnly(Side.CLIENT) - public Texture getTexture(final Object key) { - if (!this.textures.containsKey(key)) { - return StyleSheetManager.getTexture(key); - } - return this.textures.get(key); - } -} diff --git a/core/src/main/java/binnie/core/gui/resource/StyleSheetManager.java b/core/src/main/java/binnie/core/gui/resource/StyleSheetManager.java deleted file mode 100644 index a59a1a1b..00000000 --- a/core/src/main/java/binnie/core/gui/resource/StyleSheetManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package binnie.core.gui.resource; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import binnie.core.gui.CraftGUI; - -public class StyleSheetManager { - static IStyleSheet defaultSS = new DefaultStyleSheet(); - - @SideOnly(Side.CLIENT) - public static Texture getTexture(final Object key) { - return StyleSheetManager.defaultSS.getTexture(key); - } - - public static IStyleSheet getDefault() { - return StyleSheetManager.defaultSS; - } - - private static class DefaultStyleSheet implements IStyleSheet { - @Override - @SideOnly(Side.CLIENT) - public Texture getTexture(final Object key) { - return CraftGUI.resourceManager.getTexture(key.toString()); - } - } -} diff --git a/core/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java b/core/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java deleted file mode 100644 index 15785729..00000000 --- a/core/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java +++ /dev/null @@ -1,17 +0,0 @@ -package binnie.core.gui.resource; - -import binnie.core.gui.resource.minecraft.CraftGUITexture; -import binnie.core.gui.resource.minecraft.PaddedTexture; -import binnie.core.gui.resource.minecraft.StandardTexture; -import binnie.core.texture.BinnieCoreTexture; - -public class StyleSheetPunnett extends StyleSheet { - public StyleSheetPunnett() { - this.textures.put(CraftGUITexture.WINDOW, new PaddedTexture(0, 0, 160, 160, 0, BinnieCoreTexture.GUI_PUNNETT, 32, 32, 32, 32)); - this.textures.put(CraftGUITexture.SLOT, new StandardTexture(160, 0, 18, 18, 0, BinnieCoreTexture.GUI_PUNNETT)); - this.textures.put(GeneticsGUITexture.CHROMOSOME, new StandardTexture(160, 36, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); - this.textures.put(GeneticsGUITexture.CHROMOSOME_OVERLAY, new StandardTexture(160, 52, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); - this.textures.put(CraftGUITexture.HELP_BUTTON, new StandardTexture(178, 0, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); - this.textures.put(CraftGUITexture.INFO_BUTTON, new StandardTexture(178, 16, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); - } -} diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/IStyleSheet.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/IStyleSheet.java new file mode 100644 index 00000000..60e5fc69 --- /dev/null +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/IStyleSheet.java @@ -0,0 +1,14 @@ +package binnie.core.gui.resource.stylesheet; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import binnie.core.gui.resource.textures.Texture; + +public interface IStyleSheet { + @SideOnly(Side.CLIENT) + boolean hasTexture(Object key); + + @SideOnly(Side.CLIENT) + Texture getTexture(Object key); +} diff --git a/core/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/ParsedTextureSheet.java similarity index 79% rename from core/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java rename to core/src/main/java/binnie/core/gui/resource/stylesheet/ParsedTextureSheet.java index cfb3de41..e236295b 100644 --- a/core/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/ParsedTextureSheet.java @@ -1,4 +1,4 @@ -package binnie.core.gui.resource.minecraft; +package binnie.core.gui.resource.stylesheet; import javax.annotation.Nullable; @@ -10,7 +10,6 @@ import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; class ParsedTextureSheet implements IBinnieTexture { - private String name; private String modid; private String path; @@ -18,8 +17,7 @@ class ParsedTextureSheet implements IBinnieTexture { @Nullable private BinnieResource resource; - public ParsedTextureSheet(final String name, final String modid, final String path) { - this.name = name; + public ParsedTextureSheet(final String modid, final String path) { this.modid = modid; this.path = path; } diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheet.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheet.java new file mode 100644 index 00000000..bbabdff5 --- /dev/null +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheet.java @@ -0,0 +1,34 @@ +package binnie.core.gui.resource.stylesheet; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import binnie.core.gui.resource.textures.Texture; + +public class StyleSheet implements IStyleSheet { + protected Map textures; + + public StyleSheet() { + this.textures = new HashMap<>(); + } + + public StyleSheet(Map textures) { + this.textures = new HashMap<>(); + this.textures.putAll(textures); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasTexture(Object key) { + return this.textures.containsKey(key.toString()); + } + + @Override + @SideOnly(Side.CLIENT) + public Texture getTexture(Object key) { + return this.textures.get(key.toString()); + } +} diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetManager.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetManager.java new file mode 100644 index 00000000..c8666d48 --- /dev/null +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetManager.java @@ -0,0 +1,65 @@ +package binnie.core.gui.resource.stylesheet; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import binnie.core.Constants; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.resource.textures.Texture; + +@SideOnly(Side.CLIENT) +public class StyleSheetManager implements IResourceManagerReloadListener { + + public static final String DEFAULT_SHEET = "default"; + public static final String PUNNETT_SHEET = "punnett"; + + private static Map sheets; + private static Map sheetLocations; + + public StyleSheetManager() { + this.sheets = new HashMap<>(); + this.sheetLocations = new HashMap<>(); + CraftGUI.styleSheetManager = this; + registerLocation(DEFAULT_SHEET, new ResourceLocation(Constants.CORE_MOD_ID, "gui/stylesheet.json")); + registerLocation(PUNNETT_SHEET, new ResourceLocation(Constants.CORE_MOD_ID, "gui/punnett_stylesheet.json")); + } + + @Override + public void onResourceManagerReload(final IResourceManager manager) { + sheets.clear(); + try { + for(Map.Entry entry : sheetLocations.entrySet()){ + ResourceLocation location = entry.getValue(); + StyleSheet styleSheet = StyleSheetParser.parseSheet(manager, location); + sheets.put(entry.getKey(), styleSheet); + } + } catch (Exception e) { + throw new RuntimeException("Failed to load default stylesheet for Binnie's Mods.", e); + } + } + + @SideOnly(Side.CLIENT) + public static Texture getDefaultTexture(Object key) { + StyleSheet styleSheet = getDefaultSheet(); + return styleSheet.getTexture(key); + } + + public static StyleSheet getDefaultSheet() { + return getSheet(DEFAULT_SHEET); + } + + public static StyleSheet getSheet(String name){ + return sheets.get(name); + } + + public static void registerLocation(String name, ResourceLocation location){ + sheetLocations.put(name, location); + } +} diff --git a/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetParser.java similarity index 53% rename from core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java rename to core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetParser.java index e07b76e1..ae2fdbf7 100644 --- a/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/StyleSheetParser.java @@ -1,4 +1,4 @@ -package binnie.core.gui.resource.minecraft; +package binnie.core.gui.resource.stylesheet; import com.google.common.base.Charsets; import com.google.gson.JsonArray; @@ -10,6 +10,7 @@ import com.google.gson.JsonParser; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -17,24 +18,16 @@ import org.apache.commons.io.IOUtils; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.util.JsonUtils; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import binnie.core.Constants; -import binnie.core.gui.CraftGUI; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Border; -import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.textures.Texture; import binnie.core.resource.IBinnieTexture; import binnie.core.util.Log; -@SideOnly(Side.CLIENT) -public class CraftGUIResourceManager implements IResourceManagerReloadListener { - public static final ResourceLocation SHEET_LOCATION = new ResourceLocation(Constants.CORE_MOD_ID, "gui/stylesheet.json"); +public class StyleSheetParser { public static final String SHEETS_KEY = "texture-sheets"; public static final String NAME_KEY = "name"; public static final String MODID_KEY = "modid"; @@ -45,39 +38,31 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { public static final String PADDING_KEY = "padding"; public static final String TEXTURES_KEY = "textures"; - private Map textureSheets; - private Map textures; - - public CraftGUIResourceManager() { - this.textureSheets = new HashMap<>(); - this.textures = new HashMap<>(); - CraftGUI.resourceManager = this; - } - - @Override - public void onResourceManagerReload(final IResourceManager manager) { - this.textureSheets.clear(); + public static StyleSheet parseSheet(IResourceManager manager, ResourceLocation location) { try { - IResource res = manager.getResource(SHEET_LOCATION); + IResource res = manager.getResource(location); BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(res.getInputStream(), Charsets.UTF_8)); JsonParser jsonParser = new JsonParser(); JsonObject jsonObject = jsonParser.parse(bufferedreader).getAsJsonObject(); - parseTextureSheets(jsonObject); - parseTextures(jsonObject); + + Map textureSheets = parseTextureSheets(jsonObject); + Map textures = parseTextures(jsonObject, textureSheets); IOUtils.closeQuietly(bufferedreader); + return new StyleSheet(textures); } catch (IOException e) { throw new RuntimeException("Failed to load default stylesheet for Binnie's Mods.", e); } } - private void parseTextureSheets(JsonObject jsonObject){ - JsonArray textureSheets = JsonUtils.getJsonArray(jsonObject, SHEETS_KEY); - if(textureSheets == null){ - return; + private static Map parseTextureSheets(JsonObject jsonObject){ + JsonArray textureSheetsArray = JsonUtils.getJsonArray(jsonObject, SHEETS_KEY); + if(textureSheetsArray == null){ + return Collections.emptyMap(); } - for (JsonElement element : textureSheets) { + Map textureSheets = new HashMap<>(); + for (JsonElement element : textureSheetsArray) { if(!element.isJsonObject()){ continue; } @@ -86,53 +71,52 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { String name = JsonUtils.getString(sheetJson, NAME_KEY); String modid = JsonUtils.getString(sheetJson, MODID_KEY); String path = JsonUtils.getString(sheetJson, PATH_KEY); - ParsedTextureSheet textureSheet = new ParsedTextureSheet(name, modid, path); - this.textureSheets.put(name, textureSheet); + ParsedTextureSheet textureSheet = new ParsedTextureSheet(modid, path); + textureSheets.put(name, textureSheet); }catch(Exception e){ Log.warning("Failed to load stylesheet for Binnie's Mods.", e); } } + return textureSheets; } - private void parseTextures(JsonObject jsonObject){ - JsonArray textures = JsonUtils.getJsonArray(jsonObject, TEXTURES_KEY); - if(textures == null){ - return; + private static Map parseTextures(JsonObject jsonObject, Map textureSheets){ + JsonArray texturesJson = JsonUtils.getJsonArray(jsonObject, TEXTURES_KEY); + if(texturesJson == null){ + return Collections.emptyMap(); } - for (JsonElement element : textures) { + Map textures = new HashMap<>(); + for (JsonElement element : texturesJson) { if(!element.isJsonObject()){ continue; } try { JsonObject sheetJson = element.getAsJsonObject(); - parseTexture(sheetJson); + String name = JsonUtils.getString(sheetJson, NAME_KEY); + String sheet = JsonUtils.getString(sheetJson, SHEET_KEY); + JsonArray uvArray = JsonUtils.getJsonArray(sheetJson, UV_KEY); + IBinnieTexture textureSheet = textureSheets.get(sheet); + Area uv = parseArea(uvArray); + Border border = Border.ZERO; + Border padding = Border.ZERO; + if (sheetJson.has(BORDER_KEY)) { + JsonArray array = JsonUtils.getJsonArray(sheetJson, BORDER_KEY); + border = parseBorder(array); + } + if (sheetJson.has(PADDING_KEY)) { + JsonArray array = JsonUtils.getJsonArray(sheetJson, PADDING_KEY); + padding = parseBorder(array); + } + Texture texture = new Texture(uv, padding, border, textureSheet); + textures.put(name, texture); }catch(Exception e){ Log.warning("Failed to load stylesheet for Binnie's Mods.", e); } } + return textures; } - private void parseTexture(JsonObject sheetJson){ - String name = JsonUtils.getString(sheetJson, NAME_KEY); - String sheet = JsonUtils.getString(sheetJson, SHEET_KEY); - JsonArray uvArray = JsonUtils.getJsonArray(sheetJson, UV_KEY); - IBinnieTexture textureSheet = this.getTextureSheet(sheet); - Area uv = this.parseArea(uvArray); - Border border = Border.ZERO; - Border padding = Border.ZERO; - if (sheetJson.has(BORDER_KEY)) { - JsonArray array = JsonUtils.getJsonArray(sheetJson, BORDER_KEY); - border = this.parseBorder(array); - } - if (sheetJson.has(PADDING_KEY)) { - JsonArray array = JsonUtils.getJsonArray(sheetJson, PADDING_KEY); - padding = this.parseBorder(array); - } - Texture texture = new Texture(uv, padding, border, textureSheet); - this.textures.put(name, texture); - } - - public Area parseArea(JsonArray uvArray) { + private static Area parseArea(JsonArray uvArray) { int[] ints = new int[uvArray.size()]; if (ints.length < 1 || ints.length > 4) { throw new JsonParseException("Parameter must have between one and four numbers"); @@ -153,7 +137,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { return new Area(ints[0], ints[1], ints[2], ints[3]); } - public Border parseBorder(JsonArray array) { + private static Border parseBorder(JsonArray array) { int[] ints = new int[array.size()]; if (ints.length < 1 || ints.length > 4) { throw new JsonParseException("Parameter must have between one and four numbers"); @@ -173,18 +157,4 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { } return new Border(ints[0], ints[1], ints[2], ints[3]); } - - public IBinnieTexture getTextureSheet(String name) { - if (!this.textureSheets.containsKey(name)) { - throw new RuntimeException("Missing GUI texture sheet for Binnie Mods: " + name); - } - return this.textureSheets.get(name); - } - - public Texture getTexture(String name) { - if (!this.textures.containsKey(name)) { - throw new RuntimeException("Missing GUI texture Binnie Mods: " + name); - } - return this.textures.get(name); - } } diff --git a/core/src/main/java/binnie/core/gui/resource/stylesheet/package-info.java b/core/src/main/java/binnie/core/gui/resource/stylesheet/package-info.java new file mode 100644 index 00000000..93b23859 --- /dev/null +++ b/core/src/main/java/binnie/core/gui/resource/stylesheet/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.resource.stylesheet; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java b/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITexture.java similarity index 97% rename from core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java rename to core/src/main/java/binnie/core/gui/resource/textures/CraftGUITexture.java index a25116c7..82442701 100644 --- a/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITexture.java @@ -1,4 +1,4 @@ -package binnie.core.gui.resource.minecraft; +package binnie.core.gui.resource.textures; public enum CraftGUITexture { WINDOW("window"), diff --git a/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java b/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITextureSheet.java similarity index 69% rename from core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java rename to core/src/main/java/binnie/core/gui/resource/textures/CraftGUITextureSheet.java index 8ef11e84..d754c60d 100644 --- a/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/CraftGUITextureSheet.java @@ -1,13 +1,15 @@ -package binnie.core.gui.resource.minecraft; +package binnie.core.gui.resource.textures; import javax.annotation.Nullable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.gui.CraftGUI; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; +import binnie.core.resource.ResourceType; public enum CraftGUITextureSheet implements IBinnieTexture { CONTROLS("controls"), @@ -20,7 +22,7 @@ public enum CraftGUITextureSheet implements IBinnieTexture { @Nullable private BinnieResource resource; - private CraftGUITextureSheet(final String name) { + CraftGUITextureSheet(final String name) { this.name = name; } @@ -33,7 +35,7 @@ public enum CraftGUITextureSheet implements IBinnieTexture { @SideOnly(Side.CLIENT) public BinnieResource getTexture() { if (resource == null) { - resource = CraftGUI.resourceManager.getTextureSheet(this.name).getTexture(); + resource = Binnie.RESOURCE.getPNG(Constants.CORE_MOD_ID, ResourceType.GUI, "craftgui-" + name); } return resource; } diff --git a/core/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java b/core/src/main/java/binnie/core/gui/resource/textures/PaddedTexture.java similarity index 86% rename from core/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java rename to core/src/main/java/binnie/core/gui/resource/textures/PaddedTexture.java index d665a8b4..00145afe 100644 --- a/core/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/PaddedTexture.java @@ -1,8 +1,7 @@ -package binnie.core.gui.resource.minecraft; +package binnie.core.gui.resource.textures; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Border; -import binnie.core.gui.resource.Texture; import binnie.core.resource.IBinnieTexture; public class PaddedTexture extends Texture { diff --git a/core/src/main/java/binnie/core/gui/resource/textures/PunnettGUITexture.java b/core/src/main/java/binnie/core/gui/resource/textures/PunnettGUITexture.java new file mode 100644 index 00000000..d0b77a4b --- /dev/null +++ b/core/src/main/java/binnie/core/gui/resource/textures/PunnettGUITexture.java @@ -0,0 +1,16 @@ +package binnie.core.gui.resource.textures; + +public enum PunnettGUITexture { + CHROMOSOME("chromosome"), + CHROMOSOME_OVERLAY("chromosome_overlay"); + String name; + + private PunnettGUITexture(final String name) { + this.name = name; + } + + @Override + public String toString() { + return this.name; + } +} diff --git a/core/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java b/core/src/main/java/binnie/core/gui/resource/textures/StandardTexture.java similarity index 90% rename from core/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java rename to core/src/main/java/binnie/core/gui/resource/textures/StandardTexture.java index 8f92a8c1..9fb7d1cd 100644 --- a/core/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/StandardTexture.java @@ -1,4 +1,4 @@ -package binnie.core.gui.resource.minecraft; +package binnie.core.gui.resource.textures; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -6,7 +6,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Border; -import binnie.core.gui.resource.Texture; import binnie.core.resource.IBinnieTexture; public class StandardTexture extends Texture { diff --git a/core/src/main/java/binnie/core/gui/resource/Texture.java b/core/src/main/java/binnie/core/gui/resource/textures/Texture.java similarity index 98% rename from core/src/main/java/binnie/core/gui/resource/Texture.java rename to core/src/main/java/binnie/core/gui/resource/textures/Texture.java index d431283b..e974a76a 100644 --- a/core/src/main/java/binnie/core/gui/resource/Texture.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/Texture.java @@ -1,14 +1,15 @@ -package binnie.core.gui.resource; +package binnie.core.gui.resource.textures; -import binnie.core.api.gui.IBorder; -import binnie.core.api.gui.ITexture; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.api.gui.Alignment; +import binnie.core.api.gui.IBorder; +import binnie.core.api.gui.ITexture; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Border; -import binnie.core.api.gui.Alignment; import binnie.core.resource.IBinnieTexture; public class Texture implements ITexture { diff --git a/core/src/main/java/binnie/core/gui/resource/minecraft/package-info.java b/core/src/main/java/binnie/core/gui/resource/textures/package-info.java similarity index 84% rename from core/src/main/java/binnie/core/gui/resource/minecraft/package-info.java rename to core/src/main/java/binnie/core/gui/resource/textures/package-info.java index ef03e14c..ee92df91 100644 --- a/core/src/main/java/binnie/core/gui/resource/minecraft/package-info.java +++ b/core/src/main/java/binnie/core/gui/resource/textures/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.gui.resource.minecraft; +package binnie.core.gui.resource.textures; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/core/src/main/java/binnie/core/gui/window/Panel.java b/core/src/main/java/binnie/core/gui/window/Panel.java index 7ca912b6..b9b70459 100644 --- a/core/src/main/java/binnie/core/gui/window/Panel.java +++ b/core/src/main/java/binnie/core/gui/window/Panel.java @@ -8,7 +8,7 @@ import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.MinecraftGUI; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class Panel extends Control { IPanelType type; diff --git a/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java index fe4207f0..4bde488a 100644 --- a/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -57,7 +57,7 @@ import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.gui.minecraft.control.ControlSlotArray; import binnie.core.gui.minecraft.control.ControlTabIcon; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.gui.window.Panel; import binnie.core.machines.Machine; import binnie.core.machines.transfer.TransferRequest; diff --git a/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 2a444cbd..c3dca2fa 100644 --- a/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -27,9 +27,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.Constants; -import binnie.core.gui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.gui.resource.stylesheet.StyleSheetManager; import binnie.core.models.ModelManager; -import binnie.core.resource.BinnieResource; @SideOnly(Side.CLIENT) public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { @@ -140,7 +139,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy public void preInit() { final IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); if (manager instanceof IReloadableResourceManager) { - ((IReloadableResourceManager) manager).registerReloadListener(new CraftGUIResourceManager()); + ((IReloadableResourceManager) manager).registerReloadListener(new StyleSheetManager()); } } } diff --git a/core/src/main/resources/assets/binniecore/gui/punnett_stylesheet.json b/core/src/main/resources/assets/binniecore/gui/punnett_stylesheet.json index 4804618a..e67aee4b 100644 --- a/core/src/main/resources/assets/binniecore/gui/punnett_stylesheet.json +++ b/core/src/main/resources/assets/binniecore/gui/punnett_stylesheet.json @@ -1,6 +1,5 @@ { "name": "punnett", - "author": "Binnie", "texture-sheets": [ { diff --git a/core/src/main/resources/assets/binniecore/gui/stylesheet.json b/core/src/main/resources/assets/binniecore/gui/stylesheet.json index fe42d9ec..43bb8490 100644 --- a/core/src/main/resources/assets/binniecore/gui/stylesheet.json +++ b/core/src/main/resources/assets/binniecore/gui/stylesheet.json @@ -1,7 +1,4 @@ { - "name": "default", - "author": "Binnie", - "texture-sheets": [ { "name": "controls", diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/BeeBreedingSystem.java b/extrabees/src/main/java/binnie/extrabees/genetics/BeeBreedingSystem.java index 06a8a579..7953bf73 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/BeeBreedingSystem.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/BeeBreedingSystem.java @@ -5,20 +5,10 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeSet; -import binnie.core.api.genetics.IFieldKitPlugin; -import binnie.core.api.gui.IPoint; -import binnie.core.api.gui.ITexture; -import binnie.core.genetics.BreedingSystem; -import binnie.core.genetics.ForestryAllele; -import binnie.core.genetics.Tolerance; -import binnie.core.genetics.VirtualBeeHousing; -import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.minecraft.StandardTexture; -import binnie.core.texture.BinnieCoreTexture; -import forestry.api.apiculture.BeeManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -34,6 +24,16 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; import binnie.core.Binnie; +import binnie.core.api.genetics.IFieldKitPlugin; +import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.ITexture; +import binnie.core.genetics.BreedingSystem; +import binnie.core.genetics.ForestryAllele; +import binnie.core.genetics.Tolerance; +import binnie.core.genetics.VirtualBeeHousing; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.resource.textures.StandardTexture; +import binnie.core.texture.BinnieCoreTexture; import binnie.core.util.I18N; public class BeeBreedingSystem extends BreedingSystem { diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/MothBreedingSystem.java b/extratrees/src/main/java/binnie/extratrees/genetics/MothBreedingSystem.java index 702b0066..5a7928cb 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/MothBreedingSystem.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/MothBreedingSystem.java @@ -11,7 +11,7 @@ import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.genetics.Tolerance; import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.texture.BinnieCoreTexture; import forestry.api.lepidopterology.ButterflyManager; import net.minecraft.entity.player.EntityPlayer; diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/TreeBreedingSystem.java b/extratrees/src/main/java/binnie/extratrees/genetics/TreeBreedingSystem.java index ae85db42..467ea733 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/TreeBreedingSystem.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/TreeBreedingSystem.java @@ -16,7 +16,7 @@ import binnie.core.api.gui.ITexture; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.texture.BinnieCoreTexture; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java index dd158910..35865bf8 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java @@ -10,8 +10,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; import binnie.core.gui.geometry.Area; import binnie.core.api.gui.Alignment; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 5ccdd59a..8eae79cb 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -18,7 +18,7 @@ import binnie.core.gui.events.EventWidget; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlSlotFluid extends Control implements ITooltip { ControlFluidDisplay itemDisplay; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java index 0f11c265..37eb6f09 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java @@ -19,8 +19,8 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlProgressBase; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.machines.Machine; import binnie.core.util.ItemStackSet; import binnie.extratrees.core.ExtraTreeTexture; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java index 338825ca..ecdbbd20 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java @@ -27,7 +27,7 @@ import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.machines.TileEntityMachine; import binnie.core.util.I18N; import binnie.extratrees.api.CarpentryManager; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java index 880400ec..37a54070 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java @@ -17,8 +17,8 @@ import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlProgressBase; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.machines.Machine; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.distillery.DistilleryLogic; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java index 7c57b7e8..cf68b5f7 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java @@ -20,8 +20,8 @@ import binnie.core.gui.minecraft.ContainerCraftGUI; import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlProgressBase; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.fruitpress.FruitPressMachine; import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java index c0205933..578dc429 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java @@ -25,8 +25,8 @@ import binnie.core.gui.minecraft.MinecraftGUI; import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlProgressBase; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.gui.window.Panel; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.lumbermill.LumbermillMachine; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java index 60f4c714..11fa9adb 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java @@ -28,7 +28,7 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.minecraft.MinecraftGUI; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.gui.window.Panel; import binnie.core.util.I18N; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java index dc2e5fee..2e015ce0 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java @@ -10,7 +10,7 @@ import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.geometry.Area; import binnie.core.gui.minecraft.MinecraftGUI; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.gui.window.Panel; public class AnalystPanel extends Panel { diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java index cb782c89..46bdaa96 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java @@ -15,7 +15,7 @@ import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventMouse; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlAnalystButton extends Control { ControlAnalystPage value; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java index ca7aed21..f30d4795 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java @@ -17,8 +17,8 @@ import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; -import binnie.core.gui.resource.Texture; -import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.textures.Texture; +import binnie.core.gui.resource.textures.StandardTexture; import binnie.core.texture.BinnieCoreTexture; public class ControlAnalystChromosome extends Control implements ITooltip { diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java index 730b6c1c..145df58e 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java @@ -12,7 +12,7 @@ import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlSystemButton extends Control { IBreedingSystem system; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java index 614fc69f..51fe01d3 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java @@ -3,13 +3,13 @@ package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; -import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -21,7 +21,7 @@ import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlBiomes extends Control implements ITooltip { List tolerated; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java index 9346def5..2147f98a 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java @@ -3,11 +3,12 @@ package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; -import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.core.EnumHumidity; @@ -23,7 +24,7 @@ import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlClimateBar extends Control implements ITooltip { private final int[] TEMP_COLORS = new int[]{ diff --git a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index d2db3a92..9cd9a6c6 100644 --- a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java +++ b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -15,7 +15,7 @@ import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.renderer.RenderUtil; -import binnie.core.gui.resource.GeneticsGUITexture; +import binnie.core.gui.resource.textures.PunnettGUITexture; public class ControlChromosome extends Control implements IControlValue, ITooltip { private IChromosomeType value; @@ -39,9 +39,9 @@ public class ControlChromosome extends Control implements IControlValue