Designated WIP items/blocks, work on some new blocks and items
This commit is contained in:
parent
8ea21d98ae
commit
94a91829ec
11
.project
11
.project
|
@ -15,4 +15,15 @@
|
|||
<natures>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
<filteredResources>
|
||||
<filter>
|
||||
<id>1378220747136</id>
|
||||
<name></name>
|
||||
<type>6</type>
|
||||
<matcher>
|
||||
<id>org.eclipse.ui.ide.multiFilter</id>
|
||||
<arguments>1.0-name-matches-false-true-COPYING|COPYING.LESSER|README.md</arguments>
|
||||
</matcher>
|
||||
</filter>
|
||||
</filteredResources>
|
||||
</projectDescription>
|
||||
|
|
|
@ -76,7 +76,7 @@ public class BlockAlchemicalChest extends BlockEE {
|
|||
@Override
|
||||
public int getRenderType() {
|
||||
|
||||
return RenderIds.alchemicalChestRenderId;
|
||||
return RenderIds.alchemicalChestRender;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
56
common/com/pahimar/ee3/block/BlockAlchemyTable.java
Normal file
56
common/com/pahimar/ee3/block/BlockAlchemyTable.java
Normal file
|
@ -0,0 +1,56 @@
|
|||
package com.pahimar.ee3.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.tileentity.TileAlchemyTable;
|
||||
|
||||
public class BlockAlchemyTable extends BlockEE {
|
||||
|
||||
public BlockAlchemyTable(int id) {
|
||||
|
||||
super(id, Material.iron);
|
||||
this.setUnlocalizedName(Strings.ALCHEMY_TABLE_NAME);
|
||||
this.setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName() {
|
||||
|
||||
StringBuilder unlocalizedName = new StringBuilder();
|
||||
|
||||
unlocalizedName.append("tile.");
|
||||
unlocalizedName.append(Strings.RESOURCE_PREFIX);
|
||||
unlocalizedName.append(Strings.ALCHEMY_TABLE_NAME);
|
||||
|
||||
return unlocalizedName.toString();
|
||||
}
|
||||
|
||||
// TODO Finish getting the rendering nice looking
|
||||
// @Override
|
||||
// public boolean renderAsNormalBlock() {
|
||||
//
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean isOpaqueCube() {
|
||||
//
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public int getRenderType() {
|
||||
//
|
||||
// return RenderIds.alchemyTable;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world) {
|
||||
|
||||
return new TileAlchemyTable();
|
||||
}
|
||||
}
|
|
@ -80,7 +80,7 @@ public class BlockAludelBase extends BlockEE {
|
|||
@Override
|
||||
public int getRenderType() {
|
||||
|
||||
return RenderIds.aludelRenderId;
|
||||
return RenderIds.aludelRender;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -76,7 +76,7 @@ public class BlockCalcinator extends BlockEE {
|
|||
@Override
|
||||
public int getRenderType() {
|
||||
|
||||
return RenderIds.calcinatorRenderId;
|
||||
return RenderIds.calcinatorRender;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -74,7 +74,7 @@ public class BlockGlassBell extends BlockEE {
|
|||
@Override
|
||||
public int getRenderType() {
|
||||
|
||||
return RenderIds.glassBellId;
|
||||
return RenderIds.glassBell;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
57
common/com/pahimar/ee3/block/BlockRenderingTank.java
Normal file
57
common/com/pahimar/ee3/block/BlockRenderingTank.java
Normal file
|
@ -0,0 +1,57 @@
|
|||
package com.pahimar.ee3.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.tileentity.TileRenderingTank;
|
||||
|
||||
public class BlockRenderingTank extends BlockEE {
|
||||
|
||||
public BlockRenderingTank(int id) {
|
||||
|
||||
super(id, Material.anvil);
|
||||
this.setUnlocalizedName(Strings.RENDERING_TANK_NAME);
|
||||
this.setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName() {
|
||||
|
||||
StringBuilder unlocalizedName = new StringBuilder();
|
||||
|
||||
unlocalizedName.append("tile.");
|
||||
unlocalizedName.append(Strings.RESOURCE_PREFIX);
|
||||
unlocalizedName.append(Strings.RENDERING_TANK_NAME);
|
||||
|
||||
return unlocalizedName.toString();
|
||||
}
|
||||
|
||||
// TODO Finish getting the rendering nice looking
|
||||
// @Override
|
||||
// public boolean renderAsNormalBlock() {
|
||||
//
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean isOpaqueCube() {
|
||||
//
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public int getRenderType() {
|
||||
//
|
||||
// return RenderIds.renderingTank;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world) {
|
||||
|
||||
return new TileRenderingTank();
|
||||
}
|
||||
|
||||
}
|
|
@ -25,6 +25,8 @@ public class ModBlocks {
|
|||
public static Block aludelBase;
|
||||
public static Block alchemicalChest;
|
||||
public static Block glassBell;
|
||||
public static Block alchemyTable;
|
||||
public static Block renderingTank;
|
||||
public static Block redWaterStill;
|
||||
public static Block redWaterFlowing;
|
||||
|
||||
|
@ -34,6 +36,8 @@ public class ModBlocks {
|
|||
aludelBase = new BlockAludelBase(BlockIds.ALUDEL_BASE);
|
||||
alchemicalChest = new BlockAlchemicalChest(BlockIds.ALCHEMICAL_CHEST);
|
||||
glassBell = new BlockGlassBell(BlockIds.GLASS_BELL);
|
||||
alchemyTable = new BlockAlchemyTable(BlockIds.ALCHEMY_TABLE);
|
||||
renderingTank = new BlockRenderingTank(BlockIds.RENDERING_TANK);
|
||||
redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL);
|
||||
redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1);
|
||||
|
||||
|
@ -41,6 +45,8 @@ public class ModBlocks {
|
|||
GameRegistry.registerBlock(aludelBase, Strings.ALUDEL_NAME);
|
||||
GameRegistry.registerBlock(alchemicalChest, Strings.ALCHEMICAL_CHEST_NAME);
|
||||
GameRegistry.registerBlock(glassBell, Strings.GLASS_BELL_NAME);
|
||||
GameRegistry.registerBlock(alchemyTable, Strings.ALCHEMY_TABLE_NAME);
|
||||
GameRegistry.registerBlock(renderingTank, Strings.RENDERING_TANK_NAME);
|
||||
//GameRegistry.registerBlock(redWaterStill, Strings.RED_WATER_STILL_NAME);
|
||||
//GameRegistry.registerBlock(redWaterFlowing, Strings.RED_WATER_FLOWING_NAME);
|
||||
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
package com.pahimar.ee3.client.gui.inventory;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
||||
import com.pahimar.ee3.inventory.ContainerAlchemyTable;
|
||||
import com.pahimar.ee3.tileentity.TileAlchemyTable;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiAlchemyTable extends GuiContainer {
|
||||
|
||||
private TileAlchemyTable tileAlchemyTable;
|
||||
|
||||
public GuiAlchemyTable(InventoryPlayer inventoryPlayer, TileAlchemyTable tileAlchemyTable) {
|
||||
|
||||
super(new ContainerAlchemyTable(inventoryPlayer, tileAlchemyTable));
|
||||
this.tileAlchemyTable = tileAlchemyTable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
}
|
10
common/com/pahimar/ee3/client/model/ModelAlchemyTable.java
Normal file
10
common/com/pahimar/ee3/client/model/ModelAlchemyTable.java
Normal file
|
@ -0,0 +1,10 @@
|
|||
package com.pahimar.ee3.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelAlchemyTable extends ModelBase {
|
||||
|
||||
}
|
26
common/com/pahimar/ee3/client/model/ModelRenderingTank.java
Normal file
26
common/com/pahimar/ee3/client/model/ModelRenderingTank.java
Normal file
|
@ -0,0 +1,26 @@
|
|||
package com.pahimar.ee3.client.model;
|
||||
|
||||
import com.pahimar.ee3.lib.Models;
|
||||
|
||||
import net.minecraftforge.client.model.AdvancedModelLoader;
|
||||
import net.minecraftforge.client.model.IModelCustom;
|
||||
|
||||
public class ModelRenderingTank {
|
||||
|
||||
private IModelCustom modelRenderingTank;
|
||||
|
||||
public ModelRenderingTank() {
|
||||
|
||||
modelRenderingTank = AdvancedModelLoader.loadModel(Models.RENDERING_TANK);
|
||||
}
|
||||
|
||||
public void render() {
|
||||
|
||||
modelRenderingTank.renderAll();
|
||||
}
|
||||
|
||||
public void renderPart(String partName) {
|
||||
|
||||
modelRenderingTank.renderPart(partName);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,46 @@
|
|||
package com.pahimar.ee3.client.renderer.tileentity;
|
||||
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.client.model.ModelRenderingTank;
|
||||
import com.pahimar.ee3.lib.Textures;
|
||||
import com.pahimar.ee3.tileentity.TileRenderingTank;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TileEntityRenderingTankRenderer extends TileEntitySpecialRenderer {
|
||||
|
||||
private ModelRenderingTank modelRenderingTank = new ModelRenderingTank();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) {
|
||||
|
||||
if (tileEntity instanceof TileRenderingTank) {
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
|
||||
// Scale, Translate, Rotate
|
||||
GL11.glScalef(1.0F, 1.0F, 1.0F);
|
||||
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.0F, (float) z + 1.2F);
|
||||
GL11.glRotatef(45F, 0F, 1F, 0F);
|
||||
GL11.glRotatef(-90F, 1F, 0F, 0F);
|
||||
|
||||
// Bind texture
|
||||
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_RENDERING_TANK);
|
||||
|
||||
// Render
|
||||
modelRenderingTank.render();
|
||||
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -81,6 +81,8 @@ public class ConfigurationHandler {
|
|||
BlockIds.ALUDEL_BASE = configuration.getBlock(Strings.ALUDEL_NAME, BlockIds.ALUDEL_BASE_DEFAULT).getInt(BlockIds.ALUDEL_BASE_DEFAULT);
|
||||
BlockIds.ALCHEMICAL_CHEST = configuration.getBlock(Strings.ALCHEMICAL_CHEST_NAME, BlockIds.ALCHEMICAL_CHEST_DEFAULT).getInt(BlockIds.ALCHEMICAL_CHEST_DEFAULT);
|
||||
BlockIds.GLASS_BELL = configuration.getBlock(Strings.GLASS_BELL_NAME, BlockIds.GLASS_BELL_DEFAULT).getInt(BlockIds.GLASS_BELL_DEFAULT);
|
||||
BlockIds.ALCHEMY_TABLE = configuration.getBlock(Strings.ALCHEMY_TABLE_NAME, BlockIds.ALCHEMY_TABLE_DEFAULT).getInt(BlockIds.ALCHEMY_TABLE_DEFAULT);
|
||||
BlockIds.RENDERING_TANK = configuration.getBlock(Strings.RENDERING_TANK_NAME, BlockIds.RENDERING_TANK_DEFAULT).getInt(BlockIds.RENDERING_TANK_DEFAULT);
|
||||
BlockIds.RED_WATER_STILL = configuration.getBlock(Strings.RED_WATER_STILL_NAME, BlockIds.RED_WATER_STILL_DEFAULT).getInt(BlockIds.RED_WATER_STILL_DEFAULT);
|
||||
|
||||
/* Block property configs */
|
||||
|
@ -100,6 +102,7 @@ public class ConfigurationHandler {
|
|||
ItemIds.PHILOSOPHERS_STONE = configuration.getItem(Strings.PHILOSOPHERS_STONE_NAME, ItemIds.PHILOSOPHERS_STONE_DEFAULT).getInt(ItemIds.PHILOSOPHERS_STONE_DEFAULT);
|
||||
ItemIds.ALCHEMICAL_DUST = configuration.getItem(Strings.ALCHEMICAL_DUST_NAME, ItemIds.ALCHEMICAL_DUST_DEFAULT).getInt(ItemIds.ALCHEMICAL_DUST_DEFAULT);
|
||||
ItemIds.ALCHEMICAL_BAG = configuration.getItem(Strings.ALCHEMICAL_BAG_NAME, ItemIds.ALCHEMICAL_BAG_DEFAULT).getInt(ItemIds.ALCHEMICAL_BAG_DEFAULT);
|
||||
ItemIds.ALCHEMICAL_CHALK = configuration.getItem(Strings.ALCHEMICAL_CHALK_NAME, ItemIds.ALCHEMICAL_CHALK_DEFAULT).getInt(ItemIds.ALCHEMICAL_CHALK_DEFAULT);
|
||||
|
||||
/* Item durability configs */
|
||||
ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY = configuration.get(CATEGORY_DURABILITY, ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY_CONFIGNAME, ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY_DEFAULT).getInt(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY_DEFAULT);
|
||||
|
|
|
@ -18,6 +18,7 @@ import com.pahimar.ee3.client.renderer.tileentity.TileEntityAlchemicalChestRende
|
|||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityAludelRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassBellRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityRenderingTankRenderer;
|
||||
import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler;
|
||||
import com.pahimar.ee3.core.handlers.KeyBindingHandler;
|
||||
import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler;
|
||||
|
@ -36,6 +37,7 @@ import com.pahimar.ee3.tileentity.TileAludel;
|
|||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
import com.pahimar.ee3.tileentity.TileEE;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
import com.pahimar.ee3.tileentity.TileRenderingTank;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
|
@ -90,15 +92,19 @@ public class ClientProxy extends CommonProxy {
|
|||
@Override
|
||||
public void initRenderingAndTextures() {
|
||||
|
||||
RenderIds.calcinatorRenderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.aludelRenderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.alchemicalChestRenderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.glassBellId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.calcinatorRender = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.aludelRender = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.alchemicalChestRender = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.glassBell = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.alchemyTable = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.renderingTank = RenderingRegistry.getNextAvailableRenderId();
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.ALUDEL_BASE, new ItemAludelRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.ALCHEMICAL_CHEST, new ItemAlchemicalChestRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_BELL, new ItemGlassBellRenderer());
|
||||
// TODO Alchemy Table item renderer
|
||||
// TODO Rendering Tank item renderer
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -110,6 +116,8 @@ public class ClientProxy extends CommonProxy {
|
|||
ClientRegistry.bindTileEntitySpecialRenderer(TileAludel.class, new TileEntityAludelRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileAlchemicalChest.class, new TileEntityAlchemicalChestRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileGlassBell.class, new TileEntityGlassBellRenderer());
|
||||
// TODO Alchemy Table TESR
|
||||
// FIXME Get Rorax to export faces as triangles: ClientRegistry.bindTileEntitySpecialRenderer(TileRenderingTank.class, new TileEntityRenderingTankRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -22,9 +22,11 @@ import com.pahimar.ee3.inventory.ContainerPortableTransmutation;
|
|||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.tileentity.TileAlchemicalChest;
|
||||
import com.pahimar.ee3.tileentity.TileAlchemyTable;
|
||||
import com.pahimar.ee3.tileentity.TileAludel;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
import com.pahimar.ee3.tileentity.TileRenderingTank;
|
||||
|
||||
import cpw.mods.fml.common.network.IGuiHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
@ -70,6 +72,8 @@ public class CommonProxy implements IGuiHandler {
|
|||
GameRegistry.registerTileEntity(TileAludel.class, Strings.TE_ALUDEL_NAME);
|
||||
GameRegistry.registerTileEntity(TileAlchemicalChest.class, Strings.TE_ALCHEMICAL_CHEST_NAME);
|
||||
GameRegistry.registerTileEntity(TileGlassBell.class, Strings.TE_GLASS_BELL_NAME);
|
||||
GameRegistry.registerTileEntity(TileAlchemyTable.class, Strings.TE_ALCHEMY_TABLE_NAME);
|
||||
GameRegistry.registerTileEntity(TileRenderingTank.class, Strings.TE_RENDERING_TANK_NAME);
|
||||
}
|
||||
|
||||
public void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit) {
|
||||
|
|
24
common/com/pahimar/ee3/inventory/ContainerAlchemyTable.java
Normal file
24
common/com/pahimar/ee3/inventory/ContainerAlchemyTable.java
Normal file
|
@ -0,0 +1,24 @@
|
|||
package com.pahimar.ee3.inventory;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
|
||||
import com.pahimar.ee3.tileentity.TileAlchemyTable;
|
||||
|
||||
public class ContainerAlchemyTable extends Container {
|
||||
|
||||
private TileAlchemyTable tileAlchemyTable;
|
||||
|
||||
public ContainerAlchemyTable(InventoryPlayer inventoryPlayer, TileAlchemyTable tileAlchemyTable) {
|
||||
|
||||
this.tileAlchemyTable = tileAlchemyTable;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer entityplayer) {
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
|
@ -268,16 +268,22 @@ public class CustomWrappedStack {
|
|||
}
|
||||
|
||||
try {
|
||||
hashCode = 37 * hashCode + itemStack.getItemName().hashCode();
|
||||
if (itemStack.getItemName() != null) {
|
||||
hashCode = 37 * hashCode + itemStack.getItemName().hashCode();
|
||||
}
|
||||
} catch (ArrayIndexOutOfBoundsException e) {
|
||||
|
||||
}
|
||||
}
|
||||
else if (oreStack != null) {
|
||||
hashCode = 37 * hashCode + oreStack.oreName.hashCode();
|
||||
if (oreStack.oreName != null) {
|
||||
hashCode = 37 * hashCode + oreStack.oreName.hashCode();
|
||||
}
|
||||
}
|
||||
else if (energyStack != null) {
|
||||
hashCode = 37 * hashCode + energyStack.energyName.hashCode();
|
||||
if (energyStack.energyName != null) {
|
||||
hashCode = 37 * hashCode + energyStack.energyName.hashCode();
|
||||
}
|
||||
}
|
||||
|
||||
return hashCode;
|
||||
|
|
15
common/com/pahimar/ee3/item/ItemAlchemicalChalk.java
Normal file
15
common/com/pahimar/ee3/item/ItemAlchemicalChalk.java
Normal file
|
@ -0,0 +1,15 @@
|
|||
package com.pahimar.ee3.item;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
public class ItemAlchemicalChalk extends ItemEE {
|
||||
|
||||
public ItemAlchemicalChalk(int id) {
|
||||
|
||||
super(id);
|
||||
this.setUnlocalizedName(Strings.RESOURCE_PREFIX + Strings.ALCHEMICAL_CHALK_NAME);
|
||||
this.setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
}
|
||||
|
||||
}
|
|
@ -26,6 +26,7 @@ public class ModItems {
|
|||
public static Item philStone;
|
||||
public static Item alchemicalDust;
|
||||
public static Item alchemicalBag;
|
||||
public static Item alchemicalChalk;
|
||||
|
||||
public static void init() {
|
||||
|
||||
|
@ -36,10 +37,13 @@ public class ModItems {
|
|||
philStone = new ItemPhilosophersStone(ItemIds.PHILOSOPHERS_STONE);
|
||||
alchemicalDust = new ItemAlchemicalDust(ItemIds.ALCHEMICAL_DUST);
|
||||
alchemicalBag = new ItemAlchemicalBag(ItemIds.ALCHEMICAL_BAG);
|
||||
alchemicalChalk = new ItemAlchemicalChalk(ItemIds.ALCHEMICAL_CHALK);
|
||||
|
||||
miniumStone.setContainerItem(miniumStone);
|
||||
philStone.setContainerItem(philStone);
|
||||
|
||||
// TODO Register items with the GameRegistry
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(inertStone), new Object[] { "sis", "igi", "sis", Character.valueOf('s'), Block.stone, Character.valueOf('i'), Item.ingotIron, Character.valueOf('g'), Item.ingotGold });
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(miniumStone), new Object[] { "sss", "sis", "sss", Character.valueOf('s'), miniumShard, Character.valueOf('i'), inertStone });
|
||||
|
|
|
@ -17,6 +17,8 @@ public class BlockIds {
|
|||
public static int ALUDEL_BASE_DEFAULT = 2454;
|
||||
public static int ALCHEMICAL_CHEST_DEFAULT = 2455;
|
||||
public static int GLASS_BELL_DEFAULT = 2456;
|
||||
public static int ALCHEMY_TABLE_DEFAULT = 2457;
|
||||
public static int RENDERING_TANK_DEFAULT = 2458;
|
||||
|
||||
/* Current block ids */
|
||||
public static int CALCINATOR;
|
||||
|
@ -24,5 +26,7 @@ public class BlockIds {
|
|||
public static int ALCHEMICAL_CHEST;
|
||||
public static int RED_WATER_STILL;
|
||||
public static int GLASS_BELL;
|
||||
public static int ALCHEMY_TABLE;
|
||||
public static int RENDERING_TANK;
|
||||
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@ public class ItemIds {
|
|||
public static int PHILOSOPHERS_STONE_DEFAULT = 27003;
|
||||
public static int ALCHEMICAL_DUST_DEFAULT = 27004;
|
||||
public static int ALCHEMICAL_BAG_DEFAULT = 27005;
|
||||
public static int ALCHEMICAL_CHALK_DEFAULT = 27006;
|
||||
|
||||
/* Current item ids */
|
||||
public static int MINIUM_SHARD;
|
||||
|
@ -26,5 +27,6 @@ public class ItemIds {
|
|||
public static int PHILOSOPHERS_STONE;
|
||||
public static int ALCHEMICAL_DUST;
|
||||
public static int ALCHEMICAL_BAG;
|
||||
public static int ALCHEMICAL_CHALK;
|
||||
|
||||
}
|
||||
|
|
|
@ -8,4 +8,7 @@ public class Models {
|
|||
public static final String ALUDEL = MODEL_LOCATION + "aludel.obj";
|
||||
public static final String CALCINATOR = MODEL_LOCATION + "calcinator.obj";
|
||||
public static final String GLASS_BELL = MODEL_LOCATION + "aludel.obj";
|
||||
public static final String ALCHEMY_TABLE = MODEL_LOCATION + "alchemyTable.obj";
|
||||
public static final String RENDERING_TANK = MODEL_LOCATION + "renderingTank.obj";
|
||||
|
||||
}
|
||||
|
|
|
@ -11,8 +11,11 @@ package com.pahimar.ee3.lib;
|
|||
*/
|
||||
public class RenderIds {
|
||||
|
||||
public static int calcinatorRenderId;
|
||||
public static int aludelRenderId;
|
||||
public static int alchemicalChestRenderId;
|
||||
public static int glassBellId;
|
||||
public static int calcinatorRender;
|
||||
public static int aludelRender;
|
||||
public static int alchemicalChestRender;
|
||||
public static int glassBell;
|
||||
public static int alchemyTable;
|
||||
public static int renderingTank;
|
||||
|
||||
}
|
||||
|
|
|
@ -65,6 +65,7 @@ public class Strings {
|
|||
public static final String RED_WATER_STILL_NAME = "redWaterStill";
|
||||
public static final String RED_WATER_FLOWING_NAME = "redWaterFlowing";
|
||||
public static final String ALCHEMY_TABLE_NAME = "alchemyTable";
|
||||
public static final String RENDERING_TANK_NAME = "renderingTank";
|
||||
|
||||
/* Item name constants */
|
||||
public static final String MINIUM_SHARD_NAME = "shardMinium";
|
||||
|
@ -73,6 +74,7 @@ public class Strings {
|
|||
public static final String PHILOSOPHERS_STONE_NAME = "stonePhilosophers";
|
||||
public static final String ALCHEMICAL_DUST_NAME = "alchemicalDust";
|
||||
public static final String ALCHEMICAL_BAG_NAME = "alchemicalBag";
|
||||
public static final String ALCHEMICAL_CHALK_NAME = "alchemicalChalk";
|
||||
|
||||
/* TileEntity name constants */
|
||||
public static final String TE_CALCINATOR_NAME = "tileCalcinator";
|
||||
|
@ -80,6 +82,7 @@ public class Strings {
|
|||
public static final String TE_ALCHEMICAL_CHEST_NAME = "tileAlchemicalChest";
|
||||
public static final String TE_GLASS_BELL_NAME = "tileGlassBell";
|
||||
public static final String TE_ALCHEMY_TABLE_NAME = "tileAlchemyTable";
|
||||
public static final String TE_RENDERING_TANK_NAME = "tileRenderingTank";
|
||||
|
||||
/* Transmutation cost related constants */
|
||||
public static final String TRANSMUTATION_COST = "_cost";
|
||||
|
@ -96,4 +99,5 @@ public class Strings {
|
|||
public static final String CONTAINER_INVENTORY = "container.inventory";
|
||||
public static final String CONTAINER_PORTABLE_CRAFTING = "container.crafting";
|
||||
public static final String CONTAINER_ALCHEMY_TABLE = "container.ee3:" + ALCHEMY_TABLE_NAME;
|
||||
public static final String CONTAINER_RENDERING_TANK = "container.ee3:" + RENDERING_TANK_NAME;
|
||||
}
|
||||
|
|
|
@ -36,12 +36,16 @@ public class Textures {
|
|||
public static final ResourceLocation GUI_PORTABLE_CRAFTING = new ResourceLocation("textures/gui/container/crafting_table.png");
|
||||
public static final ResourceLocation GUI_PORTABLE_TRANSMUTATION = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "portableTransmutation.png");
|
||||
public static final ResourceLocation GUI_GLASS_BELL = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "glassBell.png");
|
||||
public static final ResourceLocation GUI_ALCHEMY_TABLE = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "alchemyTable.png");
|
||||
public static final ResourceLocation GUI_RENDERING_TANK = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "renderingTank.png");
|
||||
|
||||
// Model textures
|
||||
public static final ResourceLocation MODEL_CALCINATOR = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "calcinator.png");
|
||||
public static final ResourceLocation MODEL_ALUDEL = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "aludel.png");
|
||||
public static final ResourceLocation MODEL_ALCHEMICAL_CHEST = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "alchemicalChest.png");
|
||||
public static final ResourceLocation MODEL_GLASS_BELL = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "aludel.png");
|
||||
public static final ResourceLocation MODEL_ALCHEMY_TABLE = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "alchemyTable.png");
|
||||
public static final ResourceLocation MODEL_RENDERING_TANK = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "renderingTank.png");
|
||||
|
||||
// Effect textures
|
||||
public static final ResourceLocation EFFECT_WORLD_TRANSMUTATION = ResourceLocationHelper.getResourceLocation(EFFECTS_LOCATION + "noise.png");
|
||||
|
|
|
@ -54,23 +54,23 @@ public class TileAlchemicalChest extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot) {
|
||||
public ItemStack getStackInSlot(int slotIndex) {
|
||||
|
||||
return inventory[slot];
|
||||
return inventory[slotIndex];
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int amount) {
|
||||
public ItemStack decrStackSize(int slotIndex, int decrementAmount) {
|
||||
|
||||
ItemStack itemStack = getStackInSlot(slot);
|
||||
ItemStack itemStack = getStackInSlot(slotIndex);
|
||||
if (itemStack != null) {
|
||||
if (itemStack.stackSize <= amount) {
|
||||
setInventorySlotContents(slot, null);
|
||||
if (itemStack.stackSize <= decrementAmount) {
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
else {
|
||||
itemStack = itemStack.splitStack(amount);
|
||||
itemStack = itemStack.splitStack(decrementAmount);
|
||||
if (itemStack.stackSize == 0) {
|
||||
setInventorySlotContents(slot, null);
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -79,11 +79,11 @@ public class TileAlchemicalChest extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
public ItemStack getStackInSlotOnClosing(int slotIndex) {
|
||||
|
||||
if (inventory[slot] != null) {
|
||||
ItemStack itemStack = inventory[slot];
|
||||
inventory[slot] = null;
|
||||
if (inventory[slotIndex] != null) {
|
||||
ItemStack itemStack = inventory[slotIndex];
|
||||
inventory[slotIndex] = null;
|
||||
return itemStack;
|
||||
}
|
||||
else
|
||||
|
@ -91,9 +91,9 @@ public class TileAlchemicalChest extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack itemStack) {
|
||||
public void setInventorySlotContents(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
inventory[slot] = itemStack;
|
||||
inventory[slotIndex] = itemStack;
|
||||
|
||||
if (itemStack != null && itemStack.stackSize > this.getInventoryStackLimit()) {
|
||||
itemStack.stackSize = this.getInventoryStackLimit();
|
||||
|
@ -203,9 +203,9 @@ public class TileAlchemicalChest extends TileEE implements IInventory {
|
|||
inventory = new ItemStack[this.getSizeInventory()];
|
||||
for (int i = 0; i < tagList.tagCount(); ++i) {
|
||||
NBTTagCompound tagCompound = (NBTTagCompound) tagList.tagAt(i);
|
||||
byte slot = tagCompound.getByte("Slot");
|
||||
if (slot >= 0 && slot < inventory.length) {
|
||||
inventory[slot] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
byte slotIndex = tagCompound.getByte("Slot");
|
||||
if (slotIndex >= 0 && slotIndex < inventory.length) {
|
||||
inventory[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -236,7 +236,7 @@ public class TileAlchemicalChest extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int side, ItemStack itemStack) {
|
||||
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
78
common/com/pahimar/ee3/tileentity/TileAlchemyTable.java
Normal file
78
common/com/pahimar/ee3/tileentity/TileAlchemyTable.java
Normal file
|
@ -0,0 +1,78 @@
|
|||
package com.pahimar.ee3.tileentity;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class TileAlchemyTable extends TileEE implements IInventory {
|
||||
|
||||
public TileAlchemyTable() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSizeInventory() {
|
||||
// TODO Auto-generated method stub
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slotIndex) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slotIndex, int decrementAmount) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slotIndex) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slotIndex, ItemStack itemstack) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInvName() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInvNameLocalized() {
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInventoryStackLimit() {
|
||||
// TODO Auto-generated method stub
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openChest() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void closeChest() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) {
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
|
@ -46,23 +46,23 @@ public class TileAludel extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot) {
|
||||
public ItemStack getStackInSlot(int slotIndex) {
|
||||
|
||||
return inventory[slot];
|
||||
return inventory[slotIndex];
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int amount) {
|
||||
public ItemStack decrStackSize(int slotIndex, int decrementAmount) {
|
||||
|
||||
ItemStack itemStack = getStackInSlot(slot);
|
||||
ItemStack itemStack = getStackInSlot(slotIndex);
|
||||
if (itemStack != null) {
|
||||
if (itemStack.stackSize <= amount) {
|
||||
setInventorySlotContents(slot, null);
|
||||
if (itemStack.stackSize <= decrementAmount) {
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
else {
|
||||
itemStack = itemStack.splitStack(amount);
|
||||
itemStack = itemStack.splitStack(decrementAmount);
|
||||
if (itemStack.stackSize == 0) {
|
||||
setInventorySlotContents(slot, null);
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -71,19 +71,19 @@ public class TileAludel extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
public ItemStack getStackInSlotOnClosing(int slotIndex) {
|
||||
|
||||
ItemStack itemStack = getStackInSlot(slot);
|
||||
ItemStack itemStack = getStackInSlot(slotIndex);
|
||||
if (itemStack != null) {
|
||||
setInventorySlotContents(slot, null);
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
return itemStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack itemStack) {
|
||||
public void setInventorySlotContents(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
inventory[slot] = itemStack;
|
||||
inventory[slotIndex] = itemStack;
|
||||
if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) {
|
||||
itemStack.stackSize = getInventoryStackLimit();
|
||||
}
|
||||
|
@ -121,9 +121,9 @@ public class TileAludel extends TileEE implements IInventory {
|
|||
inventory = new ItemStack[this.getSizeInventory()];
|
||||
for (int i = 0; i < tagList.tagCount(); ++i) {
|
||||
NBTTagCompound tagCompound = (NBTTagCompound) tagList.tagAt(i);
|
||||
byte slot = tagCompound.getByte("Slot");
|
||||
if (slot >= 0 && slot < inventory.length) {
|
||||
inventory[slot] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
byte slotIndex = tagCompound.getByte("Slot");
|
||||
if (slotIndex >= 0 && slotIndex < inventory.length) {
|
||||
inventory[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -153,7 +153,7 @@ public class TileAludel extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int i, ItemStack itemstack) {
|
||||
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -47,23 +47,23 @@ public class TileCalcinator extends TileEE implements IInventory {
|
|||
* Returns the stack in slot i
|
||||
*/
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot) {
|
||||
public ItemStack getStackInSlot(int slotIndex) {
|
||||
|
||||
return inventory[slot];
|
||||
return inventory[slotIndex];
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int amount) {
|
||||
public ItemStack decrStackSize(int slotIndex, int decrementAmount) {
|
||||
|
||||
ItemStack itemStack = getStackInSlot(slot);
|
||||
ItemStack itemStack = getStackInSlot(slotIndex);
|
||||
if (itemStack != null) {
|
||||
if (itemStack.stackSize <= amount) {
|
||||
setInventorySlotContents(slot, null);
|
||||
if (itemStack.stackSize <= decrementAmount) {
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
else {
|
||||
itemStack = itemStack.splitStack(amount);
|
||||
itemStack = itemStack.splitStack(decrementAmount);
|
||||
if (itemStack.stackSize == 0) {
|
||||
setInventorySlotContents(slot, null);
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -72,19 +72,19 @@ public class TileCalcinator extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
public ItemStack getStackInSlotOnClosing(int slotIndex) {
|
||||
|
||||
ItemStack itemStack = getStackInSlot(slot);
|
||||
ItemStack itemStack = getStackInSlot(slotIndex);
|
||||
if (itemStack != null) {
|
||||
setInventorySlotContents(slot, null);
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
return itemStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack itemStack) {
|
||||
public void setInventorySlotContents(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
inventory[slot] = itemStack;
|
||||
inventory[slotIndex] = itemStack;
|
||||
if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) {
|
||||
itemStack.stackSize = getInventoryStackLimit();
|
||||
}
|
||||
|
@ -122,9 +122,9 @@ public class TileCalcinator extends TileEE implements IInventory {
|
|||
inventory = new ItemStack[this.getSizeInventory()];
|
||||
for (int i = 0; i < tagList.tagCount(); ++i) {
|
||||
NBTTagCompound tagCompound = (NBTTagCompound) tagList.tagAt(i);
|
||||
byte slot = tagCompound.getByte("Slot");
|
||||
if (slot >= 0 && slot < inventory.length) {
|
||||
inventory[slot] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
byte slotIndex = tagCompound.getByte("Slot");
|
||||
if (slotIndex >= 0 && slotIndex < inventory.length) {
|
||||
inventory[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -154,7 +154,7 @@ public class TileCalcinator extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int i, ItemStack itemstack) {
|
||||
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -34,23 +34,23 @@ public class TileGlassBell extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot) {
|
||||
public ItemStack getStackInSlot(int slotIndex) {
|
||||
|
||||
return inventory[slot];
|
||||
return inventory[slotIndex];
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int amount) {
|
||||
public ItemStack decrStackSize(int slotIndex, int decrementAmount) {
|
||||
|
||||
ItemStack itemStack = getStackInSlot(slot);
|
||||
ItemStack itemStack = getStackInSlot(slotIndex);
|
||||
if (itemStack != null) {
|
||||
if (itemStack.stackSize <= amount) {
|
||||
setInventorySlotContents(slot, null);
|
||||
if (itemStack.stackSize <= decrementAmount) {
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
else {
|
||||
itemStack = itemStack.splitStack(amount);
|
||||
itemStack = itemStack.splitStack(decrementAmount);
|
||||
if (itemStack.stackSize == 0) {
|
||||
setInventorySlotContents(slot, null);
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -59,19 +59,19 @@ public class TileGlassBell extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
public ItemStack getStackInSlotOnClosing(int slotIndex) {
|
||||
|
||||
ItemStack itemStack = getStackInSlot(slot);
|
||||
ItemStack itemStack = getStackInSlot(slotIndex);
|
||||
if (itemStack != null) {
|
||||
setInventorySlotContents(slot, null);
|
||||
setInventorySlotContents(slotIndex, null);
|
||||
}
|
||||
return itemStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack itemStack) {
|
||||
public void setInventorySlotContents(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
inventory[slot] = itemStack;
|
||||
inventory[slotIndex] = itemStack;
|
||||
if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) {
|
||||
itemStack.stackSize = getInventoryStackLimit();
|
||||
}
|
||||
|
@ -109,9 +109,9 @@ public class TileGlassBell extends TileEE implements IInventory {
|
|||
inventory = new ItemStack[this.getSizeInventory()];
|
||||
for (int i = 0; i < tagList.tagCount(); ++i) {
|
||||
NBTTagCompound tagCompound = (NBTTagCompound) tagList.tagAt(i);
|
||||
byte slot = tagCompound.getByte("Slot");
|
||||
if (slot >= 0 && slot < inventory.length) {
|
||||
inventory[slot] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
byte slotIndex = tagCompound.getByte("Slot");
|
||||
if (slotIndex >= 0 && slotIndex < inventory.length) {
|
||||
inventory[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -141,7 +141,7 @@ public class TileGlassBell extends TileEE implements IInventory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int i, ItemStack itemstack) {
|
||||
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
8
common/com/pahimar/ee3/tileentity/TileRenderingTank.java
Normal file
8
common/com/pahimar/ee3/tileentity/TileRenderingTank.java
Normal file
|
@ -0,0 +1,8 @@
|
|||
package com.pahimar.ee3.tileentity;
|
||||
|
||||
public class TileRenderingTank extends TileEE {
|
||||
|
||||
public TileRenderingTank() {
|
||||
|
||||
}
|
||||
}
|
|
@ -8,29 +8,34 @@ key.charge=Charge
|
|||
item.ee3:shardMinium.name=Shard of Minium
|
||||
item.ee3:stoneInert.name=Inert Stone
|
||||
item.ee3:stoneMinium.name=Minium Stone
|
||||
item.ee3:stonePhilosophers.name=Philosopher's Stone
|
||||
item.ee3:alchemicalDustAsh.name=Ash
|
||||
item.ee3:alchemicalDustMinium.name=Minium Dust
|
||||
item.ee3:alchemicalDustVerdant.name=Verdant Dust
|
||||
item.ee3:alchemicalDustAzure.name=Azure Dust
|
||||
item.ee3:alchemicalDustAmaranthine.name=Amaranthine Dust
|
||||
item.ee3:alchemicalDustIridescent.name=Iridescent Dust
|
||||
item.ee3:alchemicalBag.name=Alchemical Bag
|
||||
item.ee3:stonePhilosophers.name=Philosopher's Stone [WIP]
|
||||
item.ee3:alchemicalDustAsh.name=Ash [WIP]
|
||||
item.ee3:alchemicalDustMinium.name=Minium Dust [WIP]
|
||||
item.ee3:alchemicalDustVerdant.name=Verdant Dust [WIP]
|
||||
item.ee3:alchemicalDustAzure.name=Azure Dust [WIP]
|
||||
item.ee3:alchemicalDustAmaranthine.name=Amaranthine Dust [WIP]
|
||||
item.ee3:alchemicalDustIridescent.name=Iridescent Dust [WIP]
|
||||
item.ee3:alchemicalBag.name=Alchemical Bag [WIP]
|
||||
item.ee3:alchemicalChalk.name=Alchemical Chalk [WIP]
|
||||
|
||||
# Block localizations
|
||||
tile.ee3:redWaterStill.name=Red Water (Still)
|
||||
tile.ee3:redWaterFlowing.name=Red Water (Flowing)
|
||||
tile.ee3:calcinator.name=Calcinator
|
||||
tile.ee3:aludel.name=Aludel
|
||||
tile.ee3:alchemicalChest.name=Alchemical Chest
|
||||
tile.ee3:glassBell.name=Glass Bell
|
||||
tile.ee3:calcinator.name=Calcinator [WIP]
|
||||
tile.ee3:aludel.name=Aludel [WIP]
|
||||
tile.ee3:alchemicalChest.name=Alchemical Chest [WIP]
|
||||
tile.ee3:glassBell.name=Glass Bell [WIP]
|
||||
tile.ee3:alchemyTable.name=Alchemy Table [WIP]
|
||||
tile.ee3:renderingTank.name=Rendering Tank [WIP]
|
||||
|
||||
# GUI localizations
|
||||
container.ee3:calcinator=Calcinator
|
||||
container.ee3:aludel=Aludel
|
||||
container.ee3:alchemicalChest=Alchemical Chest
|
||||
container.ee3:alchemicalBag=Alchemical Bag
|
||||
container.ee3:glassBell=Glass Bell
|
||||
container.ee3:calcinator=Calcinator [WIP]
|
||||
container.ee3:aludel=Aludel [WIP]
|
||||
container.ee3:alchemicalChest=Alchemical Chest [WIP]
|
||||
container.ee3:alchemicalBag=Alchemical Bag [WIP]
|
||||
container.ee3:glassBell=Glass Bell [WIP]
|
||||
container.ee3:alchemyTable.name=Alchemy Table [WIP]
|
||||
container.ee3:renderingTank.name=Rendering Tank [WIP]
|
||||
|
||||
# Command localizations
|
||||
command.ee3:overlay.turned_on=Target transmutation overlay turned on
|
||||
|
|
1217
resources/assets/ee3/models/renderingTank.obj
Normal file
1217
resources/assets/ee3/models/renderingTank.obj
Normal file
File diff suppressed because it is too large
Load diff
Before Width: | Height: | Size: 287 B After Width: | Height: | Size: 287 B |
BIN
resources/assets/ee3/textures/items/eggShell.png
Normal file
BIN
resources/assets/ee3/textures/items/eggShell.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
resources/assets/ee3/textures/models/renderingTank.png
Normal file
BIN
resources/assets/ee3/textures/models/renderingTank.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
Loading…
Reference in a new issue