divided rocket entity from overworld to dimensions specific (#222)

Co-authored-by: Martin Robertz <[email protected]>

dependencies.gradle

@@ -15,7 +15,7 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:Backhand:1.8.4:dev") { transitive = false }
     compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-812-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.261:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.576:dev') {transitive = false}
     compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.37-1.7.10:dev") {transitive = false}
     compileOnly('com.github.GTNewHorizons:Railcraft:9.17.17:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.9-GTNH:api') {transitive = false}

src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java

@@ -85,6 +85,6 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt
     @Optional.Method(modid = "gregtech_nh")
     @Override
     public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) {
-        return true;
+        return Hazard.STANDARD_HAZARDS.contains(hazard);
     }
 }

src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java

@@ -44,6 +44,10 @@ public class BlockItemBuffer extends ItemBlockWithMetadata {
             return "tile." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(Locale.US);
         }
 
+        public String getGuiUnlocalizedName() {
+            return "enderio.gui." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(Locale.US);
+        }
+
         public static ItemStack getStack(Type type) {
             return new ItemStack(EnderIO.blockBuffer, 1, type.ordinal());
         }

src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java

@@ -146,7 +146,7 @@ public class GuiBuffer extends GuiPoweredMachineBase<TileBuffer> {
 
         super.drawGuiContainerBackgroundLayer(par1, par2, par3);
 
-        String invName = EnderIO.lang.localizeExact(getTileEntity().getInventoryName() + ".name");
+        String invName = EnderIO.lang.localizeExact(getTileEntity().getGuiInventoryName() + ".name");
         getFontRenderer().drawStringWithShadow(
                 invName,
                 sx + (xSize / 2) - (getFontRenderer().getStringWidth(invName) / 2),

src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java

@@ -38,6 +38,10 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl
         return BlockItemBuffer.Type.get(this).getUnlocalizedName();
     }
 
+    public String getGuiInventoryName() {
+        return BlockItemBuffer.Type.get(this).getGuiUnlocalizedName();
+    }
+
     @Override
     protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) {
         return true;

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

@@ -3,10 +3,8 @@ package crazypants.enderio.machine.obelisk.weather;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFireworkSparkFX;
 import net.minecraft.entity.item.EntityFireworkRocket;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
 
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
@@ -53,12 +51,9 @@ public class EntityWeatherRocket extends EntityFireworkRocket {
     public void setDead() {
         super.setDead();
 
-        WeatherTask task = WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)];
-        MinecraftServer server = MinecraftServer.getServer();
-
-        if (server != null && server.worldServers.length > 0) {
-            WorldServer worldserver = server.worldServers[0];
-            task.complete(worldserver);
+        if (!worldObj.isRemote) {
+            WeatherTask task = WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)];
+            task.complete(worldObj);
         }
     }
 

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

@@ -648,7 +648,7 @@ 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.name=Buffer 
 tile.blockBuffer.item.name=Item Buffer
 tile.blockBuffer.power.name=Power Buffer
 tile.blockBuffer.omni.name=Omni Buffer
@@ -1197,6 +1197,13 @@ enderio.stirlingGenerator.upgradeslot=Upgrade slot
 enderio.stirlingGenerator.upgrades={0} gives {2}{1,number,#.#}x{3} efficiency
 enderio.stirlingGenerator.remaining=Remaining {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
 
+# Block buffers
+enderio.gui.blockBuffer.name=Buffer 
+enderio.gui.blockBuffer.item.name=Item Buffer
+enderio.gui.blockBuffer.power.name=Power Buffer
+enderio.gui.blockBuffer.omni.name=Omni Buffer
+enderio.gui.blockBuffer.creative.name=Creative Buffer
+
 #Travel Blocks
 enderio.gui.travelAccessable.privateBlock1=Only
 enderio.gui.travelAccessable.privateBlock2=may change this blocks settings.