diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 9f8213ec..2e0b0e24 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -74,7 +74,6 @@ public final class Config { public static final Section sectionMobConfig = new Section("Mob Config", "mobconfig"); public static final Section sectionRailConfig = new Section("Rail", "railconfig"); public static final Section sectionEnchantments = new Section("Enchantments", "enchantments"); - public static final Section sectionWeather = new Section("Weather", "weather"); public static final Section sectionTelepad = new Section("Telepad", "telepad"); public static final Section sectionInventoryPanel = new Section("InventoryPanel", "inventorypanel"); public static final Section sectionMisc = new Section("Misc", "misc"); @@ -544,10 +543,6 @@ public final class Config { public static boolean spawnGuardStopAllSlimesDebug = false; public static boolean spawnGuardStopAllSquidSpawning = false; - public static int weatherObeliskClearFluid = 2000; - public static int weatherObeliskRainFluid = 500; - public static int weatherObeliskThunderFluid = 1000; - // Loot Defaults public static boolean lootDarkSteel = true; public static boolean lootItemConduitProbe = true; @@ -2746,22 +2741,6 @@ public final class Config { spawnGuardStopAllSquidSpawning, "When true no squid will be spawned."); - weatherObeliskClearFluid = config.get( - sectionWeather.name, - "weatherObeliskClearFluid", - weatherObeliskClearFluid, - "The fluid required (in mB) to set the world to clear weather").getInt(); - weatherObeliskRainFluid = config.get( - sectionWeather.name, - "weatherObeliskRainFluid", - weatherObeliskRainFluid, - "The fluid required (in mB) to set the world to rainy weather").getInt(); - weatherObeliskThunderFluid = config.get( - sectionWeather.name, - "weatherObeliskThunderFluid", - weatherObeliskThunderFluid, - "The fluid required (in mB) to set the world to thundering weather").getInt(); - // Loot Config lootDarkSteel = config.getBoolean( "lootDarkSteel", diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java index 7e63fb78..4f835ce0 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java @@ -31,6 +31,11 @@ public class BlockWeatherObelisk extends BlockObeliskAbstract { private IconButton buttonStart; + private ToggleButton buttonMode; public GuiWeatherObelisk(InventoryPlayer inventory, TileWeatherObelisk tileEntity) { super(tileEntity, new ContainerWeatherObelisk(inventory, tileEntity), "weatherObelisk"); @@ -50,10 +52,23 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase public void initGui() { super.initGui(); - int x = (xSize / 2) - (BUTTON_SIZE / 2); + int x_mode = xSize - 5 - BUTTON_SIZE; + int x_start = (xSize / 2) - (BUTTON_SIZE / 2); int y = 58; - addButton(buttonStart = new IconButton(this, 0, x, y, IconEIO.TICK)); + buttonMode = new ToggleButton(this, 1, x_mode, y, IconEIO.TICK, IconEIO.REDSTONE_MODE_WITH_SIGNAL); + + buttonMode.setToolTip(EnderIO.lang.localize("gui.machine.weather.control")); + buttonMode.setSelectedToolTip(EnderIO.lang.localize("gui.machine.weather.redstone")); + buttonMode.setUnselectedToolTip(EnderIO.lang.localize("gui.machine.weather.manual")); + buttonMode.setSelected(getTileEntity().getLaunchOnRedstone()); + addButton(buttonMode); + buttonMode.onGuiInit(); + + buttonStart = new IconButton(this, 0, x_start, y, IconEIO.MINUS); + buttonStart.setToolTip(EnderIO.lang.localize("gui.machine.weather.run")); + + addButton(buttonStart); buttonStart.onGuiInit(); refreshButtons(); @@ -68,13 +83,34 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase } private void refreshButtons() { - FluidStack fs = getTileEntity().getInputTank().getFluid(); - if (fs == null) { + boolean pulseControl = getTileEntity().getLaunchOnRedstone(); + pulseControlAction(pulseControl); + + WeatherTask task = getCurrentTask(); + if (task == null) { + buttonStart.setIcon(IconEIO.MINUS); buttonStart.enabled = false; return; } - WeatherTask task = WeatherTask.fromFluid(fs.getFluid()); - buttonStart.enabled = getTileEntity().canStartTask(task); + switch (task) { + case CLEAR: + buttonStart.setIcon(IconEIO.SUN); + break; + case RAIN: + buttonStart.setIcon(IconEIO.RAIN); + break; + case STORM: + buttonStart.setIcon(IconEIO.THUNDER); + break; + } + } + + protected WeatherTask getCurrentTask() { + FluidStack fs = getTileEntity().getInputTank().getFluid(); + if (fs == null) { + return null; + } + return WeatherTask.fromFluid(fs.getFluid()); } @Override @@ -143,9 +179,23 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase @Override protected void actionPerformed(GuiButton b) { super.actionPerformed(b); - if (b.id >= 0 && b.id <= 2) { + if (b.id == 0) { + // Start Button getTileEntity().startTask(); - PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity())); + PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity(), true)); + buttonStart.setEnabled(false); + } else if (b.id == 1) { + // Control Mode Button + boolean pulseControl = buttonMode.isSelected(); + getTileEntity().setLaunchOnRedstone(pulseControl); + pulseControlAction(pulseControl); + PacketControlModeWeather packet = new PacketControlModeWeather(getTileEntity()); + PacketHandler.INSTANCE.sendToServer(packet); } } + + protected void pulseControlAction(boolean pulseControl) { + redstoneButton.setVisible(!pulseControl); + buttonStart.setEnabled(!pulseControl && getTileEntity().canStartTask(getCurrentTask())); + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java index 0599d0ce..179497b7 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java @@ -7,14 +7,30 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.network.PacketUtil; +import io.netty.buffer.ByteBuf; public class PacketActivateWeather extends MessageTileEntity implements IMessageHandler { + private boolean start; + public PacketActivateWeather() {} - public PacketActivateWeather(TileWeatherObelisk te) { + public PacketActivateWeather(TileWeatherObelisk te, boolean start) { super(te); + this.start = start; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(start); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + start = buf.readBoolean(); } @Override @@ -24,6 +40,8 @@ public class PacketActivateWeather extends MessageTileEntity if (te != null) { if (ctx.side.isServer()) { if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + } + if (message.start) { te.startTask(); } else { te.stopTask(); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketControlModeWeather.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketControlModeWeather.java new file mode 100644 index 00000000..88f8b0dc --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketControlModeWeather.java @@ -0,0 +1,44 @@ +package crazypants.enderio.machine.obelisk.weather; + +import com.enderio.core.common.network.MessageTileEntity; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; +import io.netty.buffer.ByteBuf; + +public class PacketControlModeWeather extends MessageTileEntity + implements IMessageHandler { + + private boolean pulse; + + public PacketControlModeWeather() {} + + public PacketControlModeWeather(TileWeatherObelisk te) { + super(te); + this.pulse = te.getLaunchOnRedstone(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(pulse); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + pulse = buf.readBoolean(); + } + + @Override + public IMessage onMessage(PacketControlModeWeather message, MessageContext ctx) { + TileWeatherObelisk te = message.getTileEntity(message.getWorld(ctx)); + if (te != null) { + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + te.setLaunchOnRedstone(message.pulse); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java index 8d81ca8c..5a2590d2 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java @@ -24,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPowerConsumerEntity; +import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; @@ -100,6 +101,9 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity private boolean canBeActive = true; private boolean tanksDirty; + private boolean launchOnRedstone = false; + private int cooldown = 0; + private static final ICapacitor cap = Capacitors.BASIC_CAPACITOR.capacitor; private FluidTank inputTank = new FluidTank(8000); @@ -164,6 +168,9 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity @Override public void doUpdate() { super.doUpdate(); + if (cooldown > 0) { + cooldown--; + } if (worldObj.isRemote && isActive() && worldObj.getTotalWorldTime() % 2 == 0) { doLoadingParticles(); } @@ -228,14 +235,18 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity @Override protected boolean processTasks(boolean redstoneCheckPassed) { + if (cooldown > 0) { + return true; + } + boolean res = false; - if (!redstoneCheckPassed) { + if (!redstoneCheckPassed && !launchOnRedstone) { if (canBeActive) { canBeActive = false; - res = true; + return true; } - return res; + return false; } else { canBeActive = true; @@ -254,9 +265,13 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity EntityWeatherRocket e = new EntityWeatherRocket(worldObj, activeTask); e.setPosition(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); worldObj.spawnEntityInWorld(e); + cooldown = 200; stopTask(); res = true; } + } else if (launchOnRedstone && RedstoneControlMode.isConditionMet(RedstoneControlMode.ON, this)) { + startTask(); + res = true; } } @@ -277,31 +292,33 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity public boolean canStartTask(WeatherTask task) { return getActiveTask() == null && !WeatherTask.worldIsState(task, worldObj) && getStackInSlot(0) != null - && inputTank.getFluidAmount() >= 1000; + && inputTank.getFluidAmount() >= 1000 + && cooldown <= 0; } - /** - * @return If the operation was successful. - */ - public boolean startTask() { + public void startTask() { if (getActiveTask() == null && inputTank.getFluidAmount() > 0) { fluidUsed = 0; WeatherTask task = WeatherTask.fromFluid(inputTank.getFluid().getFluid()); if (canStartTask(task)) { + if (!worldObj.isRemote) { + PacketHandler.INSTANCE + .sendToDimension(new PacketActivateWeather(this, true), worldObj.provider.dimensionId); + } decrStackSize(0, 1); activeTask = task; - return true; } } - return false; } public void stopTask() { if (getActiveTask() != null) { activeTask = null; fluidUsed = 0; + cooldown = 200; if (!worldObj.isRemote) { - PacketHandler.INSTANCE.sendToDimension(new PacketActivateWeather(this), worldObj.provider.dimensionId); + PacketHandler.INSTANCE + .sendToDimension(new PacketActivateWeather(this, false), worldObj.provider.dimensionId); } else { playedFuse = false; } @@ -312,12 +329,14 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); nbtRoot.setTag("tank", inputTank.writeToNBT(new NBTTagCompound())); + nbtRoot.setBoolean("weatherobeliskcontrolmode", launchOnRedstone); } @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); inputTank.readFromNBT(nbtRoot.getCompoundTag("tank")); + launchOnRedstone = nbtRoot.getBoolean("weatherobeliskcontrolmode"); } private boolean isValidFluid(Fluid f) { @@ -382,4 +401,12 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity public FluidTankInfo[] getTankInfo(ForgeDirection from) { return new FluidTankInfo[] { inputTank.getInfo() }; } + + public void setLaunchOnRedstone(boolean launchOnRedstone) { + this.launchOnRedstone = launchOnRedstone; + } + + public boolean getLaunchOnRedstone() { + return this.launchOnRedstone; + } } diff --git a/src/main/resources/assets/enderio/lang/cs_CZ.lang b/src/main/resources/assets/enderio/lang/cs_CZ.lang index c77c460d..d1d35f3b 100644 --- a/src/main/resources/assets/enderio/lang/cs_CZ.lang +++ b/src/main/resources/assets/enderio/lang/cs_CZ.lang @@ -982,8 +982,11 @@ enderio.gui.void.mode.never.desc=Void slot does not accept items enderio.tile.blockPoweredSpawner.tooltip.none=None tile.blockWeatherObelisk.name=Weather Obelisk tile.blockWeatherObelisk.tooltip.detailed.line1=Changes the current weather -tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and -tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item +tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a firework rocket and 1000 L +tile.blockWeatherObelisk.tooltip.detailed.line3=of one of the following liquids: +tile.blockWeatherObelisk.tooltip.detailed.line4=Liquid Sunshine: Sun +tile.blockWeatherObelisk.tooltip.detailed.line5=Cloud Seed: Rain +tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder tile.blockBuffer.item.name=Item Buffer tile.blockBuffer.power.name=Power Buffer tile.blockBuffer.omni.name=Omni Buffer diff --git a/src/main/resources/assets/enderio/lang/de_DE.lang b/src/main/resources/assets/enderio/lang/de_DE.lang index 370e1862..590c047a 100644 --- a/src/main/resources/assets/enderio/lang/de_DE.lang +++ b/src/main/resources/assets/enderio/lang/de_DE.lang @@ -564,8 +564,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=anliegende Tanks abgeben. tile.blockWeatherObelisk.name=Wetterobelisk tile.blockWeatherObelisk.tooltip.detailed.line1=Ändere das derzeitige Wetter -tile.blockWeatherObelisk.tooltip.detailed.line2=Benötigt eine Menge an Energie -tile.blockWeatherObelisk.tooltip.detailed.line3=und ein Katalysator-Item tile.blockBuffer.item.name=Item-Puffer tile.blockBuffer.power.name=Energiepuffer diff --git a/src/main/resources/assets/enderio/lang/en_US.lang b/src/main/resources/assets/enderio/lang/en_US.lang index 861f0b05..c18ff702 100644 --- a/src/main/resources/assets/enderio/lang/en_US.lang +++ b/src/main/resources/assets/enderio/lang/en_US.lang @@ -642,8 +642,11 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=adjacent tanks tile.blockWeatherObelisk.name=Weather Obelisk tile.blockWeatherObelisk.tooltip.detailed.line1=Changes the current weather -tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and -tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item +tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a firework rocket and 1000 L +tile.blockWeatherObelisk.tooltip.detailed.line3=of one of the following liquids: +tile.blockWeatherObelisk.tooltip.detailed.line4=Liquid Sunshine: Sun +tile.blockWeatherObelisk.tooltip.detailed.line5=Cloud Seed: Rain +tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder tile.blockBuffer.name=Buffer tile.blockBuffer.item.name=Item Buffer @@ -1101,6 +1104,10 @@ enderio.gui.machine.side.west=West enderio.gui.machine.side.east=East enderio.gui.machine.side.up=Up enderio.gui.machine.side.down=Down +enderio.gui.machine.weather.control=Control Mode +enderio.gui.machine.weather.redstone=Launch on Redstone Signal +enderio.gui.machine.weather.manual=Launch Manually +enderio.gui.machine.weather.run=Launch #Power Monitor diff --git a/src/main/resources/assets/enderio/lang/es_AR.lang b/src/main/resources/assets/enderio/lang/es_AR.lang index 5a791d57..ebb7cdc0 100644 --- a/src/main/resources/assets/enderio/lang/es_AR.lang +++ b/src/main/resources/assets/enderio/lang/es_AR.lang @@ -425,7 +425,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line2=Puede extraer XP Líquida hac tile.blockWeatherObelisk.name=Obelisco del Clima tile.blockWeatherObelisk.tooltip.detailed.line1=Cambia el clima actual. -tile.blockWeatherObelisk.tooltip.detailed.line2=Requiere mucha energía y un objeto catalizador. tile.blockBuffer.item.name=Búfer de Objetos tile.blockBuffer.power.name=Búfer de Energía diff --git a/src/main/resources/assets/enderio/lang/es_ES.lang b/src/main/resources/assets/enderio/lang/es_ES.lang index 9c4e5018..06eead17 100644 --- a/src/main/resources/assets/enderio/lang/es_ES.lang +++ b/src/main/resources/assets/enderio/lang/es_ES.lang @@ -427,7 +427,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line2=Puede extraer XP Líquida hac tile.blockWeatherObelisk.name=Obelisco del Clima tile.blockWeatherObelisk.tooltip.detailed.line1=Cambia el clima actual. -tile.blockWeatherObelisk.tooltip.detailed.line2=Requiere mucha energía y un objeto catalizador. tile.blockBuffer.item.name=Búfer de Objetos tile.blockBuffer.power.name=Búfer de Energía diff --git a/src/main/resources/assets/enderio/lang/es_MX.lang b/src/main/resources/assets/enderio/lang/es_MX.lang index 5a791d57..ebb7cdc0 100644 --- a/src/main/resources/assets/enderio/lang/es_MX.lang +++ b/src/main/resources/assets/enderio/lang/es_MX.lang @@ -425,7 +425,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line2=Puede extraer XP Líquida hac tile.blockWeatherObelisk.name=Obelisco del Clima tile.blockWeatherObelisk.tooltip.detailed.line1=Cambia el clima actual. -tile.blockWeatherObelisk.tooltip.detailed.line2=Requiere mucha energía y un objeto catalizador. tile.blockBuffer.item.name=Búfer de Objetos tile.blockBuffer.power.name=Búfer de Energía diff --git a/src/main/resources/assets/enderio/lang/es_UY.lang b/src/main/resources/assets/enderio/lang/es_UY.lang index 5a791d57..ebb7cdc0 100644 --- a/src/main/resources/assets/enderio/lang/es_UY.lang +++ b/src/main/resources/assets/enderio/lang/es_UY.lang @@ -425,7 +425,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line2=Puede extraer XP Líquida hac tile.blockWeatherObelisk.name=Obelisco del Clima tile.blockWeatherObelisk.tooltip.detailed.line1=Cambia el clima actual. -tile.blockWeatherObelisk.tooltip.detailed.line2=Requiere mucha energía y un objeto catalizador. tile.blockBuffer.item.name=Búfer de Objetos tile.blockBuffer.power.name=Búfer de Energía diff --git a/src/main/resources/assets/enderio/lang/es_VE.lang b/src/main/resources/assets/enderio/lang/es_VE.lang index 6f73c73b..493157a8 100644 --- a/src/main/resources/assets/enderio/lang/es_VE.lang +++ b/src/main/resources/assets/enderio/lang/es_VE.lang @@ -425,7 +425,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line2=Puede extraer XP Líquida hac tile.blockWeatherObelisk.name=Obelisco del Clima tile.blockWeatherObelisk.tooltip.detailed.line1=Cambia el clima actual. -tile.blockWeatherObelisk.tooltip.detailed.line2=Requiere mucha energía y un objeto catalizador. tile.blockBuffer.item.name=Búfer de Objetos tile.blockBuffer.power.name=Búfer de Energía diff --git a/src/main/resources/assets/enderio/lang/fr_FR.lang b/src/main/resources/assets/enderio/lang/fr_FR.lang index 7f7c1cc5..afc5b786 100644 --- a/src/main/resources/assets/enderio/lang/fr_FR.lang +++ b/src/main/resources/assets/enderio/lang/fr_FR.lang @@ -464,8 +464,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=aux réservoirs adjacents tile.blockWeatherObelisk.name=Obélisque Météo tile.blockWeatherObelisk.tooltip.detailed.line1=Change la météo -tile.blockWeatherObelisk.tooltip.detailed.line2=Requiert beaucoup d'énergie et -tile.blockWeatherObelisk.tooltip.detailed.line3=un objet catalyste tile.blockBuffer.item.name=Stock Tampon d'objet tile.blockBuffer.power.name=Stock Tampon d'énergie diff --git a/src/main/resources/assets/enderio/lang/ru_RU.lang b/src/main/resources/assets/enderio/lang/ru_RU.lang index 5613f2e4..557d77e8 100644 --- a/src/main/resources/assets/enderio/lang/ru_RU.lang +++ b/src/main/resources/assets/enderio/lang/ru_RU.lang @@ -613,8 +613,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=присоединённым tile.blockWeatherObelisk.name=Погодный обелиск tile.blockWeatherObelisk.tooltip.detailed.line1=Изменяет текущую погоду -tile.blockWeatherObelisk.tooltip.detailed.line2=Требует много энергии и -tile.blockWeatherObelisk.tooltip.detailed.line3=предмет в качестве катализатора tile.blockBuffer.item.name=Предметный буфер tile.blockBuffer.power.name=Энергобуфер diff --git a/src/main/resources/assets/enderio/lang/zh_CN.lang b/src/main/resources/assets/enderio/lang/zh_CN.lang index f35d828a..71bcec79 100644 --- a/src/main/resources/assets/enderio/lang/zh_CN.lang +++ b/src/main/resources/assets/enderio/lang/zh_CN.lang @@ -613,8 +613,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=至相邻的储罐中 tile.blockWeatherObelisk.name=气象方尖碑 tile.blockWeatherObelisk.tooltip.detailed.line1=改变当前天气 -tile.blockWeatherObelisk.tooltip.detailed.line2=需要大量能量 -tile.blockWeatherObelisk.tooltip.detailed.line3=和催化物品 tile.blockBuffer.item.name=物品缓存器 tile.blockBuffer.power.name=能量缓存器 diff --git a/src/main/resources/assets/enderio/lang/zh_TW.lang b/src/main/resources/assets/enderio/lang/zh_TW.lang index dcbf435d..3beea2ed 100644 --- a/src/main/resources/assets/enderio/lang/zh_TW.lang +++ b/src/main/resources/assets/enderio/lang/zh_TW.lang @@ -1009,8 +1009,11 @@ enderio.gui.void.mode.never.desc=Void slot does not accept items enderio.tile.blockPoweredSpawner.tooltip.none=None tile.blockWeatherObelisk.name=Weather Obelisk tile.blockWeatherObelisk.tooltip.detailed.line1=Changes the current weather -tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and -tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item +tile.blockWeatherObelisk.tooltip.detailed.line2=Requires a firework rocket and 1000 L +tile.blockWeatherObelisk.tooltip.detailed.line3=of one of the following liquids: +tile.blockWeatherObelisk.tooltip.detailed.line4=Liquid Sunshine: Sun +tile.blockWeatherObelisk.tooltip.detailed.line5=Cloud Seed: Rain +tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder tile.blockBuffer.item.name=Item Buffer tile.blockBuffer.power.name=Power Buffer tile.blockBuffer.omni.name=Omni Buffer