Clean Up StyleSheets

This commit is contained in:
Nedelosk committed 2017-08-13 17:11:03 +02:00
1 parent 7ede85dfb8
commit 868cedbf6f
81 files changed
+345 -332

No files matched your search

@@ -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 {
@@ -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 {
@@ -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;
}
@@ -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<Boolean> {
private boolean value;
@@ -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<String> {
@@ -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
@@ -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<T> extends Control implements IControlValue<T> {
private T value;
@@ -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;
@@ -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<T> extends Control implements ITooltip, IControlValue<T> {
protected T value;
@@ -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);
@@ -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 {
@@ -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;
@@ -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);
@@ -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 {
@@ -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);
@@ -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;
@@ -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 {
@@ -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) {
@@ -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;
@@ -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;
@@ -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;
@@ -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) {
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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);
}
@@ -1,6 +0,0 @@
package binnie.core.gui.resource;
public enum GeneticsGUITexture {
CHROMOSOME,
CHROMOSOME_OVERLAY
}
@@ -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);
}
@@ -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<Object, Texture> 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);
}
}
@@ -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());
}
}
}
@@ -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));
}
}
@@ -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);
}
@@ -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;
}
@@ -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<Object, Texture> textures;
public StyleSheet() {
this.textures = new HashMap<>();
}
public StyleSheet(Map<String, Texture> 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());
}
}
@@ -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<String, StyleSheet> sheets;
private static Map<String, ResourceLocation> 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<String, ResourceLocation> 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);
}
}
@@ -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<String, ParsedTextureSheet> textureSheets;
private Map<String, Texture> 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<String, ParsedTextureSheet> textureSheets = parseTextureSheets(jsonObject);
Map<String, Texture> 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<String, ParsedTextureSheet> parseTextureSheets(JsonObject jsonObject){
JsonArray textureSheetsArray = JsonUtils.getJsonArray(jsonObject, SHEETS_KEY);
if(textureSheetsArray == null){
return Collections.emptyMap();
}
for (JsonElement element : textureSheets) {
Map<String, ParsedTextureSheet> 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<String, Texture> parseTextures(JsonObject jsonObject, Map<String, ParsedTextureSheet> textureSheets){
JsonArray texturesJson = JsonUtils.getJsonArray(jsonObject, TEXTURES_KEY);
if(texturesJson == null){
return Collections.emptyMap();
}
for (JsonElement element : textures) {
Map<String, Texture> 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);
}
}
@@ -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;
@@ -1,4 +1,4 @@
package binnie.core.gui.resource.minecraft;
package binnie.core.gui.resource.textures;
public enum CraftGUITexture {
WINDOW("window"),
@@ -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;
}
@@ -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 {
@@ -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;
}
}
@@ -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 {
@@ -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 {
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.gui.resource.minecraft;
package binnie.core.gui.resource.textures;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -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;
@@ -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;
@@ -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());
}
}
}
@@ -1,6 +1,5 @@
{
"name": "punnett",
"author": "Binnie",
"texture-sheets": [
{
@@ -1,7 +1,4 @@
{
"name": "default",
"author": "Binnie",
"texture-sheets": [
{
"name": "controls",
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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 {
@@ -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;
@@ -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<Integer> tolerated;
@@ -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[]{
@@ -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<IChromosomeType>, ITooltip {
private IChromosomeType value;
@@ -39,9 +39,9 @@ public class ControlChromosome extends Control implements IControlValue<IChromos
@Override
@SideOnly(Side.CLIENT)
public void onRenderBackground(int guiWidth, int guiHeight) {
CraftGUI.RENDER.texture(GeneticsGUITexture.CHROMOSOME, getArea());
CraftGUI.RENDER.texture(PunnettGUITexture.CHROMOSOME, getArea());
RenderUtil.setColour(16711680);
CraftGUI.RENDER.texture(GeneticsGUITexture.CHROMOSOME_OVERLAY, getArea());
CraftGUI.RENDER.texture(PunnettGUITexture.CHROMOSOME_OVERLAY, getArea());
}
@Override
@@ -12,14 +12,11 @@ import forestry.api.genetics.ISpeciesRoot;
import binnie.core.AbstractMod;
import binnie.core.Binnie;
import binnie.core.Constants;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.minecraft.Window;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.resource.GeneticsGUITexture;
import binnie.core.gui.resource.StyleSheet;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.resource.minecraft.PaddedTexture;
import binnie.core.gui.resource.minecraft.StandardTexture;
import binnie.core.gui.resource.stylesheet.StyleSheetManager;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.IBinnieTexture;
import binnie.core.resource.ResourceType;
@@ -57,16 +54,7 @@ public class WindowPunnettSquare extends Window {
@SideOnly(Side.CLIENT)
public void initialiseClient() {
setTitle("Punnett Square");
CraftGUI.RENDER.setStyleSheet(new StyleSheetPunnett());
}
static class StyleSheetPunnett extends StyleSheet {
public StyleSheetPunnett() {
textures.put(CraftGUITexture.WINDOW, new PaddedTexture(0, 0, 160, 160, 0, texture, 32, 32, 32, 32));
textures.put(CraftGUITexture.SLOT, new StandardTexture(160, 0, 18, 18, 0, texture));
textures.put(GeneticsGUITexture.CHROMOSOME, new StandardTexture(160, 36, 16, 16, 0, texture));
textures.put(GeneticsGUITexture.CHROMOSOME_OVERLAY, new StandardTexture(160, 52, 16, 16, 0, texture));
}
CraftGUI.RENDER.setStyleSheet(StyleSheetManager.getSheet(StyleSheetManager.PUNNETT_SHEET));
}
private static class GuiTexture implements IBinnieTexture {
@@ -79,7 +67,7 @@ public class WindowPunnettSquare extends Window {
@SideOnly(Side.CLIENT)
public BinnieResource getTexture() {
if (resource == null) {
resource = Binnie.RESOURCE.getPNG("binniecore", ResourceType.GUI, "punnett");
resource = Binnie.RESOURCE.getPNG(Constants.CORE_MOD_ID, ResourceType.GUI, "punnett");
}
return resource;
}
@@ -14,8 +14,8 @@ import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlProgress;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;
@@ -18,8 +18,8 @@ import binnie.core.gui.minecraft.control.ControlProgress;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
import binnie.core.gui.minecraft.control.ControlSlotCharge;
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.core.util.I18N;
import binnie.genetics.Genetics;
@@ -18,8 +18,8 @@ import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
import binnie.core.gui.minecraft.control.ControlSlotCharge;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;
@@ -17,8 +17,8 @@ import binnie.core.gui.minecraft.control.ControlMachineProgress;
import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;
@@ -19,8 +19,8 @@ import binnie.core.gui.minecraft.control.ControlMachineProgress;
import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;
@@ -18,8 +18,8 @@ import binnie.core.gui.minecraft.control.ControlProgress;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
import binnie.core.gui.minecraft.control.ControlSlotCharge;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;
@@ -18,8 +18,8 @@ import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
import binnie.core.gui.minecraft.control.ControlSlotCharge;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;
@@ -22,8 +22,8 @@ import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
import binnie.core.gui.minecraft.control.ControlSlotCharge;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;
@@ -17,8 +17,8 @@ import binnie.core.gui.minecraft.control.ControlIconDisplay;
import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.minecraft.control.ControlSlotArray;
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.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsTexture;