diff --git a/src/main/java/binnie/botany/craftgui/PageColourMix.java b/src/main/java/binnie/botany/craftgui/PageColorMix.java similarity index 89% rename from src/main/java/binnie/botany/craftgui/PageColourMix.java rename to src/main/java/binnie/botany/craftgui/PageColorMix.java index a27d264c..7b568ba3 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMix.java @@ -13,11 +13,11 @@ import binnie.core.util.I18N; import java.util.ArrayList; import java.util.List; -public class PageColourMix extends PageAbstract { +public class PageColorMix extends PageAbstract { ControlText title; ControlColorMixBox list; - public PageColourMix(IWidget parent, DatabaseTab tab) { + public PageColorMix(IWidget parent, DatabaseTab tab) { super(parent, tab); title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageColorFurtherTitle")); list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further); diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 919f8586..a698a01c 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -47,7 +47,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.species")); createMode(FlowerMode.COLOR, new ColorModeWidget()); new PageColorMixResultant(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.resultant")); - new PageColourMix(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.further")); + new PageColorMix(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.further")); new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(Botany.instance, "breeder")); } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 70d1e727..3a023afd 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,7 +1,7 @@ package binnie.core; import binnie.Binnie; -import binnie.botany.items.ItemFieldKit; +import binnie.genetics.item.ItemFieldKit; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; import binnie.core.craftgui.minecraft.ModuleCraftGUI; diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 8dcd4bfa..e3c1d38b 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -3,7 +3,7 @@ package binnie.core.item; import binnie.botany.Botany; import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; -import binnie.botany.items.ItemFieldKit; +import binnie.genetics.item.ItemFieldKit; import binnie.botany.network.PacketID; import binnie.core.BinnieCore; import binnie.core.IInitializable; diff --git a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java index a3f18f1d..6021c7f5 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java @@ -24,8 +24,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; public class WindowGenepool extends WindowMachine { - static Texture ProgressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); - static Texture Progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); + static Texture progressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); + static Texture progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); public WindowGenepool(EntityPlayer player, IInventory inventory, Side side) { super(280, 198, player, inventory, side); @@ -40,15 +40,20 @@ public class WindowGenepool extends WindowMachine { super.initialiseClient(); int x = 16; int y = 32; - new ControlLiquidTank(this, x, y).setTankID(1); + new ControlLiquidTank(this, x, y).setTankID(Genepool.TANK_ETHANOL); + x += 26; new ControlSlotArray(this, x, y + 3, 2, 3).create(Genepool.SLOT_RESERVE); + x += 38; - new ControlIconDisplay(this, x, y + 3 + 18 + 1, GUIIcon.ArrowRight.getIcon()); + new ControlIconDisplay(this, x, y + 22, GUIIcon.ArrowRight.getIcon()); + x += 18; - new ControlSlot(this, x, y + 3 + 18).assign(0); + new ControlSlot(this, x, y + 21).assign(Genepool.SLOT_BEE); + x += 18; - new ControlMachineProgress(this, x, y + 19, WindowGenepool.ProgressBase, WindowGenepool.Progress, Position.LEFT); + new ControlMachineProgress(this, x, y + 19, progressBase, progress, Position.LEFT); + x += 130; new ControlLiquidTank(this, x, y).setTankID(Genepool.TANK_DNA); new ControlEnergyBar(this, 21, 115, 16, 60, Position.BOTTOM); diff --git a/src/main/java/binnie/botany/items/ItemFieldKit.java b/src/main/java/binnie/genetics/item/ItemFieldKit.java similarity index 82% rename from src/main/java/binnie/botany/items/ItemFieldKit.java rename to src/main/java/binnie/genetics/item/ItemFieldKit.java index 2a345871..869533c3 100644 --- a/src/main/java/binnie/botany/items/ItemFieldKit.java +++ b/src/main/java/binnie/genetics/item/ItemFieldKit.java @@ -1,10 +1,10 @@ -package binnie.botany.items; +package binnie.genetics.item; import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; import binnie.core.util.I18N; +import binnie.genetics.GeneticsCreativeTab; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,7 +24,7 @@ public class ItemFieldKit extends Item { public ItemFieldKit() { setUnlocalizedName("fieldKit"); - setCreativeTab(CreativeTabBotany.instance); + setCreativeTab(GeneticsCreativeTab.instance); setMaxStackSize(1); setMaxDamage(64); } @@ -67,12 +67,12 @@ public class ItemFieldKit extends Item { public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { int i = getMaxDamage() - itemStack.getItemDamage(); if (i == 0) { - tooltip.add(I18N.localise("botany.item.fieldKit.tooltip.noPaper")); + tooltip.add(I18N.localise("genetics.item.fieldKit.tooltip.noPaper")); } else { if (i > 1) { - tooltip.add(I18N.localise("botany.item.fieldKit.tooltip.sheetsOfPaper", i)); + tooltip.add(I18N.localise("genetics.item.fieldKit.tooltip.sheetsOfPaper", i)); } else { - tooltip.add(I18N.localise("botany.item.fieldKit.tooltip.sheetOfPaper", i)); + tooltip.add(I18N.localise("genetics.item.fieldKit.tooltip.sheetOfPaper", i)); } } super.addInformation(itemStack, player, tooltip, advanced); @@ -80,6 +80,6 @@ public class ItemFieldKit extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return I18N.localise("botany.item.fieldKit.name"); + return I18N.localise("genetics.item.fieldKit.name"); } } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java index 669672d3..c4a4a366 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java @@ -25,36 +25,38 @@ public class GenepoolComponentFX extends MachineComponent implements IRender.Ran @SideOnly(Side.CLIENT) @Override public void onDisplayTick(World world, int x, int y, int z, Random rand) { - if (rand.nextFloat() < 1.0f && getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new EntityFX(world, x + 0.3 + rand.nextDouble() * 0.4, y + 1, z + 0.3 + rand.nextDouble() * 0.4, 0.0, 0.0, 0.0) { - double axisX = posX; - double axisZ = posZ; - double angle = rand.nextDouble() * 2.0 * 3.1415; - - { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; - motionX = 0.0; - motionZ = 0.0; - motionY = rand.nextFloat() * 0.01; - particleMaxAge = 25; - particleGravity = 0.0f; - noClip = true; - setRBGColorF(0.4f + 0.6f * rand.nextFloat(), 0.6f * rand.nextFloat(), 0.6f + 0.4f * rand.nextFloat()); - } - - @Override - public void onUpdate() { - super.onUpdate(); - setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); - } - - @Override - public int getFXLayer() { - return 0; - } - }); + if (rand.nextFloat() >= 1.0f || !getUtil().getProcess().isInProgress()) { + return; } + + BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new EntityFX(world, x + 0.3 + rand.nextDouble() * 0.4, y + 1, z + 0.3 + rand.nextDouble() * 0.4, 0.0, 0.0, 0.0) { + double axisX = posX; + double axisZ = posZ; + double angle = rand.nextDouble() * 2.0 * 3.1415; + + { + axisX = 0.0; + axisZ = 0.0; + angle = 0.0; + motionX = 0.0; + motionZ = 0.0; + motionY = rand.nextFloat() * 0.01; + particleMaxAge = 25; + particleGravity = 0.0f; + noClip = true; + setRBGColorF(0.4f + 0.6f * rand.nextFloat(), 0.6f * rand.nextFloat(), 0.6f + 0.4f * rand.nextFloat()); + } + + @Override + public void onUpdate() { + super.onUpdate(); + setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); + } + + @Override + public int getFXLayer() { + return 0; + } + }); } } diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index ca31b340..06ef5533 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -158,10 +158,6 @@ botany.item.tooltip.fertility=Fertility: %dx botany.item.tooltip.flowerColor1=%1$s, %2$s Stem botany.item.tooltip.flowerColor2=%1$s and %2$s, %3$s Stem -botany.item.fieldKit.tooltip.noPaper=No paper -botany.item.fieldKit.tooltip.sheetsOfPaper=%d sheets of paper -botany.item.fieldKit.tooltip.sheetOfPaper=%d sheet of paper - botany.item.soilMeter.name=Soil Meter botany.item.pigment.name=Pigment botany.item.clay.name=Clay @@ -171,7 +167,6 @@ botany.item.germling.tag.name=Germling botany.item.flowerCorrupted.name=Corrupted Flower botany.item.database.0.name=Botanist Database botany.item.database.1.name=Master Botanist Database -botany.item.fieldKit.name=Field Kit botany.item.powderAsh.name=Ash Powder botany.item.powderPulp.name=Pulp Powder botany.item.powderMulch.name=Mulch Powder diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index cdf2e929..b3ae080b 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -158,10 +158,6 @@ botany.item.tooltip.fertility=Плодовитость: %dx botany.item.tooltip.flowerColor1=%1$s, %2$s стебель botany.item.tooltip.flowerColor2=%1$s и %2$s, %3$s стебель -botany.item.fieldKit.tooltip.noPaper=Отсутствует бумага -botany.item.fieldKit.tooltip.sheetsOfPaper=%d бумаги -botany.item.fieldKit.tooltip.sheetOfPaper=%d бумага - botany.item.soilMeter.name=Почвомер botany.item.pigment.name=Краситель botany.item.clay.name=Глиняный порошок @@ -171,7 +167,6 @@ botany.item.germling.tag.name=Росток цветка botany.item.flowerCorrupted.name=Поврежденный цветок botany.item.database.0.name=База данных ботаника botany.item.database.1.name=База данных мастера-ботаника -botany.item.fieldKit.name=Полевая лаборатория botany.item.powderAsh.name=Измельченная зола botany.item.powderPulp.name=Измельченная древесная масса botany.item.powderMulch.name=Измельченная мульча diff --git a/src/main/resources/assets/botany/lang/zh_CN.lang b/src/main/resources/assets/botany/lang/zh_CN.lang index efb0a63a..7c174f6b 100644 --- a/src/main/resources/assets/botany/lang/zh_CN.lang +++ b/src/main/resources/assets/botany/lang/zh_CN.lang @@ -158,10 +158,6 @@ botany.item.tooltip.fertility=Fertility: %dx botany.item.tooltip.flowerColor1=花茎:%1$s、%2$s botany.item.tooltip.flowerColor2=花茎:%1$s、%2$s和%3$s -botany.item.fieldKit.tooltip.noPaper=没有纸 -botany.item.fieldKit.tooltip.sheetsOfPaper=%d 张纸 -botany.item.fieldKit.tooltip.sheetOfPaper=%d 张纸 - botany.item.soilMeter.name=土壤检测计 botany.item.pigment.name=颜料 botany.item.clay.name=粘土 @@ -171,7 +167,6 @@ botany.item.germling.tag.name=Germling botany.item.flowerCorrupted.name=腐烂的花 botany.item.database.0.name=园丁数据库 botany.item.database.1.name=园艺大师数据库 -botany.item.fieldKit.name=实地考察工具包 botany.item.powderAsh.name=灰烬粉 botany.item.powderPulp.name=Pulp Powder botany.item.powderMulch.name=覆盖戍粉 diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index dc6bcf96..661f3f44 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -4,6 +4,11 @@ fluid.binnie.growthMedium=Growth Medium fluid.binnie.bacteriaPoly=Polymerizing Bacteria fluid.binnie.bacteriaVector=Bacteria Vector +genetics.item.fieldKit.name=Field Kit +genetics.item.fieldKit.tooltip.noPaper=No paper +genetics.item.fieldKit.tooltip.sheetsOfPaper=%d sheets of paper +genetics.item.fieldKit.tooltip.sheetOfPaper=%d sheet of paper + genetics.item.casingIron.name=Reinforced Casing genetics.item.dnaDye.name=DNA Dye genetics.item.dyeFluor.name=Fluorescent Dye diff --git a/src/main/resources/assets/genetics/lang/ru_RU.lang b/src/main/resources/assets/genetics/lang/ru_RU.lang index 9ba69444..24d77fd0 100644 --- a/src/main/resources/assets/genetics/lang/ru_RU.lang +++ b/src/main/resources/assets/genetics/lang/ru_RU.lang @@ -1,9 +1,14 @@ fluid.binnie.dna.raw=Сырая ДНК fluid.binnie.bacteria=Бактерия -fluid.binnie.bacteriaPoly=Полимеризированная бактерия fluid.binnie.growthMedium=Питательная среда +fluid.binnie.bacteriaPoly=Полимеризированная бактерия fluid.binnie.bacteriaVector=Бактерия Вектор +genetics.item.fieldKit.name=Полевая лаборатория +genetics.item.fieldKit.tooltip.noPaper=Отсутствует бумага +genetics.item.fieldKit.tooltip.sheetsOfPaper=%d бумаги +genetics.item.fieldKit.tooltip.sheetOfPaper=%d бумага + genetics.item.casingIron.name=Укреплённый корпус genetics.item.dnaDye.name=Краситель ДНК genetics.item.dyeFluor.name=Флюорофор diff --git a/src/main/resources/assets/genetics/lang/zh_CN.lang b/src/main/resources/assets/genetics/lang/zh_CN.lang index 23f25cb7..75406dd3 100644 --- a/src/main/resources/assets/genetics/lang/zh_CN.lang +++ b/src/main/resources/assets/genetics/lang/zh_CN.lang @@ -4,6 +4,11 @@ fluid.binnie.growthMedium=培养基 fluid.binnie.bacteriaPoly=聚合菌 fluid.binnie.bacteriaVector=细菌质粒 +genetics.item.fieldKit.name=实地考察工具包 +genetics.item.fieldKit.tooltip.noPaper=没有纸 +genetics.item.fieldKit.tooltip.sheetsOfPaper=%d 张纸 +genetics.item.fieldKit.tooltip.sheetOfPaper=%d 张纸 + genetics.item.casingIron.name=强化外壳 genetics.item.dnaDye.name=DNA 标记染料 genetics.item.dyeFluor.name=荧光染料