Added some localization

This commit is contained in:
kordum committed 2017-06-11 10:55:57 +03:00
1 parent 1d3b4b7572
commit 493ef4fdf9
29 files changed
+103 -472

No files matched your search

@@ -69,7 +69,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
if (icon.hasOutline()) {
iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
iTexture = iTexture.crop(position, 8.0f);
CraftGUI.Render.colour(icon.getOutlineColour());
CraftGUI.Render.color(icon.getOutlineColour());
CraftGUI.Render.texture(iTexture, area.inset(2));
}
}
@@ -28,7 +28,7 @@ class ControlBreedingProgress extends Control {
CraftGUI.Render.texture(CraftGUITexture.PanelBlack, getArea());
IArea area = getArea().inset(1);
area.setSize(new IPoint(area.size().x() * percentage, area.size().y()));
CraftGUI.Render.colour(colour);
CraftGUI.Render.color(colour);
CraftGUI.Render.texture(ControlBreedingProgress.Progress, area);
}
}
@@ -392,7 +392,7 @@ public class GuiCraftGUI extends GuiContainer {
GL11.glEnable(3042);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
RenderHelper.disableStandardItemLighting();
CraftGUI.Render.colour(-1);
CraftGUI.Render.color(-1);
GL11.glEnable(32826);
GL11.glPopMatrix();
}
@@ -211,14 +211,14 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(0xffffff);
CraftGUI.Render.color(0xffffff);
if (getBackground1() != null) {
CraftGUI.Render.texture(getBackground1(), IPoint.ZERO);
}
if (getBackground2() != null) {
CraftGUI.Render.texture(getBackground2(), new IPoint(256.0f, 0.0f));
}
CraftGUI.Render.colour(getColor());
CraftGUI.Render.color(getColor());
CraftGUI.Render.texture(CraftGUITexture.Window, getArea());
}
@@ -87,7 +87,7 @@ public class ControlEnergyBar extends Control implements ITooltip {
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.EnergyBarBack, getArea());
float percentage = getPercentage() / 100.0f;
CraftGUI.Render.colour(getColourFromPercentage(percentage));
CraftGUI.Render.color(getColourFromPercentage(percentage));
IArea area = getArea();
switch (direction) {
@@ -121,11 +121,11 @@ public class ControlEnergyBar extends Control implements ITooltip {
public void onRenderForeground() {
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
} else if (ControlEnergyBar.isError) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -125,13 +125,13 @@ public class ControlLiquidTank extends Control implements ITooltip {
CraftGUI.Render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO);
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
if (ControlLiquidTank.tankError.contains(tankID)) {
IArea area = getArea();
CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -123,7 +123,7 @@ public class ControlSlot extends ControlSlotBase {
area = getParent().getArea();
area.setPosition(IPoint.ZERO.sub(getPosition()));
}
CraftGUI.Render.colour(c);
CraftGUI.Render.color(c);
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -30,7 +30,7 @@ public class Renderer {
public void preRender(IWidget widget) {
GL11.glPushMatrix();
GL11.glTranslatef(widget.getPosition().x(), widget.getPosition().y(), 0.0f);
colour(widget.getColor());
color(widget.getColor());
if (widget.isCroppedWidet()) {
IWidget cropRelative = (widget.getCropWidget() != null) ? widget.getCropWidget() : widget;
IPoint pos = cropRelative.getAbsolutePosition();
@@ -50,7 +50,7 @@ public class Renderer {
GL11.glPopMatrix();
}
public void colour(int hex) {
public void color(int hex) {
currentColour = hex;
int a = (hex & 0xFF000000) >> 24;
int r = (hex & 0xFF0000) >> 16;
@@ -78,7 +78,7 @@ public class Renderer {
if (texture != currentTexture && texture != null) {
BinnieCore.proxy.bindTexture(texture.getFilename());
}
colour(currentColour);
color(currentColour);
}
public void texture(Object texture, IPoint position) {
@@ -159,7 +159,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
@Override
public void onRenderForeground() {
Texture iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
CraftGUI.Render.colour(getTab(panels.get(this)).getColor().getColour());
CraftGUI.Render.color(getTab(panels.get(this)).getColor().getColour());
CraftGUI.Render.texture(iTexture, getArea().inset(3));
}
};
@@ -321,7 +321,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
ControlScrollableContent<IWidget> scroll = new ControlScrollableContent<IWidget>(this, 124.0f, 16.0f, 116.0f, 92.0f, 6.0f) {
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(11184810);
CraftGUI.Render.color(11184810);
CraftGUI.Render.texture(CraftGUITexture.Outline, getArea().inset(new IBorder(0.0f, 6.0f, 0.0f, 0.0f)));
}
};
@@ -3,16 +3,17 @@ package binnie.extratrees.item;
import binnie.Binnie;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ILiquidType;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidStack;
public enum ExtraTreeLiquid implements ILiquidType {
Sap("Sap", "sap", 12481858),
Resin("Resin", "resin", 13199360),
Latex("Latex", "latex", 14212041),
Turpentine("Turpentine", "turpentine", 7951162);
Sap("sap", 0xbe7542),
Resin("resin", 0xc96800),
Latex("latex", 0xd8dbc9),
Turpentine("turpentine", 0x79533a);
public String name;
@@ -20,10 +21,9 @@ public enum ExtraTreeLiquid implements ILiquidType {
protected IIcon icon;
protected int color;
ExtraTreeLiquid(String name, String ident, int color) {
this.name = "";
ExtraTreeLiquid(String name, int color) {
this.name = name;
this.ident = ident;
this.ident = name;
this.color = color;
}
@@ -39,7 +39,7 @@ public enum ExtraTreeLiquid implements ILiquidType {
@Override
public String getName() {
return name;
return I18N.localise("extratrees.fluid." + name);
}
@Override
@@ -5,7 +5,6 @@ import binnie.core.Mods;
import binnie.core.item.IItemMisc;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.alcohol.Juice;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
@@ -172,17 +171,6 @@ public enum Food implements IItemMisc {
// ignored
}
// TODO unused method?
public void addJuice(Juice juice, int time, int amount, int mulch) {
RecipeManagers.squeezerManager.addRecipe(
time,
new ItemStack[]{get(1)},
Binnie.Liquid.getLiquidStack("juice", amount),
Mods.forestry.stack("mulch"),
mulch
);
}
public void addJuice(int time, int amount, int mulch) {
RecipeManagers.squeezerManager.addRecipe(
time,
@@ -1,5 +1,6 @@
package binnie.extratrees.item;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.core.ExtraTreesGUID;
import cpw.mods.fml.relauncher.Side;
@@ -39,10 +40,10 @@ public class ItemDictionary extends Item {
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
if (par1ItemStack.getItemDamage() > 0) {
par3List.add("Sengir-in-a-can");
public void addInformation(ItemStack stack, EntityPlayer player, List toltip, boolean advanced) {
super.addInformation(stack, player, toltip, advanced);
if (stack.getItemDamage() > 0) {
toltip.add(I18N.localise("extratrees.item.database.tooltip"));
}
}
@@ -66,7 +67,7 @@ public class ItemDictionary extends Item {
@Override
public String getItemStackDisplayName(ItemStack i) {
return (i.getItemDamage() == 0) ?
"Arborist Database" :
"Master Arborist Database";
I18N.localise("extratrees.item.database") :
I18N.localise("extratrees.item.masterDatabase");
}
}
@@ -1,5 +1,6 @@
package binnie.extratrees.item;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.core.ExtraTreesGUID;
import cpw.mods.fml.relauncher.Side;
@@ -42,7 +43,7 @@ public class ItemMothDatabase extends Item {
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add("Binnie's Emporium of Lepidopterans");
tooltip.add(I18N.localise("extratrees.item.mothDatabase.tooltip"));
}
}
@@ -66,7 +67,7 @@ public class ItemMothDatabase extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
return (stack.getItemDamage() == 0) ?
"Lepidopterist Database" :
"Master Lepidopterist Database";
I18N.localise("extratrees.item.mothDatabase") :
I18N.localise("extratrees.item.mothMasterDatabase");
}
}
@@ -1,51 +0,0 @@
package binnie.extratrees.item;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IToolHammer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
// TODO unused class?
public class ItemSetSquare extends Item implements IToolHammer {
EnumSetSquareMode mode;
public ItemSetSquare(EnumSetSquareMode mode) {
this.mode = EnumSetSquareMode.Rotate;
this.mode = mode;
setCreativeTab(CreativeTabs.tabTools);
setUnlocalizedName("setSquare" + mode);
setMaxStackSize(1);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = ExtraTrees.proxy.getIcon(register, "setSquare" + mode.ordinal());
}
@Override
public String getItemStackDisplayName(ItemStack i) {
return "Set Square";
}
@Override
public boolean isActive(ItemStack stack) {
return mode == EnumSetSquareMode.Rotate;
}
@Override
public void onHammerUsed(ItemStack stack, EntityPlayer player) {
// ignored
}
public enum EnumSetSquareMode {
Rotate,
Edit,
Swap
}
}
@@ -27,7 +27,6 @@ public enum ExtraTreeMachine implements IMachineType {
Lumbermill(LumbermillPackage.class),
Woodworker(WoodworkerPackage.class),
Panelworker(PanelworkerPackage.class),
Nursery(Nursery.PackageNursery.class),
Press(Press.PackagePress.class),
Brewery(Brewery.PackageBrewery.class),
Distillery(Distillery.PackageDistillery.class),
@@ -50,7 +49,7 @@ public enum ExtraTreeMachine implements IMachineType {
if (this == ExtraTreeMachine.Tileworker) {
return BinnieCore.isBotanyActive();
}
return this != ExtraTreeMachine.Nursery;
return true;
}
public ItemStack get(int i) {
@@ -1,31 +0,0 @@
package binnie.extratrees.machines;
import binnie.core.BinnieCore;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.ResourceType;
import binnie.extratrees.ExtraTrees;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
public class MachineRendererNursery {
public static MachineRendererNursery instance = new MachineRendererNursery();
protected BinnieResource texture;
private IModelCustom casinoMachine;
private ModelNursery model;
public MachineRendererNursery() {
model = new ModelNursery();
}
public void renderMachine(BinnieResource texture, double x, double y, double z, float var8) {
this.texture = texture;
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5, y, z + 0.5);
GL11.glScaled(0.05, 0.05, 0.05);
BinnieCore.proxy.bindTexture(new BinnieResource(ExtraTrees.instance, ResourceType.Tile, "test.png"));
casinoMachine.renderAll();
GL11.glPopMatrix();
}
}
@@ -1,142 +0,0 @@
package binnie.extratrees.machines;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelNursery extends ModelBase {
private ModelRenderer shape1;
private ModelRenderer shape2;
private ModelRenderer shape3;
private ModelRenderer shape4;
private ModelRenderer shape5;
private ModelRenderer shape6;
private ModelRenderer shape7;
private ModelRenderer shape8;
private ModelRenderer shape9;
private ModelRenderer shape10;
private ModelRenderer shape11;
private ModelRenderer shape12;
private ModelRenderer shape13;
public ModelNursery() {
textureWidth = 64;
textureHeight = 64;
shape1 = new ModelRenderer(this, 0, 0);
shape1.addBox(-5.0f, -5.0f, -5.0f, 10, 10, 10);
shape1.setRotationPoint(0.0f, 16.0f, 0.0f);
shape1.setTextureSize(64, 64);
shape1.mirror = true;
setRotation(shape1, 0.0f, 0.0f, 0.0f);
shape2 = new ModelRenderer(this, 0, 20);
shape2.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape2.setRotationPoint(-5.0f, 16.0f, -5.0f);
shape2.setTextureSize(64, 64);
shape2.mirror = true;
setRotation(shape2, 0.0f, 0.0f, 0.0f);
shape3 = new ModelRenderer(this, 0, 20);
shape3.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape3.setRotationPoint(-5.0f, 16.0f, 5.0f);
shape3.setTextureSize(64, 64);
shape3.mirror = true;
setRotation(shape3, 0.0f, 0.0f, 0.0f);
shape4 = new ModelRenderer(this, 0, 20);
shape4.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape4.setRotationPoint(5.0f, 16.0f, -5.0f);
shape4.setTextureSize(64, 64);
shape4.mirror = true;
setRotation(shape4, 0.0f, 0.0f, 0.0f);
shape5 = new ModelRenderer(this, 0, 20);
shape5.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape5.setRotationPoint(5.0f, 16.0f, 5.0f);
shape5.setTextureSize(64, 64);
shape5.mirror = true;
setRotation(shape5, 0.0f, 0.0f, 0.0f);
shape6 = new ModelRenderer(this, 0, 20);
shape6.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape6.setRotationPoint(5.0f, 21.0f, 0.0f);
shape6.setTextureSize(64, 64);
shape6.mirror = true;
setRotation(shape6, 1.570796f, 0.0f, 0.0f);
shape7 = new ModelRenderer(this, 0, 20);
shape7.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape7.setRotationPoint(5.0f, 11.0f, 0.0f);
shape7.setTextureSize(64, 64);
shape7.mirror = true;
setRotation(shape7, 1.570796f, 0.0f, 0.0f);
shape8 = new ModelRenderer(this, 0, 20);
shape8.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape8.setRotationPoint(-5.0f, 21.0f, 0.0f);
shape8.setTextureSize(64, 64);
shape8.mirror = true;
setRotation(shape8, 1.570796f, 0.0f, 0.0f);
shape9 = new ModelRenderer(this, 0, 20);
shape9.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape9.setRotationPoint(-5.0f, 11.0f, 0.0f);
shape9.setTextureSize(64, 64);
shape9.mirror = true;
setRotation(shape9, 1.570796f, 0.0f, 0.0f);
shape10 = new ModelRenderer(this, 0, 20);
shape10.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape10.setRotationPoint(0.0f, 11.0f, 5.0f);
shape10.setTextureSize(64, 64);
shape10.mirror = true;
setRotation(shape10, 0.0f, 0.0f, 1.570796f);
shape11 = new ModelRenderer(this, 0, 20);
shape11.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape11.setRotationPoint(0.0f, 21.0f, -5.0f);
shape11.setTextureSize(64, 64);
shape11.mirror = true;
setRotation(shape11, 0.0f, 0.0f, 1.570796f);
shape12 = new ModelRenderer(this, 0, 20);
shape12.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape12.setRotationPoint(0.0f, 21.0f, 5.0f);
shape12.setTextureSize(64, 64);
shape12.mirror = true;
setRotation(shape12, 0.0f, 0.0f, 1.570796f);
shape13 = new ModelRenderer(this, 0, 20);
shape13.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2);
shape13.setRotationPoint(0.0f, 11.0f, -5.0f);
shape13.setTextureSize(64, 64);
shape13.mirror = true;
setRotation(shape13, 0.0f, 0.0f, 1.570796f);
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
shape1.render(f5);
shape2.render(f5);
shape3.render(f5);
shape4.render(f5);
shape5.render(f5);
shape6.render(f5);
shape7.render(f5);
shape8.render(f5);
shape9.render(f5);
shape10.render(f5);
shape11.render(f5);
shape12.render(f5);
shape13.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}
@@ -1,6 +1,5 @@
package binnie.extratrees.machines;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.machines.MachineGroup;
@@ -19,7 +18,6 @@ public class ModuleMachine implements IInitializable {
MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values());
machineGroup.setCreativeTab(Tabs.tabArboriculture);
ExtraTrees.blockMachine = machineGroup.getBlock();
BinnieCore.proxy.registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
}
@Override
@@ -1,33 +0,0 @@
package binnie.extratrees.machines;
import binnie.core.machines.Machine;
import binnie.core.machines.inventory.ComponentInventorySlots;
import binnie.extratrees.core.ExtraTreeTexture;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity;
public class Nursery {
public static int slotCaterpillar = 0;
public static class PackageNursery extends ExtraTreeMachine.PackageExtraTreeMachine {
public PackageNursery() {
super("nursery", ExtraTreeTexture.Nursery.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(Nursery.slotCaterpillar, "caterpillar");
}
@Override
public TileEntity createTileEntity() {
return new TileEntityNursery(this);
}
@Override
public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
// ignored
}
}
}
@@ -1,115 +0,0 @@
package binnie.extratrees.machines;
import binnie.core.machines.TileEntityMachine;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IErrorState;
import forestry.api.genetics.IIndividual;
import forestry.api.lepidopterology.IButterfly;
import forestry.api.lepidopterology.IButterflyNursery;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import java.util.HashSet;
import java.util.Set;
public class TileEntityNursery extends TileEntityMachine implements IButterflyNursery {
public TileEntityNursery(Nursery.PackageNursery pack) {
super(pack);
}
IButterflyNursery getNursery() {
return getMachine().getInterface(IButterflyNursery.class);
}
boolean hasNursery() {
return getNursery() != null;
}
public World getWorld() {
return worldObj;
}
public int getXCoord() {
return xCoord;
}
public int getYCoord() {
return yCoord;
}
public int getZCoord() {
return zCoord;
}
public EnumTemperature getTemperature() {
return null;
}
public EnumHumidity getHumidity() {
return null;
}
public boolean addProduct(ItemStack product, boolean all) {
return false;
}
@Override
public IButterfly getCaterpillar() {
return hasNursery() ? getNursery().getCaterpillar() : null;
}
@Override
public void setCaterpillar(IButterfly butterfly) {
if (hasNursery()) {
getNursery().setCaterpillar(butterfly);
}
}
@Override
public IIndividual getNanny() {
return null;
}
@Override
public boolean canNurse(IButterfly butterfly) {
return getCaterpillar() == null;
}
public BiomeGenBase getBiome() {
return getWorld().getBiomeGenForCoords(xCoord, zCoord);
}
public void setErrorState(IErrorState state) {
}
public IErrorState getErrorState() {
return null;
}
public void setErrorState(int state) {
}
public boolean setErrorCondition(boolean condition, IErrorState errorState) {
return false;
}
public Set<IErrorState> getErrorStates() {
return new HashSet<>();
}
public int getBiomeId() {
return 0;
}
public int getErrorOrdinal() {
return 0;
}
@Override
public ChunkCoordinates getCoordinates() {
return new ChunkCoordinates(xCoord, yCoord, zCoord);
}
}
@@ -23,20 +23,7 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
protected ControlGene(IWidget parent, float x, float y) {
super(parent, x, y, 16.0f, 16.0f);
addAttribute(WidgetAttribute.MOUSE_OVER);
addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(EventMouse.Down event) {
if (!canFill(Window.get(getWidget()).getHeldItemStack())) {
return;
}
NBTTagCompound action = new NBTTagCompound();
NBTTagCompound geneNBT = new NBTTagCompound();
getValue().writeToNBT(geneNBT);
action.setTag("gene", geneNBT);
Window.get(getWidget()).sendClientAction("gene-select", action);
}
});
addSelfEventHandler(new MouseDownHandler());
}
@Override
@@ -84,7 +71,22 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
CraftGUI.Render.solid(getArea().inset(1), 0xff444444);
}
CraftGUI.Render.colour(-1);
CraftGUI.Render.color(0xffffffff);
CraftGUI.Render.iconItem(IPoint.ZERO, GeneticsTexture.dnaIcon.getIcon());
}
private class MouseDownHandler extends EventMouse.Down.Handler {
@Override
public void onEvent(EventMouse.Down event) {
if (!canFill(Window.get(getWidget()).getHeldItemStack())) {
return;
}
NBTTagCompound action = new NBTTagCompound();
NBTTagCompound geneNBT = new NBTTagCompound();
getValue().writeToNBT(geneNBT);
action.setTag("gene", geneNBT);
Window.get(getWidget()).sendClientAction("gene-select", action);
}
}
}
@@ -41,19 +41,19 @@ public class AnalystPageAppearance extends ControlAnalystPage {
float scale = w / 16.0f;
float dy = (sections > 1) ? 16.0f : 0.0f;
GL11.glScalef(scale, scale, 1.0f);
CraftGUI.Render.colour(ind.getGenome().getStemColor().getColor(false));
CraftGUI.Render.color(ind.getGenome().getStemColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 1));
}
CraftGUI.Render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.Render.colour(ind.getGenome().getPrimaryColor().getColor(false));
CraftGUI.Render.color(ind.getGenome().getPrimaryColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 1));
}
CraftGUI.Render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.Render.colour(ind.getGenome().getSecondaryColor().getColor(false));
CraftGUI.Render.color(ind.getGenome().getSecondaryColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 1));
}
@@ -63,9 +63,9 @@ public class AnalystPageDatabase extends ControlAnalystPage {
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(5592405);
CraftGUI.Render.color(5592405);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.Render.colour(AnalystPageDatabase.this.getColor());
CraftGUI.Render.color(AnalystPageDatabase.this.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
super.renderTextField();
}
@@ -143,12 +143,12 @@ public class AnalystPageDatabase extends ControlAnalystPage {
public void onRenderBackground() {
WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getSuperParent();
if (window.getIndividual() != null && window.getIndividual().getGenome().getPrimary() == species) {
CraftGUI.Render.colour(15658734);
CraftGUI.Render.color(15658734);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
CraftGUI.Render.colour(AnalystPageDatabase.this.getColor());
CraftGUI.Render.color(AnalystPageDatabase.this.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(1));
} else if (calculateIsMouseOver()) {
CraftGUI.Render.colour(15658734);
CraftGUI.Render.color(15658734);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
}
super.onRenderBackground();
@@ -135,12 +135,12 @@ public class AnalystPageMutations extends ControlAnalystPage {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(mutation.getAllele0().getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getAllele1().getUID()));
if (specificChance != mutation.getBaseChance()) {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd0.getIcon());
CraftGUI.Render.colour(getMutationColour(specificChance).getColour());
CraftGUI.Render.color(getMutationColour(specificChance).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd1.getIcon());
} else {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd.getIcon());
}
}
@@ -192,14 +192,14 @@ public class AnalystPageMutations extends ControlAnalystPage {
public void onRenderBackground() {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(speciesComb.getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getTemplate()[0].getUID()));
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
if (specificChance2 != mutation.getBaseChance()) {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow0.getIcon());
CraftGUI.Render.colour(getMutationColour(specificChance2).getColour());
CraftGUI.Render.color(getMutationColour(specificChance2).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow1.getIcon());
} else {
CraftGUI.Render.colour(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.color(getMutationColour(mutation.getBaseChance()).getColour());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow.getIcon());
}
}
@@ -142,11 +142,11 @@ public class WindowAnalyst extends Window {
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(syst.getColor());
CraftGUI.Render.color(syst.getColor());
int outset = (getSystem() == syst) ? 1 : 0;
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(outset));
if (getSystem() == syst) {
CraftGUI.Render.colour(1140850688 + syst.getColor());
CraftGUI.Render.color(1140850688 + syst.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(outset));
}
CraftGUI.Render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative());
@@ -179,7 +179,7 @@ public class WindowAnalyst extends Window {
if (getContent() == null) {
return;
}
CraftGUI.Render.colour(getContent().getColor());
CraftGUI.Render.color(getContent().getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
}
};
@@ -202,7 +202,7 @@ public class WindowAnalyst extends Window {
if (getContent() == null) {
return;
}
CraftGUI.Render.colour(getContent().getColor());
CraftGUI.Render.color(getContent().getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
}
};
@@ -343,9 +343,9 @@ public class WindowAnalyst extends Window {
@Override
public void onRenderBackground() {
boolean active = value == leftPage.getContent() || value == rightPage.getContent();
CraftGUI.Render.colour((active ? 0xff000000 : 0x44000000) + value.getColor());
CraftGUI.Render.color((active ? 0xff000000 : 0x44000000) + value.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.Render.colour(value.getColor());
CraftGUI.Render.color(value.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().inset(1));
super.onRenderBackground();
}