Merge remote-tracking branch 'dibbydoda/automatable-weather-obelisk' into dev

dependencies.gradle

@@ -4,18 +4,18 @@ dependencies {
     api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev')
     compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.40-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.21:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.6.20:dev")
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.13.23-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.13.21-GTNH:dev")
 
     compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-597-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-586-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.266:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.254:dev') {transitive = false}
     compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.7-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.23:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.21:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.13-GTNH:api') {transitive = false}
@@ -26,5 +26,5 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta41:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta40:api') {transitive = false}
 }

src/main/java/crazypants/enderio/config/Config.java

@@ -595,8 +595,6 @@ public final class Config {
 
     public static boolean strictTPItemChecking = true;
 
-    public static float fusedQuartzExplosionResistance = 2000.0f;
-
     public static void load(FMLPreInitializationEvent event) {
         PacketHandler.INSTANCE
                 .registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT);
@@ -2971,13 +2969,6 @@ public final class Config {
                 strictTPItemChecking,
                 "If true, turn on strict checking of item energy checking. This might cause traveling tools from third party mods to fire fake security warnings on server side and not function correctly.")
                 .getBoolean(strictTPItemChecking);
-        fusedQuartzExplosionResistance = config.getFloat(
-                "fusedQuartzExplosionResistance",
-                sectionMisc.name,
-                fusedQuartzExplosionResistance,
-                0.0f,
-                Float.MAX_VALUE,
-                "How blast resistant the three Fused Quartz blocks should be.");
     }
 
     public static void checkYetaAccess() {

src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java

@@ -56,7 +56,7 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
         int x_start = (xSize / 2) - (BUTTON_SIZE / 2);
         int y = 58;
 
-        buttonMode = new ToggleButton(this, 1, x_mode, y, IconEIO.TICK, IconEIO.REDSTONE_MODE_WITH_SIGNAL);
+        buttonMode = new ToggleButton(this, 1, x_mode, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.REDSTONE_MODE_WITH_SIGNAL);
 
         buttonMode.setToolTip(EnderIO.lang.localize("gui.machine.weather.control"));
         buttonMode.setSelectedToolTip(EnderIO.lang.localize("gui.machine.weather.redstone"));
@@ -65,7 +65,7 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
         addButton(buttonMode);
         buttonMode.onGuiInit();
 
-        buttonStart = new IconButton(this, 0, x_start, y, IconEIO.MINUS);
+        buttonStart = new IconButton(this, 0, x_start, y, IconEIO.TICK);
         buttonStart.setToolTip(EnderIO.lang.localize("gui.machine.weather.run"));
 
         addButton(buttonStart);
@@ -86,31 +86,13 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
         boolean pulseControl = getTileEntity().getLaunchOnRedstone();
         pulseControlAction(pulseControl);
 
-        WeatherTask task = getCurrentTask();
-        if (task == null) {
-            buttonStart.setIcon(IconEIO.MINUS);
+        FluidStack fs = getTileEntity().getInputTank().getFluid();
+        if (fs == null) {
             buttonStart.enabled = false;
             return;
         }
-        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());
+        WeatherTask task = WeatherTask.fromFluid(fs.getFluid());
+        buttonStart.enabled = getTileEntity().canStartTask(task);
     }
 
     @Override
@@ -183,7 +165,6 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
             // Start Button
             getTileEntity().startTask();
             PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity(), true));
-            buttonStart.setEnabled(false);
         } else if (b.id == 1) {
             // Control Mode Button
             boolean pulseControl = buttonMode.isSelected();
@@ -196,6 +177,6 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
 
     protected void pulseControlAction(boolean pulseControl) {
         redstoneButton.setVisible(!pulseControl);
-        buttonStart.setEnabled(!pulseControl && getTileEntity().canStartTask(getCurrentTask()));
+        buttonStart.setVisible(!pulseControl);
     }
 }

src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java

@@ -168,9 +168,6 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
     @Override
     public void doUpdate() {
         super.doUpdate();
-        if (cooldown > 0) {
-            cooldown--;
-        }
         if (worldObj.isRemote && isActive() && worldObj.getTotalWorldTime() % 2 == 0) {
             doLoadingParticles();
         }
@@ -235,18 +232,20 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
 
     @Override
     protected boolean processTasks(boolean redstoneCheckPassed) {
-        if (cooldown > 0) {
-            return true;
-        }
-
         boolean res = false;
 
+        if (cooldown > 0) {
+            cooldown--;
+            res = true;
+            return res;
+        }
+
         if (!redstoneCheckPassed && !launchOnRedstone) {
             if (canBeActive) {
                 canBeActive = false;
-                return true;
+                res = true;
             }
-            return false;
+            return res;
         } else {
             canBeActive = true;
 
@@ -292,8 +291,7 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
     public boolean canStartTask(WeatherTask task) {
         return getActiveTask() == null && !WeatherTask.worldIsState(task, worldObj)
                 && getStackInSlot(0) != null
-                && inputTank.getFluidAmount() >= 1000
-                && cooldown <= 0;
+                && inputTank.getFluidAmount() >= 1000;
     }
 
     public void startTask() {
@@ -315,7 +313,6 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
         if (getActiveTask() != null) {
             activeTask = null;
             fluidUsed = 0;
-            cooldown = 200;
             if (!worldObj.isRemote) {
                 PacketHandler.INSTANCE
                         .sendToDimension(new PacketActivateWeather(this, false), worldObj.provider.dimensionId);

src/main/java/crazypants/enderio/material/BlockFusedQuartz.java

@@ -129,7 +129,7 @@ public class BlockFusedQuartz extends BlockEio {
         int meta = world.getBlockMetadata(x, y, z);
         Type type = Type.byMeta(meta);
         if (type.blastResistance) {
-            return Config.fusedQuartzExplosionResistance;
+            return 20;
         } else {
             return super.getExplosionResistance(par1Entity);
         }

src/main/resources/assets/enderio/lang/cs_CZ.lang

@@ -982,11 +982,8 @@ 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 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.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and
+tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item
 tile.blockBuffer.item.name=Item Buffer
 tile.blockBuffer.power.name=Power Buffer
 tile.blockBuffer.omni.name=Omni Buffer

src/main/resources/assets/enderio/lang/de_DE.lang

@@ -564,6 +564,8 @@ 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

src/main/resources/assets/enderio/lang/en_US.lang

@@ -642,11 +642,8 @@ 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 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.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and
+tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item
 
 tile.blockBuffer.name=Buffer
 tile.blockBuffer.item.name=Item Buffer
@@ -1105,8 +1102,8 @@ 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.redstone=Launch on Redstone
+enderio.gui.machine.weather.manual=Default Control Mode
 enderio.gui.machine.weather.run=Launch
 
 

src/main/resources/assets/enderio/lang/es_AR.lang

@@ -425,6 +425,7 @@ 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

src/main/resources/assets/enderio/lang/es_ES.lang

@@ -427,6 +427,7 @@ 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

src/main/resources/assets/enderio/lang/es_MX.lang

@@ -425,6 +425,7 @@ 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

src/main/resources/assets/enderio/lang/es_UY.lang

@@ -425,6 +425,7 @@ 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

src/main/resources/assets/enderio/lang/es_VE.lang

@@ -425,6 +425,7 @@ 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

src/main/resources/assets/enderio/lang/fr_FR.lang

@@ -464,6 +464,8 @@ 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

src/main/resources/assets/enderio/lang/ru_RU.lang

@@ -613,6 +613,8 @@ 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=Энергобуфер

src/main/resources/assets/enderio/lang/zh_CN.lang

@@ -613,6 +613,8 @@ 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=能量缓存器

src/main/resources/assets/enderio/lang/zh_TW.lang

@@ -1009,11 +1009,8 @@ 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 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.blockWeatherObelisk.tooltip.detailed.line2=Requires a lot of power and
+tile.blockWeatherObelisk.tooltip.detailed.line3=a catalyst item
 tile.blockBuffer.item.name=Item Buffer
 tile.blockBuffer.power.name=Power Buffer
 tile.blockBuffer.omni.name=Omni Buffer