Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal.
This commit is contained in:
Aidan C. Brady
parent
a19c4401af
commit
91a8839203
20 changed files with 53 additions and 575 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -444,13 +439,6 @@ public class Mekanism
|
|||
}));
|
||||
}
|
||||
|
||||
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);
|
||||
FurnaceRecipes.smelting().addSmelting(Dust.itemID, 2, 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");
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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<ItemStack, ItemStack>();
|
||||
}
|
||||
|
||||
@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;
|
||||
}
|
||||
}
|
||||
|
|
@ -190,36 +190,34 @@ public final class TransporterUtils
|
|||
ISidedInventory sidedInventory = (ISidedInventory) inventory;
|
||||
int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.getOrientation(side).getOpposite().ordinal());
|
||||
|
||||
if(slots == null || slots.length == 0)
|
||||
if(slots != null && slots.length != 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
for(int get = 0; get <= slots.length - 1; get++)
|
||||
{
|
||||
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);
|
||||
int slotID = slots[get];
|
||||
|
||||
if(inSlot == null)
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -274,45 +272,43 @@ public final class TransporterUtils
|
|||
ISidedInventory sidedInventory = (ISidedInventory) inventory;
|
||||
int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.getOrientation(side).getOpposite().ordinal());
|
||||
|
||||
if(slots == null || slots.length == 0)
|
||||
if(slots != null && slots.length != 0)
|
||||
{
|
||||
return itemStack;
|
||||
}
|
||||
|
||||
for(int get = 0; get <= slots.length - 1; get++)
|
||||
{
|
||||
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);
|
||||
int slotID = slots[get];
|
||||
|
||||
if(inSlot == null)
|
||||
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();
|
||||
else if(inSlot.isItemEqual(itemStack) && inSlot.stackSize < inSlot.getMaxStackSize())
|
||||
{
|
||||
if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize())
|
||||
{
|
||||
ItemStack toSet = itemStack.copy();
|
||||
toSet.stackSize += inSlot.stackSize;
|
||||
|
||||
ItemStack toSet = itemStack.copy();
|
||||
toSet.stackSize = inSlot.getMaxStackSize();
|
||||
inventory.setInventorySlotContents(slotID, toSet);
|
||||
return null;
|
||||
}
|
||||
else {
|
||||
int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize();
|
||||
|
||||
ItemStack remains = itemStack.copy();
|
||||
remains.stackSize = rejects;
|
||||
ItemStack toSet = itemStack.copy();
|
||||
toSet.stackSize = inSlot.getMaxStackSize();
|
||||
|
||||
inventory.setInventorySlotContents(slotID, toSet);
|
||||
return remains;
|
||||
ItemStack remains = itemStack.copy();
|
||||
remains.stackSize = rejects;
|
||||
|
||||
inventory.setInventorySlotContents(slotID, toSet);
|
||||
return remains;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 5.4 KiB |
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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=精英工厂
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 235 B |
Binary file not shown.
|
Before Width: | Height: | Size: 179 B |
Loading…
Reference in a new issue