Fix Electric Pump model, fix Chemical Crystalizer operation
This commit is contained in:
parent
eae1364b7e
commit
214be2bbba
4 changed files with 23 additions and 20 deletions
|
@ -1,10 +1,10 @@
|
|||
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;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelElectricPump extends ModelBase
|
||||
|
@ -20,6 +20,7 @@ public class ModelElectricPump extends ModelBase
|
|||
ModelRenderer Ring1;
|
||||
ModelRenderer Ring2;
|
||||
ModelRenderer Plug;
|
||||
ModelRenderer Ring3;
|
||||
|
||||
public ModelElectricPump()
|
||||
{
|
||||
|
@ -57,8 +58,8 @@ public class ModelElectricPump extends ModelBase
|
|||
Panel3.mirror = true;
|
||||
setRotation(Panel3, 0F, 0F, 0.5585054F);
|
||||
Body = new ModelRenderer(this, 30, 17);
|
||||
Body.addBox(0F, 0F, 0F, 6, 11, 6);
|
||||
Body.setRotationPoint(-3F, 8F, -3F);
|
||||
Body.addBox(0F, 0F, 0F, 6, 10, 6);
|
||||
Body.setRotationPoint(-3F, 9F, -3F);
|
||||
Body.setTextureSize(64, 64);
|
||||
Body.mirror = true;
|
||||
setRotation(Body, 0F, 0F, 0F);
|
||||
|
@ -92,6 +93,12 @@ public class ModelElectricPump extends ModelBase
|
|||
Plug.setTextureSize(64, 64);
|
||||
Plug.mirror = true;
|
||||
setRotation(Plug, 0F, 0F, 0F);
|
||||
Ring3 = new ModelRenderer(this, 0, 35);
|
||||
Ring3.addBox(0F, 0F, 0F, 8, 1, 8);
|
||||
Ring3.setRotationPoint(-4F, 8F, -4F);
|
||||
Ring3.setTextureSize(64, 64);
|
||||
Ring3.mirror = true;
|
||||
setRotation(Ring3, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
public void render(float size)
|
||||
|
@ -107,6 +114,7 @@ public class ModelElectricPump extends ModelBase
|
|||
Ring1.render(size);
|
||||
Ring2.render(size);
|
||||
Plug.render(size);
|
||||
Ring3.render(size);
|
||||
}
|
||||
|
||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||
|
|
|
@ -256,7 +256,7 @@ public final class RecipeHandler
|
|||
{
|
||||
GasStack key = (GasStack)entry.getKey();
|
||||
|
||||
if(key != null && key.getGas() == gas.getGas() && key.amount >= gas.amount)
|
||||
if(key != null && key.getGas() == gas.getGas() && gas.amount >= key.amount)
|
||||
{
|
||||
gasTank.draw(key.amount, removeGas);
|
||||
|
||||
|
|
|
@ -174,17 +174,12 @@ public class TileEntityChemicalCrystalizer extends TileEntityElectricBlock imple
|
|||
{
|
||||
ItemStack itemstack = RecipeHandler.getChemicalCrystalizerOutput(inputTank, true);
|
||||
|
||||
if(inventory[0].stackSize <= 0)
|
||||
if(inventory[1] == null)
|
||||
{
|
||||
inventory[0] = null;
|
||||
}
|
||||
|
||||
if(inventory[2] == null)
|
||||
{
|
||||
inventory[2] = itemstack;
|
||||
inventory[1] = itemstack;
|
||||
}
|
||||
else {
|
||||
inventory[2].stackSize += itemstack.stackSize;
|
||||
inventory[1].stackSize += itemstack.stackSize;
|
||||
}
|
||||
|
||||
onInventoryChanged();
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 3.2 KiB |
Loading…
Reference in a new issue