From 91a883920325d6ecedf7b2263c39b0645a1831f3 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 1 Nov 2013 11:33:00 -0400 Subject: [PATCH] Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal. --- common/mekanism/client/ClientProxy.java | 6 - .../client/gui/GuiTheoreticalElementizer.java | 34 --- .../model/ModelTheoreticalElementizer.java | 199 ------------------ .../render/block/MachineRenderingHandler.java | 15 +- .../RenderTheoreticalElementizer.java | 46 ---- common/mekanism/common/CommonProxy.java | 3 - common/mekanism/common/Mekanism.java | 27 +-- .../mekanism/common/block/BlockMachine.java | 7 - .../mekanism/common/item/ItemStopwatch.java | 45 ---- .../mekanism/common/item/ItemWeatherOrb.java | 44 ---- .../TileEntityTheoreticalElementizer.java | 86 -------- .../common/util/TransporterUtils.java | 104 +++++---- .../assets/mekanism/gui/GuiElementizer.png | Bin 5494 -> 0 bytes resources/assets/mekanism/lang/de_DE.lang | 3 - resources/assets/mekanism/lang/en_US.lang | 3 - resources/assets/mekanism/lang/pl_PL.lang | 3 - resources/assets/mekanism/lang/zh_CN.lang | 3 - .../render/TheoreticalElementizer.png | Bin 3693 -> 0 bytes .../mekanism/textures/items/Stopwatch.png | Bin 235 -> 0 bytes .../mekanism/textures/items/WeatherOrb.png | Bin 179 -> 0 bytes 20 files changed, 53 insertions(+), 575 deletions(-) delete mode 100644 common/mekanism/client/gui/GuiTheoreticalElementizer.java delete mode 100644 common/mekanism/client/model/ModelTheoreticalElementizer.java delete mode 100644 common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java delete mode 100644 common/mekanism/common/item/ItemStopwatch.java delete mode 100644 common/mekanism/common/item/ItemWeatherOrb.java delete mode 100644 common/mekanism/common/tileentity/TileEntityTheoreticalElementizer.java delete mode 100644 resources/assets/mekanism/gui/GuiElementizer.png delete mode 100644 resources/assets/mekanism/render/TheoreticalElementizer.png delete mode 100644 resources/assets/mekanism/textures/items/Stopwatch.png delete mode 100644 resources/assets/mekanism/textures/items/WeatherOrb.png diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 677550017..2b7a18df6 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -31,7 +31,6 @@ import mekanism.client.gui.GuiRobitRepair; import mekanism.client.gui.GuiRobitSmelting; import mekanism.client.gui.GuiStopwatch; import mekanism.client.gui.GuiTeleporter; -import mekanism.client.gui.GuiTheoreticalElementizer; import mekanism.client.gui.GuiWeatherOrb; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderTickHandler; @@ -50,7 +49,6 @@ import mekanism.client.render.tileentity.RenderLogisticalTransporter; import mekanism.client.render.tileentity.RenderMechanicalPipe; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderPressurizedTube; -import mekanism.client.render.tileentity.RenderTheoreticalElementizer; import mekanism.client.render.tileentity.RenderUniversalCable; import mekanism.client.sound.Sound; import mekanism.client.sound.SoundHandler; @@ -84,7 +82,6 @@ import mekanism.common.tileentity.TileEntityOsmiumCompressor; import mekanism.common.tileentity.TileEntityPressurizedTube; import mekanism.common.tileentity.TileEntityPurificationChamber; import mekanism.common.tileentity.TileEntityTeleporter; -import mekanism.common.tileentity.TileEntityTheoreticalElementizer; import mekanism.common.tileentity.TileEntityUniversalCable; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -227,7 +224,6 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityTheoreticalElementizer.class, "TheoreticalElementizer", new RenderTheoreticalElementizer()); ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderMetallurgicInfuser()); ClientRegistry.registerTileEntity(TileEntityPressurizedTube.class, "PressurizedTube", new RenderPressurizedTube()); ClientRegistry.registerTileEntity(TileEntityUniversalCable.class, "UniversalCable", new RenderUniversalCable()); @@ -294,8 +290,6 @@ public class ClientProxy extends CommonProxy return new GuiCombiner(player.inventory, (TileEntityAdvancedElectricMachine)tileEntity); case 6: return new GuiCrusher(player.inventory, (TileEntityElectricMachine)tileEntity); - case 7: - return new GuiTheoreticalElementizer(player.inventory, (TileEntityTheoreticalElementizer)tileEntity); case 8: return new GuiEnergyCube(player.inventory, (TileEntityEnergyCube)tileEntity); case 9: diff --git a/common/mekanism/client/gui/GuiTheoreticalElementizer.java b/common/mekanism/client/gui/GuiTheoreticalElementizer.java deleted file mode 100644 index ad0ac11d6..000000000 --- a/common/mekanism/client/gui/GuiTheoreticalElementizer.java +++ /dev/null @@ -1,34 +0,0 @@ -package mekanism.client.gui; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import mekanism.api.EnumColor; -import mekanism.common.tileentity.TileEntityTheoreticalElementizer; -import mekanism.common.util.MekanismUtils; -import net.minecraft.entity.player.InventoryPlayer; - -@SideOnly(Side.CLIENT) -public class GuiTheoreticalElementizer extends GuiAdvancedElectricMachine -{ - public GuiTheoreticalElementizer(InventoryPlayer inventory, TileEntityTheoreticalElementizer tentity) - { - super(inventory, tentity); - } - - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - super.drawGuiContainerForegroundLayer(par1, par2); - String displayText = ""; - - if(tileEntity.isActive) - { - displayText = "Status: " + (int)(((float)tileEntity.operatingTicks/MekanismUtils.getTicks(tileEntity.getSpeedMultiplier(), tileEntity.TICKS_REQUIRED))*100) + "%"; - } - else { - displayText = "Status: " + EnumColor.DARK_RED + "Off"; - } - - fontRenderer.drawString(displayText, 80, 60, 0x404040); - } -} diff --git a/common/mekanism/client/model/ModelTheoreticalElementizer.java b/common/mekanism/client/model/ModelTheoreticalElementizer.java deleted file mode 100644 index 45bfef0bd..000000000 --- a/common/mekanism/client/model/ModelTheoreticalElementizer.java +++ /dev/null @@ -1,199 +0,0 @@ -package mekanism.client.model; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -@SideOnly(Side.CLIENT) -public class ModelTheoreticalElementizer extends ModelBase -{ - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer DROT; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer O; - ModelRenderer P; - ModelRenderer Q; - ModelRenderer R; - - public ModelTheoreticalElementizer() - { - textureWidth = 128; - textureHeight = 128; - - A = new ModelRenderer(this, 0, 0); - A.addBox(-8F, 0F, -8F, 16, 1, 16); - A.setRotationPoint(0F, 23F, 0F); - A.setTextureSize(64, 32); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 0, 40); - B.addBox(-5F, 0F, -4F, 10, 10, 8); - B.setRotationPoint(0F, 13F, 0F); - B.setTextureSize(64, 32); - B.mirror = true; - setRotation(B, 0F, 0F, 0F); - C = new ModelRenderer(this, 0, 19); - C.addBox(-3F, 0F, -3F, 6, 14, 6); - C.setRotationPoint(0F, 8F, 0F); - C.setTextureSize(64, 32); - C.mirror = true; - setRotation(C, 0F, 0F, 0F); - DROT = new ModelRenderer(this, 5, 0); - DROT.addBox(-1F, -1F, -1F, 2, 2, 2); - DROT.setRotationPoint(0F, 5F, 0F); - DROT.setTextureSize(64, 32); - DROT.mirror = true; - setRotation(DROT, 0.7853982F, 0.7853982F, 0.7853982F); - E = new ModelRenderer(this, 65, 0); - E.addBox(-2F, 0F, 2F, 4, 8, 7); - E.setRotationPoint(0F, 15F, 0F); - E.setTextureSize(64, 32); - E.mirror = true; - setRotation(E, 0F, 0.7853982F, 0F); - F = new ModelRenderer(this, 65, 0); - F.addBox(-2F, 0F, 2F, 4, 8, 7); - F.setRotationPoint(0F, 15F, 0F); - F.setTextureSize(64, 32); - F.mirror = true; - setRotation(F, 0F, -0.7853982F, 0F); - G = new ModelRenderer(this, 0, 0); - G.addBox(6F, 0F, 0F, 1, 4, 1); - G.setRotationPoint(0F, 19F, -2F); - G.setTextureSize(64, 32); - G.mirror = true; - setRotation(G, 0F, 0F, 0F); - H = new ModelRenderer(this, 0, 6); - H.addBox(5F, 0F, 0F, 1, 1, 1); - H.setRotationPoint(0F, 19F, -2F); - H.setTextureSize(64, 32); - H.mirror = true; - setRotation(H, 0F, 0F, 0F); - I = new ModelRenderer(this, 0, 6); - I.addBox(5F, 0F, 0F, 1, 1, 1); - I.setRotationPoint(0F, 19F, 0F); - I.setTextureSize(64, 32); - I.mirror = true; - setRotation(I, 0F, 0F, 0F); - J = new ModelRenderer(this, 0, 0); - J.addBox(6F, 0F, 0F, 1, 4, 1); - J.setRotationPoint(0F, 19F, 0F); - J.setTextureSize(64, 32); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 21, 61); - K.addBox(0F, -1F, -4F, 2, 9, 5); - K.setRotationPoint(-7F, 15F, 1F); - K.setTextureSize(64, 32); - K.mirror = true; - setRotation(K, 0F, 0F, 0F); - L = new ModelRenderer(this, 21, 77); - L.addBox(0F, -1F, -1F, 1, 2, 2); - L.setRotationPoint(-8F, 16F, 0F); - L.setTextureSize(64, 32); - L.mirror = true; - setRotation(L, 0F, 0F, 0F); - M = new ModelRenderer(this, 0, 61); - M.addBox(-4F, 0F, 0F, 8, 10, 0); - M.setRotationPoint(0F, 3F, 0F); - M.setTextureSize(64, 32); - M.mirror = true; - setRotation(M, 0F, 0.7853982F, 0F); - N = new ModelRenderer(this, 0, 73); - N.addBox(-4F, 0F, 0F, 8, 10, 0); - N.setRotationPoint(0F, 3F, 0F); - N.setTextureSize(64, 32); - N.mirror = true; - setRotation(N, 0F, -0.7853982F, 0F); - O = new ModelRenderer(this, 0, 93); - O.addBox(-5F, -5F, 0F, 6, 6, 0); - O.setRotationPoint(0F, 6F, 0F); - O.setTextureSize(64, 32); - O.mirror = true; - setRotation(O, 0F, -0.7853982F, 0.7853982F); - P = new ModelRenderer(this, 0, 85); - P.addBox(-5F, -5F, 0F, 6, 6, 0); - P.setRotationPoint(0F, 6F, 0F); - P.setTextureSize(64, 32); - P.mirror = true; - setRotation(P, 0F, 0.7853982F, 0.7853982F); - Q = new ModelRenderer(this, 65, 17); - Q.addBox(-4F, 0F, 0F, 8, 6, 4); - Q.setRotationPoint(0F, 17F, -8F); - Q.setTextureSize(64, 32); - Q.mirror = true; - setRotation(Q, 0F, 0F, 0F); - R = new ModelRenderer(this, 65, 28); - R.addBox(-4F, 0F, 0F, 8, 3, 5); - R.setRotationPoint(0F, 17F, -8F); - R.setTextureSize(64, 32); - R.mirror = true; - setRotation(R, 0.5934119F, 0F, 0F); - } - - public void render(float size) - { - A.render(size); - B.render(size); - C.render(size); - DROT.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - O.render(size); - P.render(size); - Q.render(size); - R.render(size); - } - - @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); - A.render(f5); - B.render(f5); - C.render(f5); - DROT.render(f5); - E.render(f5); - F.render(f5); - G.render(f5); - H.render(f5); - I.render(f5); - J.render(f5); - K.render(f5); - L.render(f5); - M.render(f5); - N.render(f5); - O.render(f5); - P.render(f5); - Q.render(f5); - R.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} \ No newline at end of file diff --git a/common/mekanism/client/render/block/MachineRenderingHandler.java b/common/mekanism/client/render/block/MachineRenderingHandler.java index 25e415cd3..c79e1b0c6 100644 --- a/common/mekanism/client/render/block/MachineRenderingHandler.java +++ b/common/mekanism/client/render/block/MachineRenderingHandler.java @@ -4,15 +4,13 @@ import mekanism.client.ClientProxy; import mekanism.client.model.ModelChargepad; import mekanism.client.model.ModelElectricPump; import mekanism.client.model.ModelMetallurgicInfuser; -import mekanism.client.model.ModelTheoreticalElementizer; import mekanism.client.render.MekanismRenderer; +import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.common.Mekanism; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -25,7 +23,6 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { - public ModelTheoreticalElementizer theoreticalElementizer = new ModelTheoreticalElementizer(); public ModelElectricPump electricPump = new ModelElectricPump(); public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser(); public ModelChargepad chargepad = new ModelChargepad(); @@ -43,15 +40,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler if(block.blockID == Mekanism.machineBlockID) { - if(metadata == MachineType.THEORETICAL_ELEMENTIZER.meta) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.8F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "TheoreticalElementizer.png")); - theoreticalElementizer.render(0.0560F); - } - else if(metadata == MachineType.ELECTRIC_PUMP.meta) + if(metadata == MachineType.ELECTRIC_PUMP.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); diff --git a/common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java b/common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java deleted file mode 100644 index e1cc555b9..000000000 --- a/common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java +++ /dev/null @@ -1,46 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelTheoreticalElementizer; -import mekanism.common.tileentity.TileEntityTheoreticalElementizer; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderTheoreticalElementizer extends TileEntitySpecialRenderer -{ - private ModelTheoreticalElementizer model = new ModelTheoreticalElementizer(); - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityTheoreticalElementizer)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityTheoreticalElementizer tileEntity, double x, double y, double z, float partialTick) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "TheoreticalElementizer.png")); - - switch(tileEntity.facing) - { - case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - } - - GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); - GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); - GL11.glRotatef(270F, 0.0F, 1.0F, 0.0F); - model.render(0.0625F); - GL11.glPopMatrix(); - } -} diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index 9e86b3ae3..7f89f8d83 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -42,7 +42,6 @@ import mekanism.common.tileentity.TileEntityOsmiumCompressor; import mekanism.common.tileentity.TileEntityPressurizedTube; import mekanism.common.tileentity.TileEntityPurificationChamber; import mekanism.common.tileentity.TileEntityTeleporter; -import mekanism.common.tileentity.TileEntityTheoreticalElementizer; import mekanism.common.tileentity.TileEntityUniversalCable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -74,7 +73,6 @@ public class CommonProxy GameRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory"); GameRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber"); GameRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter"); - GameRegistry.registerTileEntity(TileEntityTheoreticalElementizer.class, "TheoreticalElementizer"); GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); GameRegistry.registerTileEntity(TileEntityPressurizedTube.class, "PressurizedTube"); GameRegistry.registerTileEntity(TileEntityUniversalCable.class, "UniversalCable"); @@ -141,7 +139,6 @@ public class CommonProxy Mekanism.gasTankID = Mekanism.configuration.getBlock("GasTank", 3006).getInt(); Mekanism.transmitterID = Mekanism.configuration.getBlock("Transmitter", 3007).getInt(); - Mekanism.extrasEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ExtrasEnabled", true).getBoolean(true); Mekanism.osmiumGenerationEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumGenerationEnabled", true).getBoolean(true); Mekanism.disableBCSteelCrafting = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisableBCSteelCrafting", false).getBoolean(true); Mekanism.disableBCBronzeCrafting = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisableBCBronzeCrafting", false).getBoolean(true); diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index c8dc18caf..677207f25 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -49,10 +49,8 @@ import mekanism.common.item.ItemMekanism; import mekanism.common.item.ItemNetworkReader; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemRobit; -import mekanism.common.item.ItemStopwatch; import mekanism.common.item.ItemStorageTank; import mekanism.common.item.ItemWalkieTalkie; -import mekanism.common.item.ItemWeatherOrb; import mekanism.common.network.PacketConfigurationUpdate; import mekanism.common.network.PacketConfiguratorState; import mekanism.common.network.PacketDataRequest; @@ -178,8 +176,6 @@ public class Mekanism //Items public static ItemElectricBow ElectricBow; - public static Item Stopwatch; - public static Item WeatherOrb; public static Item EnrichedAlloy; public static ItemEnergized EnergyTablet; public static Item SpeedUpgrade; @@ -215,7 +211,6 @@ public class Mekanism public static Item DirtyDust; //General Configuration - public static boolean extrasEnabled = true; public static boolean osmiumGenerationEnabled = true; public static boolean disableBCBronzeCrafting = true; public static boolean disableBCSteelCrafting = true; @@ -443,13 +438,6 @@ public class Mekanism "CAC", "cOc", "CAC", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('c'), AtomicCore, Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.ADVANCED, type) })); } - - if(extrasEnabled) - { - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 4), new Object[] { - "SGS", "GDG", "SGS", Character.valueOf('S'), EnrichedAlloy, Character.valueOf('G'), Block.glass, Character.valueOf('D'), Block.blockDiamond - })); - } //Furnace Recipes FurnaceRecipes.smelting().addSmelting(oreBlockID, 0, new ItemStack(Ingot, 1, 1), 1.0F); @@ -520,13 +508,7 @@ public class Mekanism //Declarations configuration.load(); ElectricBow = (ItemElectricBow) new ItemElectricBow(configuration.getItem("ElectricBow", 11200).getInt()).setUnlocalizedName("ElectricBow"); - - if(extrasEnabled == true) - { - Stopwatch = new ItemStopwatch(configuration.getItem("Stopwatch", 11202).getInt()).setUnlocalizedName("Stopwatch"); - WeatherOrb = new ItemWeatherOrb(configuration.getItem("WeatherOrb", 11203).getInt()).setUnlocalizedName("WeatherOrb"); - } - + //OPEN 11201-11203 Dust = new ItemDust(configuration.getItem("Dust", 11204).getInt()-256); Ingot = new ItemIngot(configuration.getItem("Ingot", 11205).getInt()-256); EnergyTablet = (ItemEnergized) new ItemEnergized(configuration.getItem("EnergyTablet", 11206).getInt(), 1000000, 120).setUnlocalizedName("EnergyTablet"); @@ -552,13 +534,6 @@ public class Mekanism //Registrations GameRegistry.registerItem(ElectricBow, "ElectricBow"); - - if(extrasEnabled) - { - GameRegistry.registerItem(Stopwatch, "Stopwatch"); - GameRegistry.registerItem(WeatherOrb, "WeatherOrb"); - } - GameRegistry.registerItem(Dust, "Dust"); GameRegistry.registerItem(Ingot, "Ingot"); GameRegistry.registerItem(EnergyTablet, "EnergyTablet"); diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index 09e333e6a..ddbc379f8 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -42,7 +42,6 @@ import mekanism.common.tileentity.TileEntityMetallurgicInfuser; import mekanism.common.tileentity.TileEntityOsmiumCompressor; import mekanism.common.tileentity.TileEntityPurificationChamber; import mekanism.common.tileentity.TileEntityTeleporter; -import mekanism.common.tileentity.TileEntityTheoreticalElementizer; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -537,11 +536,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds list.add(new ItemStack(i, 1, 2)); list.add(new ItemStack(i, 1, 3)); - if(Mekanism.extrasEnabled) - { - list.add(new ItemStack(i, 1, 4)); - } - for(RecipeType type : RecipeType.values()) { for(Tier.FactoryTier tier : Tier.FactoryTier.values()) @@ -877,7 +871,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds OSMIUM_COMPRESSOR(1, "OsmiumCompressor", 4, Mekanism.osmiumCompressorUsage*400, TileEntityOsmiumCompressor.class, false), COMBINER(2, "Combiner", 5, Mekanism.combinerUsage*400, TileEntityCombiner.class, false), CRUSHER(3, "Crusher", 6, Mekanism.crusherUsage*400, TileEntityCrusher.class, false), - THEORETICAL_ELEMENTIZER(4, "TheoreticalElementizer", 7, Mekanism.theoreticalElementizerUsage*400, TileEntityTheoreticalElementizer.class, true), BASIC_FACTORY(5, "BasicFactory", 11, Mekanism.factoryUsage*3*400, TileEntityFactory.class, false), ADVANCED_FACTORY(6, "AdvancedFactory", 11, Mekanism.factoryUsage*5*400, TileEntityAdvancedFactory.class, false), ELITE_FACTORY(7, "EliteFactory", 11, Mekanism.factoryUsage*7*400, TileEntityEliteFactory.class, false), diff --git a/common/mekanism/common/item/ItemStopwatch.java b/common/mekanism/common/item/ItemStopwatch.java deleted file mode 100644 index 693bf24b7..000000000 --- a/common/mekanism/common/item/ItemStopwatch.java +++ /dev/null @@ -1,45 +0,0 @@ -package mekanism.common.item; - -import mekanism.common.Mekanism; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemStopwatch extends ItemMekanism -{ - public ItemStopwatch(int i) - { - super(i); - setMaxStackSize(1); - setMaxDamage(5000); - setCreativeTab(Mekanism.tabMekanism); - } - - @Override - public boolean hasEffect(ItemStack itemstack) - { - return true; - } - - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - if(itemstack.getItemDamage() == 0) - { - entityplayer.openGui(Mekanism.instance, 0, world, 0, 0, 0); - } - - return itemstack; - } - - @Override - public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) - { - if(itemstack.getItemDamage() > 0) - { - itemstack.damageItem(-1, (EntityLivingBase)entity); - } - } -} diff --git a/common/mekanism/common/item/ItemWeatherOrb.java b/common/mekanism/common/item/ItemWeatherOrb.java deleted file mode 100644 index feaa6361f..000000000 --- a/common/mekanism/common/item/ItemWeatherOrb.java +++ /dev/null @@ -1,44 +0,0 @@ -package mekanism.common.item; - -import mekanism.common.Mekanism; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemWeatherOrb extends ItemMekanism -{ - public ItemWeatherOrb(int i) - { - super(i); - setMaxStackSize(1); - setMaxDamage(5000); - setCreativeTab(Mekanism.tabMekanism); - } - - @Override - public boolean hasEffect(ItemStack itemstack) - { - return true; - } - - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - if(itemstack.getItemDamage() == 0) - { - entityplayer.openGui(Mekanism.instance, 2, world, 0, 0, 0); - } - return itemstack; - } - - @Override - public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) - { - if(itemstack.getItemDamage() > 0) - { - itemstack.damageItem(-1, (EntityLivingBase)entity); - } - } -} diff --git a/common/mekanism/common/tileentity/TileEntityTheoreticalElementizer.java b/common/mekanism/common/tileentity/TileEntityTheoreticalElementizer.java deleted file mode 100644 index 9b974b213..000000000 --- a/common/mekanism/common/tileentity/TileEntityTheoreticalElementizer.java +++ /dev/null @@ -1,86 +0,0 @@ -package mekanism.common.tileentity; - -import java.util.HashMap; -import java.util.Random; - -import mekanism.common.Mekanism; -import mekanism.common.block.BlockMachine.MachineType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class TileEntityTheoreticalElementizer extends TileEntityAdvancedElectricMachine -{ - public TileEntityTheoreticalElementizer() - { - super("Elementizer.ogg", "Theoretical Elementizer", new ResourceLocation("mekanism", "gui/GuiElementizer.png"), Mekanism.theoreticalElementizerUsage, 1, 1000, MachineType.THEORETICAL_ELEMENTIZER.baseEnergy, 1000); - } - - @Override - public HashMap getRecipes() - { - return new HashMap(); - } - - @Override - public void operate() - { - if(!canOperate()) - { - return; - } - - ItemStack itemstack = new ItemStack(getRandomMagicItem()); - - inventory[0].stackSize--; - - if(inventory[0].stackSize <= 0) - { - inventory[0] = null; - } - - inventory[2] = itemstack; - } - - @Override - public boolean canOperate() - { - if(inventory[0] == null) - { - return false; - } - - if(inventory[2] != null) - { - return false; - } - - return true; - } - - @Override - public int getFuelTicks(ItemStack itemstack) - { - if(itemstack.itemID == Item.diamond.itemID) return 1000; - return 0; - } - - public static Item getRandomMagicItem() - { - Random rand = new Random(); - int random = rand.nextInt(2); - if(random == 0) return Mekanism.Stopwatch; - if(random == 1) return Mekanism.WeatherOrb; - return Mekanism.EnrichedAlloy; - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() - { - return INFINITE_EXTENT_AABB; - } -} \ No newline at end of file diff --git a/common/mekanism/common/util/TransporterUtils.java b/common/mekanism/common/util/TransporterUtils.java index c6f809d62..4c281aa25 100644 --- a/common/mekanism/common/util/TransporterUtils.java +++ b/common/mekanism/common/util/TransporterUtils.java @@ -189,36 +189,34 @@ public final class TransporterUtils else { ISidedInventory sidedInventory = (ISidedInventory) inventory; int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.getOrientation(side).getOpposite().ordinal()); - - if(slots == null || slots.length == 0) - { - return false; - } - for(int get = 0; get <= slots.length - 1; get++) + if(slots != null && slots.length != 0) { - int slotID = slots[get]; - - if(sidedInventory.isItemValidForSlot(slotID, itemStack) && sidedInventory.canInsertItem(slotID, itemStack, ForgeDirection.getOrientation(side).getOpposite().ordinal())) + for(int get = 0; get <= slots.length - 1; get++) { - ItemStack inSlot = inventory.getStackInSlot(slotID); - - if(inSlot == null) + int slotID = slots[get]; + + if(sidedInventory.isItemValidForSlot(slotID, itemStack) && sidedInventory.canInsertItem(slotID, itemStack, ForgeDirection.getOrientation(side).getOpposite().ordinal())) { - return true; - } - else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize()) - { - if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) + ItemStack inSlot = inventory.getStackInSlot(slotID); + + if(inSlot == null) { return true; } - else { - int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); - - if(rejects < itemStack.stackSize) + else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize()) + { + if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) { return true; + } + else { + int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); + + if(rejects < itemStack.stackSize) + { + return true; + } } } } @@ -273,46 +271,44 @@ public final class TransporterUtils else { ISidedInventory sidedInventory = (ISidedInventory) inventory; int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.getOrientation(side).getOpposite().ordinal()); - - if(slots == null || slots.length == 0) - { - return itemStack; - } - for(int get = 0; get <= slots.length - 1; get++) + if(slots != null && slots.length != 0) { - int slotID = slots[get]; - - if(sidedInventory.isItemValidForSlot(slotID, itemStack) && sidedInventory.canInsertItem(slotID, itemStack, ForgeDirection.getOrientation(side).getOpposite().ordinal())) + for(int get = 0; get <= slots.length - 1; get++) { - ItemStack inSlot = inventory.getStackInSlot(slotID); - - if(inSlot == null) + int slotID = slots[get]; + + if(sidedInventory.isItemValidForSlot(slotID, itemStack) && sidedInventory.canInsertItem(slotID, itemStack, ForgeDirection.getOrientation(side).getOpposite().ordinal())) { - inventory.setInventorySlotContents(slotID, itemStack); - return null; - } - else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize()) - { - if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) + ItemStack inSlot = inventory.getStackInSlot(slotID); + + if(inSlot == null) { - ItemStack toSet = itemStack.copy(); - toSet.stackSize += inSlot.stackSize; - - inventory.setInventorySlotContents(slotID, toSet); + inventory.setInventorySlotContents(slotID, itemStack); return null; } - else { - int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); - - ItemStack toSet = itemStack.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); - - ItemStack remains = itemStack.copy(); - remains.stackSize = rejects; - - inventory.setInventorySlotContents(slotID, toSet); - return remains; + else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize()) + { + if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) + { + ItemStack toSet = itemStack.copy(); + toSet.stackSize += inSlot.stackSize; + + inventory.setInventorySlotContents(slotID, toSet); + return null; + } + else { + int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); + + ItemStack toSet = itemStack.copy(); + toSet.stackSize = inSlot.getMaxStackSize(); + + ItemStack remains = itemStack.copy(); + remains.stackSize = rejects; + + inventory.setInventorySlotContents(slotID, toSet); + return remains; + } } } } diff --git a/resources/assets/mekanism/gui/GuiElementizer.png b/resources/assets/mekanism/gui/GuiElementizer.png deleted file mode 100644 index d6f85adc856b57170b9c1549e348e3fa015cd8da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5494 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 diff --git a/resources/assets/mekanism/lang/de_DE.lang b/resources/assets/mekanism/lang/de_DE.lang index 5a26f754e..28279429b 100644 --- a/resources/assets/mekanism/lang/de_DE.lang +++ b/resources/assets/mekanism/lang/de_DE.lang @@ -4,8 +4,6 @@ //Items tile.ObsidianTNT.name=Obsidian-TNT -item.Stopwatch.name=Steve's Stoppuhr -item.WeatherOrb.name=Wetterorb item.EnrichedAlloy.name=Angereicherte Legierung item.EnergyTablet.name=Energietablett item.SpeedUpgrade.name=Geschwindigkeitsupgrade @@ -46,7 +44,6 @@ tile.MachineBlock.EnrichmentChamber.name=Anreicherungskammer tile.MachineBlock.OsmiumCompressor.name=Osmiumkompressor tile.MachineBlock.Combiner.name=Kombinierer tile.MachineBlock.Crusher.name=Zerstoßer -tile.MachineBlock.TheoreticalElementizer.name=Theoretischer Elementisierer tile.MachineBlock.BasicFactory.name=Basisfabrik tile.MachineBlock.AdvancedFactory.name=Fortgeschrittene Fabrik tile.MachineBlock.EliteFactory.name=Elitefabrik diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index ceb0e1b95..c3c8dac1c 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -4,8 +4,6 @@ //Items tile.ObsidianTNT.name=Obsidian TNT -item.Stopwatch.name=Steve's Stopwatch -item.WeatherOrb.name=Weather Orb item.EnrichedAlloy.name=Enriched Alloy item.EnergyTablet.name=Energy Tablet item.SpeedUpgrade.name=Speed Upgrade @@ -46,7 +44,6 @@ tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber tile.MachineBlock.OsmiumCompressor.name=Osmium Compressor tile.MachineBlock.Combiner.name=Combiner tile.MachineBlock.Crusher.name=Crusher -tile.MachineBlock.TheoreticalElementizer.name=Theoretical Elementizer tile.MachineBlock.BasicFactory.name=Basic Factory tile.MachineBlock.AdvancedFactory.name=Advanced Factory tile.MachineBlock.EliteFactory.name=Elite Factory diff --git a/resources/assets/mekanism/lang/pl_PL.lang b/resources/assets/mekanism/lang/pl_PL.lang index 0fc651603..3053c2647 100644 --- a/resources/assets/mekanism/lang/pl_PL.lang +++ b/resources/assets/mekanism/lang/pl_PL.lang @@ -4,8 +4,6 @@ //Items tile.ObsidianTNT.name=Obsydianowe TNT -item.Stopwatch.name=Stoper Steva -item.WeatherOrb.name=Kula Pogody item.EnrichedAlloy.name=Wzbogacony Stop item.EnergyTablet.name=Tabletka Energi item.SpeedUpgrade.name=Ulepszenie Prędkości @@ -46,7 +44,6 @@ tile.MachineBlock.EnrichmentChamber.name=Komora Wzbogacania tile.MachineBlock.OsmiumCompressor.name=Osmowy Kompresor tile.MachineBlock.Combiner.name=Combiner tile.MachineBlock.Crusher.name=Rozdrabniarka -tile.MachineBlock.TheoreticalElementizer.name=Theoretical Elementizer tile.MachineBlock.BasicFactory.name=Podstawowa Fabryka tile.MachineBlock.AdvancedFactory.name=Zaawansowana Fabryka tile.MachineBlock.EliteFactory.name=Elitarna Fabryka diff --git a/resources/assets/mekanism/lang/zh_CN.lang b/resources/assets/mekanism/lang/zh_CN.lang index 43f1a9b0c..6bb2a7303 100644 --- a/resources/assets/mekanism/lang/zh_CN.lang +++ b/resources/assets/mekanism/lang/zh_CN.lang @@ -4,8 +4,6 @@ //Items tile.ObsidianTNT.name=黑曜石TNT -item.Stopwatch.name=史蒂夫的怀表 -item.WeatherOrb.name=气候球 item.EnrichedAlloy.name=富集合金 item.EnergyTablet.name=能量板 item.SpeedUpgrade.name=速度升级 @@ -46,7 +44,6 @@ tile.MachineBlock.EnrichmentChamber.name=富集仓E tile.MachineBlock.OsmiumCompressor.name=锇压缩机 tile.MachineBlock.Combiner.name=融合机 tile.MachineBlock.Crusher.name=粉碎机 -tile.MachineBlock.TheoreticalElementizer.name=神奇道具构建机 tile.MachineBlock.BasicFactory.name=基础工厂 tile.MachineBlock.AdvancedFactory.name=高级工厂 tile.MachineBlock.EliteFactory.name=精英工厂 diff --git a/resources/assets/mekanism/render/TheoreticalElementizer.png b/resources/assets/mekanism/render/TheoreticalElementizer.png deleted file mode 100644 index aac919200256494ba7079c55cc24ee5df28cbd9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3693 zcma)9i8s{m_kYhAV;c;@WKXuTjddzyiR^|DVzOqZ$u5i~%h*XFvL=b_Yh@W!)(pu` zhU`9=$kv3fet*I5Jm)^IbMHCNa_)V-o+aMcNSl$Kiyi;~MqM4vJLeej&uF3NefLfK zfpY-)-qF?os)l&h&mE|PzP2V{@~56hg+gEW4+hFUbU zFg9i(mUis&*7@{Xx|-@{LDO3pFHbXbF5I@Z%ZKDjH%?Ad!8&8TDSJ&Ui}-;fl7o+U);?_CANA)=`AK-h!=n`7X>@k_K9(=>GvZ9vu@=E* z>y+|Dyfo#JDUGl9e@~W4+_4My>m?YPytm6Kmf z0U1u1I8x<&0T_q<46lC^6{&hGhJjt>Z(G1l8seKb=7%US8J1&TnWJ(7QJWP{CqQHK zoF~!%cmx3x_*2g?n2Fdu>8Yk<^f+$g;)3$Ezb-OIK#kkl&DII>&8~$S3NC%oTs855 z=Ki#eC`g)mac$Lra}AOfGoRdrgw3KFSaM2#cJqg>1xsf15s*o(cd!m)G?Sq#px+YV zL`EmE3%fP3divy5<@YO8K5Zz&QA2S0KKLt8YngPu?375ic6#cYEntcC`p%V-G;nMr zyZGIukv6@pJ?){Zt%HLV4w)M`t7m}8agT${_}pArx2~NPha#ibr+9PGu(#HHV*{Cz z-DGl2T}f{zXLX|RE6bp@qBsO|sU9i5y03aqkp+;#d{{c}U}j><3{7+$5+V5zx)zWk zRYoh+si~*NVoOEFGfnAwub&AT8S&j*)G{>jWF(W>tSski(<|$+i-gMl5h;;4dZ&2}Ov%U^rxFpHo~RFb~?_*8n9e3b%0!l(`lrj}$Ln}JhuQGf5r zz8Ew;DUXK7jN3GZrTipKGBmfSqD~j|(PV!NaTBtAv=?(F^}^bEd2H3@`C$D_iOz4Y z^;aiwxAx)L6(PvnF2wo*Zdak_5!T(->wYdm zD7VEGR^#UCn7=>ZW?H&)Xu;Q`(zic4B+ySA*Uk5)Haka+-BYG)*P!qvT>XGLp$ibT zDCno2YUe{dXAl$V?HL(G7IGvzh`-Gdlxkug9vx*{yE2y>$&uRg;@Z=eJ6V+AG3A>N zlY?r^Z>K2#S=Qwr%K?q-|LnAALz~~!C`zkPJyMQ#RT$9qTk1`J=tW*Qkby8CfiJ#S z#!nNfe{6n8$<4E+D}joM;?C8GWphHC6oG%Kjb{-=sZOdF!L1i%RenlXin0oW?K_K_5zoe~Cvf?>}K#X~tg0 z8&liZ9HKJ(LFFVG`?u6}?Xzr6SG<=$}7-8cry@Lagtl1zD}S zqq=}yot4W4s^w8Ts0}Jxa7!3Hff1KaQVKMh;}wcpm81>}nJ^S3WH>qoz5OtKYb(}X zZ8YEFEVC4}-XJT(#2--OmCG0ONKER$Y@OPQyBEgttVGsp<^WPaGm4)4Rk+brtnCe7 z4oG_*_wnUynx^8@&tsJ8#gATz4IE^-?9|!Q?e}+p^Dmi0sE4Zs&JV{z6cQG>vgD>Oqj z=hNhY%~gv|B00&y>OUi*D{}+OQuFm!2oNJZ6<+DdY{_=B9n*`NQ<>$| zS?DYd*?e#Ety!X4I_StHVM5;o@dHkEgprQJ)Gg9-Bwtc(lt!~9-cB#*F|NZ93?982 zgqN@iRR1+;3<&kbyX6EA74>T{X;>i{8bjpX^Zo8Cd|1y?LZK#B&wVrr5P;M$WPdG_ z(smYr_w!ME*m`(~Z*Ffxfuxj_qAICoc6X;G?(g51B$g~CGEs}>6nfbgu>0XB{`V5@ z>j`2-zI*40yDXtjxBzYV&~{WT;eBRPsp_-n}mq2spSHq?wcyN(Hn~G8!%C zLr{vp&)|o+CQzx{;%4<(7H3etdrm&4O_Xk8$t+M3VIY^PZ~8(t$7u`{x>zTVl}iz=(Ah!oq^@_Mive7egbfeSe^ryRa_5%@zTc-bI}w#h34jhq*b$dwQM-49}C z4t?g)at&oSqxd6q&u{`MYsfY?Hy3=!04M&*-8N9`QWlQbkhuBlf|M1ZuQTI?gP$Kv zL1C;au<*v1zJZh!&vhj@hb0wWJqvwombWflu#2&iJWq>N*7Y`t@sYeDMt>ozoDyy+Hs+gEDNEHuiTNC6kev5>|_+ z%19(BpH3qDevxk^-Ci%?LvhY2-O>GVH2}`f&CLy3VtR6*FJLZ9y&kb#hl(my$_W2( z#TL+ceJ5XAHLS>idY6vF81g5tb0?6S)7+z1JG>}5eSo$o8WCYC^JZBC<$b};y5!e7 zt^mRxsU`rYWnf}F!bCPJn;uH>N*p_MeV@Q6E&|V+n!mjBM$tn)& zxH$RRYNAS=JrtN!Y0(Zj?v!fsUHzV2phaHZr;cX53L04xZ-1C=NQdwFnKaMQR9kDZ zE|p-~ZN|Zo1}Yx07;e0pE4s!yP>lrexBdOzxw_;)(PSmA8(~^@SD$O#$oq1Q#ZH23(D(qN!iquo(`@D1pD4L92e1YqEFwsG=*ZK~(ec#|W3iKp zny?+{q8i`+B2jiOuyVs81~Pws1wZ<=sKul5Sbhg~DHsFthcfg7pSAt{6}WkMyQdoi zJDa>pM%@B~vu)@U;N?!F zfo?j6Pe9!v(ORuqWbLIf40xwqapV^Q;+C~F zvriKC1TE|Kv05}k5fC}K1jz^8un3Sf4EZ6)B9wFMU*@ITv4mBySvzp45Car2^6(Q2 zKl~A&G?5$h`A~ZM*0RFDNl?phnyT=9x zzXZ<95Zts~rEdDO7|As@^1d!(OX;Hp+bS5=-SH$zQ&5669@#F6^T!ai%CANh}zur zcjcPpRyU;+V9^mwJC{cp1l~VLqw_A?E}oqY79mbM>PEvWe#6o__sP)nymu#*25^~Y zSVTes{eOJ#dj0>t-IQGTQBNrijcB_!ljrpeSl*x_lhCVFLPNrM%D@;+P=L8TKZ&5{ r1J;E+r4@qHLcsqg!~ZvMFrCqurqM(d=7AvRe?dT3%Sf|I!!GK7OX9?` diff --git a/resources/assets/mekanism/textures/items/Stopwatch.png b/resources/assets/mekanism/textures/items/Stopwatch.png deleted file mode 100644 index 5eb565d81599cd27c1d3c8eee73c26eac3a2e1d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmV;|npipP+`qK?tJ3kR0MkBA0cWH#aAFJuPiF@Mkz)>@HMf(?My+Bzwv zym0<6z_lQi7mD)(h`n&>>-A3j0jS}cyJ|hFHRe``#{zu^Ak=zXZ2BQe$mat!WnVohphMx0A&FMfWpn5F6-ho&vvi$|G0hE0pWW{T1d3J!O lmQMZvsV(6Hkjjee02}Yv%$sQbKi~iW002ovPDHLkV1jLCWWxXe diff --git a/resources/assets/mekanism/textures/items/WeatherOrb.png b/resources/assets/mekanism/textures/items/WeatherOrb.png deleted file mode 100644 index 43f675bb0c1d07eba06b2c57cc70a2448ebbd531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDo+>3kcwN$KmPx>KkSgy7RcUX zm2kq+;rO9v_I5UZWExH@c~+_}`tYHUVWSwIJi7qbr~34r0S0>P9NpecA1{FVdQ&MBb@09~I!NB{r;