It's amazing how much you have to change when you want to rename something :-p
This commit is contained in:
pahimar
parent
d5bc8d927b
commit
390a637b89
34 changed files with 141 additions and 156 deletions
|
|
@ -59,26 +59,14 @@ import cpw.mods.fml.relauncher.Side;
|
|||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
|
||||
@Mod(
|
||||
modid = Reference.MOD_ID,
|
||||
name = Reference.MOD_NAME,
|
||||
version = Reference.VERSION_NUMBER,
|
||||
dependencies = Reference.DEPENDENCIES,
|
||||
certificateFingerprint = Reference.FINGERPRINT)
|
||||
@NetworkMod(
|
||||
channels = { Reference.CHANNEL_NAME },
|
||||
clientSideRequired = true,
|
||||
serverSideRequired = false,
|
||||
packetHandler = PacketHandler.class)
|
||||
@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.VERSION_NUMBER, dependencies = Reference.DEPENDENCIES, certificateFingerprint = Reference.FINGERPRINT)
|
||||
@NetworkMod(channels = { Reference.CHANNEL_NAME }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
|
||||
public class EquivalentExchange3 {
|
||||
|
||||
@Instance(Reference.MOD_ID)
|
||||
public static EquivalentExchange3 instance;
|
||||
|
||||
@SidedProxy(
|
||||
clientSide = Reference.CLIENT_PROXY_CLASS,
|
||||
serverSide = Reference.SERVER_PROXY_CLASS)
|
||||
@SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.SERVER_PROXY_CLASS)
|
||||
public static CommonProxy proxy;
|
||||
|
||||
public static CreativeTabs tabsEE3 = new CreativeTabEE3(CreativeTabs.getNextID(), Reference.MOD_ID);
|
||||
|
|
|
|||
|
|
@ -15,21 +15,20 @@ import com.pahimar.ee3.EquivalentExchange3;
|
|||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.RenderIds;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.tileentity.TileGlassDome;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
|
||||
|
||||
public class BlockGlassDome extends BlockEE {
|
||||
public class BlockGlassBell extends BlockEE {
|
||||
|
||||
/**
|
||||
* Is the random generator used by glass dome to drop the inventory contents in
|
||||
* random directions.
|
||||
* Is the random generator used by glass bell to drop the inventory contents
|
||||
* in random directions.
|
||||
*/
|
||||
private Random rand = new Random();
|
||||
|
||||
public BlockGlassDome(int id) {
|
||||
public BlockGlassBell(int id) {
|
||||
|
||||
super(id, Material.glass);
|
||||
this.setUnlocalizedName(Strings.GLASS_DOME_NAME);
|
||||
this.setUnlocalizedName(Strings.GLASS_BELL_NAME);
|
||||
this.setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
this.setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.66F, 0.875F);
|
||||
this.setHardness(1.0F);
|
||||
|
|
@ -38,7 +37,7 @@ public class BlockGlassDome extends BlockEE {
|
|||
@Override
|
||||
public TileEntity createNewTileEntity(World world) {
|
||||
|
||||
return new TileGlassDome();
|
||||
return new TileGlassBell();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -56,7 +55,7 @@ public class BlockGlassDome extends BlockEE {
|
|||
@Override
|
||||
public int getRenderType() {
|
||||
|
||||
return RenderIds.glassDomeId;
|
||||
return RenderIds.glassBellId;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -73,10 +72,10 @@ public class BlockGlassDome extends BlockEE {
|
|||
return false;
|
||||
else {
|
||||
if (!world.isRemote) {
|
||||
TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z);
|
||||
TileGlassBell tileGlassBell = (TileGlassBell) world.getBlockTileEntity(x, y, z);
|
||||
|
||||
if (tileGlassDome != null) {
|
||||
player.openGui(EquivalentExchange3.instance, GuiIds.GLASS_DOME, world, x, y, z);
|
||||
if (tileGlassBell != null) {
|
||||
player.openGui(EquivalentExchange3.instance, GuiIds.GLASS_BELL, world, x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ public class ModBlocks {
|
|||
public static Block calcinator;
|
||||
public static Block aludel;
|
||||
public static Block alchemicalChest;
|
||||
public static Block glassDome;
|
||||
public static Block glassBell;
|
||||
public static Block redWaterStill;
|
||||
public static Block redWaterFlowing;
|
||||
|
||||
|
|
@ -31,14 +31,14 @@ public class ModBlocks {
|
|||
calcinator = new BlockCalcinator(BlockIds.CALCINATOR);
|
||||
aludel = new BlockAludelBase(BlockIds.ALUDEL);
|
||||
alchemicalChest = new BlockAlchemicalChest(BlockIds.ALCHEMICAL_CHEST);
|
||||
glassDome = new BlockGlassDome(BlockIds.GLASS_DOME);
|
||||
glassBell = new BlockGlassBell(BlockIds.GLASS_BELL);
|
||||
redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL);
|
||||
redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1);
|
||||
|
||||
GameRegistry.registerBlock(calcinator, Strings.CALCINATOR_NAME);
|
||||
GameRegistry.registerBlock(aludel, Strings.ALUDEL_NAME);
|
||||
GameRegistry.registerBlock(alchemicalChest, Strings.ALCHEMICAL_CHEST_NAME);
|
||||
GameRegistry.registerBlock(glassDome, Strings.GLASS_DOME_NAME);
|
||||
GameRegistry.registerBlock(glassBell, Strings.GLASS_BELL_NAME);
|
||||
//GameRegistry.registerBlock(redWaterStill, Strings.RED_WATER_STILL_NAME);
|
||||
//GameRegistry.registerBlock(redWaterFlowing, Strings.RED_WATER_FLOWING_NAME);
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ import net.minecraft.util.StatCollector;
|
|||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.inventory.ContainerGlassDome;
|
||||
import com.pahimar.ee3.inventory.ContainerGlassBell;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.lib.Textures;
|
||||
import com.pahimar.ee3.tileentity.TileGlassDome;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
|
@ -17,21 +17,21 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
/**
|
||||
* Equivalent-Exchange-3
|
||||
*
|
||||
* GuiGlassDome
|
||||
* GuiGlassBell
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiGlassDome extends GuiContainer {
|
||||
public class GuiGlassBell extends GuiContainer {
|
||||
|
||||
private TileGlassDome tileGlassDome;
|
||||
private TileGlassBell tileGlassBell;
|
||||
|
||||
public GuiGlassDome(InventoryPlayer inventoryPlayer, TileGlassDome tileGlassDome) {
|
||||
public GuiGlassBell(InventoryPlayer inventoryPlayer, TileGlassBell tileGlassBell) {
|
||||
|
||||
super(new ContainerGlassDome(inventoryPlayer, tileGlassDome));
|
||||
this.tileGlassDome = tileGlassDome;
|
||||
super(new ContainerGlassBell(inventoryPlayer, tileGlassBell));
|
||||
this.tileGlassBell = tileGlassBell;
|
||||
xSize = 176;
|
||||
ySize = 140;
|
||||
}
|
||||
|
|
@ -39,7 +39,7 @@ public class GuiGlassDome extends GuiContainer {
|
|||
@Override
|
||||
protected void drawGuiContainerForegroundLayer(int x, int y) {
|
||||
|
||||
String containerName = tileGlassDome.isInvNameLocalized() ? tileGlassDome.getInvName() : StatCollector.translateToLocal(tileGlassDome.getInvName());
|
||||
String containerName = tileGlassBell.isInvNameLocalized() ? tileGlassBell.getInvName() : StatCollector.translateToLocal(tileGlassBell.getInvName());
|
||||
fontRenderer.drawString(containerName, xSize / 2 - fontRenderer.getStringWidth(containerName) / 2, 6, 4210752);
|
||||
fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), 8, ySize - 93, 4210752);
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ public class GuiGlassDome extends GuiContainer {
|
|||
protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
|
||||
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.renderEngine.bindTexture(Textures.GUI_GLASS_DOME);
|
||||
mc.renderEngine.bindTexture(Textures.GUI_GLASS_BELL);
|
||||
int xStart = (width - xSize) / 2;
|
||||
int yStart = (height - ySize) / 2;
|
||||
this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize);
|
||||
|
|
@ -5,18 +5,17 @@ import net.minecraftforge.client.model.IModelCustom;
|
|||
|
||||
import com.pahimar.ee3.lib.Models;
|
||||
|
||||
public class ModelGlassBell {
|
||||
|
||||
public class ModelGlassDome {
|
||||
private IModelCustom modelGlassBell;
|
||||
|
||||
private IModelCustom modelGlassDome;
|
||||
public ModelGlassBell() {
|
||||
|
||||
public ModelGlassDome() {
|
||||
|
||||
modelGlassDome = AdvancedModelLoader.loadModel(Models.GLASS_DOME);
|
||||
modelGlassBell = AdvancedModelLoader.loadModel(Models.GLASS_BELL);
|
||||
}
|
||||
|
||||
public void render() {
|
||||
|
||||
modelGlassDome.renderPart("Dome");
|
||||
modelGlassBell.renderPart("Bell");
|
||||
}
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ import net.minecraftforge.client.IItemRenderer;
|
|||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.client.model.ModelGlassDome;
|
||||
import com.pahimar.ee3.client.model.ModelGlassBell;
|
||||
import com.pahimar.ee3.lib.Textures;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
|
@ -15,20 +15,20 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
/**
|
||||
* Equivalent-Exchange-3
|
||||
*
|
||||
* ItemAludelRenderer
|
||||
* ItemGlassBellRenderer
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ItemGlassDomeRenderer implements IItemRenderer {
|
||||
public class ItemGlassBellRenderer implements IItemRenderer {
|
||||
|
||||
private ModelGlassDome modelGlassDome;
|
||||
private ModelGlassBell modelGlassBell;
|
||||
|
||||
public ItemGlassDomeRenderer() {
|
||||
public ItemGlassBellRenderer() {
|
||||
|
||||
modelGlassDome = new ModelGlassDome();
|
||||
modelGlassBell = new ModelGlassBell();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -48,15 +48,15 @@ public class ItemGlassDomeRenderer implements IItemRenderer {
|
|||
|
||||
switch (type) {
|
||||
case ENTITY: {
|
||||
renderGlassDome(-0.5F, -1.2F, 0.5F, 1.4F);
|
||||
renderGlassBell(-0.5F, -1.2F, 0.5F, 1.4F);
|
||||
return;
|
||||
}
|
||||
case EQUIPPED: {
|
||||
renderGlassDome(-0.2F, -0.85F, 0.8F, 1.4F);
|
||||
renderGlassBell(-0.2F, -0.85F, 0.8F, 1.4F);
|
||||
return;
|
||||
}
|
||||
case INVENTORY: {
|
||||
renderGlassDome(-1.0F, -1.675F, 0.0F, 1.4F);
|
||||
renderGlassBell(-1.0F, -1.675F, 0.0F, 1.4F);
|
||||
return;
|
||||
}
|
||||
default:
|
||||
|
|
@ -64,7 +64,7 @@ public class ItemGlassDomeRenderer implements IItemRenderer {
|
|||
}
|
||||
}
|
||||
|
||||
private void renderGlassDome(float x, float y, float z, float scale) {
|
||||
private void renderGlassBell(float x, float y, float z, float scale) {
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
|
|
@ -75,10 +75,10 @@ public class ItemGlassDomeRenderer implements IItemRenderer {
|
|||
GL11.glRotatef(-90F, 1F, 0, 0);
|
||||
|
||||
// Bind texture
|
||||
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL);
|
||||
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL);
|
||||
|
||||
// Render
|
||||
modelGlassDome.render();
|
||||
modelGlassBell.render();
|
||||
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glPopMatrix();
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package com.pahimar.ee3.client.renderer.tileentity;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.client.model.ModelAludel;
|
||||
import com.pahimar.ee3.lib.Textures;
|
||||
import com.pahimar.ee3.tileentity.TileAludel;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ import net.minecraft.tileentity.TileEntity;
|
|||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.client.model.ModelGlassDome;
|
||||
import com.pahimar.ee3.client.model.ModelGlassBell;
|
||||
import com.pahimar.ee3.lib.Textures;
|
||||
import com.pahimar.ee3.tileentity.TileGlassDome;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
|
@ -19,25 +19,28 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
/**
|
||||
* Equivalent-Exchange-3
|
||||
*
|
||||
* TileEntityCalcinatorRenderer
|
||||
* TileEntityGlassBellRenderer
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer {
|
||||
public class TileEntityGlassBellRenderer extends TileEntitySpecialRenderer {
|
||||
|
||||
private ModelGlassDome modelGlassDome = new ModelGlassDome();
|
||||
private ModelGlassBell modelGlassBell = new ModelGlassBell();
|
||||
private final RenderItem customRenderItem;
|
||||
private EntityItem ghostEntityItem;
|
||||
|
||||
public TileEntityGlassDomeRenderer() {
|
||||
public TileEntityGlassBellRenderer() {
|
||||
|
||||
ghostEntityItem = null;
|
||||
|
||||
customRenderItem = new RenderItem() {
|
||||
|
||||
@Override
|
||||
public boolean shouldBob() {
|
||||
|
||||
return false;
|
||||
};
|
||||
};
|
||||
|
|
@ -48,8 +51,8 @@ public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer {
|
|||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) {
|
||||
|
||||
if (tileEntity instanceof TileGlassDome) {
|
||||
TileGlassDome tileGlassDome = (TileGlassDome) tileEntity;
|
||||
if (tileEntity instanceof TileGlassBell) {
|
||||
TileGlassBell tileGlassBell = (TileGlassBell) tileEntity;
|
||||
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
|
|
@ -58,31 +61,31 @@ public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer {
|
|||
|
||||
// Scale, Translate, Rotate
|
||||
GL11.glScalef(1.0F, 1.0F, 1.0F);
|
||||
GL11.glTranslatef((float) x + 0.5F, (float) y + (-1.0F), (float) z + 1.2F);
|
||||
GL11.glTranslatef((float) x + 0.5F, (float) y + -1.0F, (float) z + 1.2F);
|
||||
GL11.glRotatef(45F, 0F, 1F, 0F);
|
||||
GL11.glRotatef(-90F, 1F, 0F, 0F);
|
||||
|
||||
// Bind texture
|
||||
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL);
|
||||
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL);
|
||||
|
||||
// Render
|
||||
modelGlassDome.render();
|
||||
modelGlassBell.render();
|
||||
|
||||
GL11.glPopMatrix();
|
||||
|
||||
GL11.glPushMatrix();
|
||||
for (int i = 0; i < tileGlassDome.getSizeInventory(); i++) {
|
||||
for (int i = 0; i < tileGlassBell.getSizeInventory(); i++) {
|
||||
|
||||
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.1F, (float) z + 0.5F);
|
||||
GL11.glScalef(0.5F, 0.5F, 0.5F);
|
||||
|
||||
if (ghostEntityItem == null) {
|
||||
ghostEntityItem = new EntityItem(tileGlassDome.worldObj, tileGlassDome.xCoord, tileGlassDome.yCoord, tileGlassDome.zCoord);
|
||||
ghostEntityItem = new EntityItem(tileGlassBell.worldObj, tileGlassBell.xCoord, tileGlassBell.yCoord, tileGlassBell.zCoord);
|
||||
}
|
||||
|
||||
if (tileGlassDome.getStackInSlot(i) != null) {
|
||||
if (tileGlassBell.getStackInSlot(i) != null) {
|
||||
|
||||
ghostEntityItem.setEntityItemStack(tileGlassDome.getStackInSlot(i));
|
||||
ghostEntityItem.setEntityItemStack(tileGlassBell.getStackInSlot(i));
|
||||
|
||||
if (ghostEntityItem.getEntityItem() != null) {
|
||||
ghostEntityItem.onUpdate();
|
||||
|
|
@ -80,7 +80,7 @@ public class ConfigurationHandler {
|
|||
BlockIds.CALCINATOR = configuration.getBlock(Strings.CALCINATOR_NAME, BlockIds.CALCINATOR_DEFAULT).getInt(BlockIds.CALCINATOR_DEFAULT);
|
||||
BlockIds.ALUDEL = configuration.getBlock(Strings.ALUDEL_NAME, BlockIds.ALUDEL_DEFAULT).getInt(BlockIds.ALUDEL_DEFAULT);
|
||||
BlockIds.ALCHEMICAL_CHEST = configuration.getBlock(Strings.ALCHEMICAL_CHEST_NAME, BlockIds.ALCHEMICAL_CHEST_DEFAULT).getInt(BlockIds.ALCHEMICAL_CHEST_DEFAULT);
|
||||
BlockIds.GLASS_DOME = configuration.getBlock(Strings.GLASS_DOME_NAME, BlockIds.GLASS_DOME_DEFAULT).getInt(BlockIds.GLASS_DOME_DEFAULT);
|
||||
BlockIds.GLASS_BELL = configuration.getBlock(Strings.GLASS_BELL_NAME, BlockIds.GLASS_BELL_DEFAULT).getInt(BlockIds.GLASS_BELL_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 */
|
||||
|
|
|
|||
|
|
@ -111,6 +111,7 @@ public class VersionHelper implements Runnable {
|
|||
}
|
||||
|
||||
private static String getVersionForCheck() {
|
||||
|
||||
String[] versionTokens = Reference.VERSION_NUMBER.split(" ");
|
||||
|
||||
if (versionTokens.length >= 1) {
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ import com.pahimar.ee3.client.audio.SoundHandler;
|
|||
import com.pahimar.ee3.client.renderer.item.ItemAlchemicalChestRenderer;
|
||||
import com.pahimar.ee3.client.renderer.item.ItemAludelRenderer;
|
||||
import com.pahimar.ee3.client.renderer.item.ItemCalcinatorRenderer;
|
||||
import com.pahimar.ee3.client.renderer.item.ItemGlassDomeRenderer;
|
||||
import com.pahimar.ee3.client.renderer.item.ItemGlassBellRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityAlchemicalChestRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityAludelRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassDomeRenderer;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassBellRenderer;
|
||||
import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler;
|
||||
import com.pahimar.ee3.core.handlers.KeyBindingHandler;
|
||||
import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler;
|
||||
|
|
@ -33,7 +33,7 @@ import com.pahimar.ee3.tileentity.TileAlchemicalChest;
|
|||
import com.pahimar.ee3.tileentity.TileAludel;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
import com.pahimar.ee3.tileentity.TileEE;
|
||||
import com.pahimar.ee3.tileentity.TileGlassDome;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
|
|
@ -91,12 +91,12 @@ public class ClientProxy extends CommonProxy {
|
|||
RenderIds.calcinatorRenderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.aludelRenderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.alchemicalChestRenderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.glassDomeId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderIds.glassBellId = RenderingRegistry.getNextAvailableRenderId();
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.ALUDEL, new ItemAludelRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.ALCHEMICAL_CHEST, new ItemAlchemicalChestRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_DOME, new ItemGlassDomeRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_BELL, new ItemGlassBellRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -107,7 +107,7 @@ public class ClientProxy extends CommonProxy {
|
|||
ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new TileEntityCalcinatorRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileAludel.class, new TileEntityAludelRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileAlchemicalChest.class, new TileEntityAlchemicalChestRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileGlassDome.class, new TileEntityGlassDomeRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileGlassBell.class, new TileEntityGlassBellRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@ import com.pahimar.ee3.client.gui.inventory.GuiAlchemicalBag;
|
|||
import com.pahimar.ee3.client.gui.inventory.GuiAlchemicalChest;
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiAludel;
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiCalcinator;
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiGlassDome;
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiGlassBell;
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiPortableCrafting;
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiPortableTransmutation;
|
||||
import com.pahimar.ee3.inventory.ContainerAlchemicalBag;
|
||||
import com.pahimar.ee3.inventory.ContainerAlchemicalChest;
|
||||
import com.pahimar.ee3.inventory.ContainerAludel;
|
||||
import com.pahimar.ee3.inventory.ContainerCalcinator;
|
||||
import com.pahimar.ee3.inventory.ContainerGlassDome;
|
||||
import com.pahimar.ee3.inventory.ContainerGlassBell;
|
||||
import com.pahimar.ee3.inventory.ContainerPortableCrafting;
|
||||
import com.pahimar.ee3.inventory.ContainerPortableTransmutation;
|
||||
import com.pahimar.ee3.lib.GuiIds;
|
||||
|
|
@ -24,7 +24,7 @@ import com.pahimar.ee3.lib.Strings;
|
|||
import com.pahimar.ee3.tileentity.TileAlchemicalChest;
|
||||
import com.pahimar.ee3.tileentity.TileAludel;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
import com.pahimar.ee3.tileentity.TileGlassDome;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
|
||||
import cpw.mods.fml.common.network.IGuiHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
|
@ -69,7 +69,7 @@ public class CommonProxy implements IGuiHandler {
|
|||
GameRegistry.registerTileEntity(TileCalcinator.class, Strings.TE_CALCINATOR_NAME);
|
||||
GameRegistry.registerTileEntity(TileAludel.class, Strings.TE_ALUDEL_NAME);
|
||||
GameRegistry.registerTileEntity(TileAlchemicalChest.class, Strings.TE_ALCHEMICAL_CHEST_NAME);
|
||||
GameRegistry.registerTileEntity(TileGlassDome.class, Strings.TE_GLASS_DOME_NAME);
|
||||
GameRegistry.registerTileEntity(TileGlassBell.class, Strings.TE_GLASS_BELL_NAME);
|
||||
}
|
||||
|
||||
public void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit) {
|
||||
|
|
@ -106,9 +106,9 @@ public class CommonProxy implements IGuiHandler {
|
|||
TileAludel tileAludel = (TileAludel) world.getBlockTileEntity(x, y, z);
|
||||
return new ContainerAludel(player.inventory, tileAludel);
|
||||
}
|
||||
else if (ID == GuiIds.GLASS_DOME) {
|
||||
TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z);
|
||||
return new ContainerGlassDome(player.inventory, tileGlassDome);
|
||||
else if (ID == GuiIds.GLASS_BELL) {
|
||||
TileGlassBell tileGlassBell = (TileGlassBell) world.getBlockTileEntity(x, y, z);
|
||||
return new ContainerGlassBell(player.inventory, tileGlassBell);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
@ -136,9 +136,9 @@ public class CommonProxy implements IGuiHandler {
|
|||
TileAludel tileAludel = (TileAludel) world.getBlockTileEntity(x, y, z);
|
||||
return new GuiAludel(player.inventory, tileAludel);
|
||||
}
|
||||
else if (ID == GuiIds.GLASS_DOME) {
|
||||
TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z);
|
||||
return new GuiGlassDome(player.inventory, tileGlassDome);
|
||||
else if (ID == GuiIds.GLASS_BELL) {
|
||||
TileGlassBell tileGlassBell = (TileGlassBell) world.getBlockTileEntity(x, y, z);
|
||||
return new GuiGlassBell(player.inventory, tileGlassBell);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -7,25 +7,25 @@ import net.minecraft.inventory.Slot;
|
|||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.pahimar.ee3.tileentity.TileAludel;
|
||||
import com.pahimar.ee3.tileentity.TileGlassDome;
|
||||
import com.pahimar.ee3.tileentity.TileGlassBell;
|
||||
|
||||
/**
|
||||
* Equivalent-Exchange-3
|
||||
*
|
||||
* ContainerGlassDome
|
||||
* ContainerGlassBell
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ContainerGlassDome extends Container {
|
||||
public class ContainerGlassBell extends Container {
|
||||
|
||||
private final int PLAYER_INVENTORY_ROWS = 3;
|
||||
private final int PLAYER_INVENTORY_COLUMNS = 9;
|
||||
|
||||
public ContainerGlassDome(InventoryPlayer inventoryPlayer, TileGlassDome tileGlassDome) {
|
||||
public ContainerGlassBell(InventoryPlayer inventoryPlayer, TileGlassBell tileGlassBell) {
|
||||
|
||||
this.addSlotToContainer(new Slot(tileGlassDome, TileAludel.INPUT_INVENTORY_INDEX, 80, 22));
|
||||
this.addSlotToContainer(new Slot(tileGlassBell, TileAludel.INPUT_INVENTORY_INDEX, 80, 22));
|
||||
|
||||
// Add the player's inventory slots to the container
|
||||
for (int inventoryRowIndex = 0; inventoryRowIndex < PLAYER_INVENTORY_ROWS; ++inventoryRowIndex) {
|
||||
|
|
@ -24,8 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ItemMiniumStone extends ItemEE
|
||||
implements ITransmutationStone, IKeyBound {
|
||||
public class ItemMiniumStone extends ItemEE implements ITransmutationStone, IKeyBound {
|
||||
|
||||
public ItemMiniumStone(int id) {
|
||||
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ public class BlockIds {
|
|||
public static int RED_WATER_STILL_DEFAULT = 2453;
|
||||
public static int ALUDEL_DEFAULT = 2454;
|
||||
public static int ALCHEMICAL_CHEST_DEFAULT = 2455;
|
||||
public static int GLASS_DOME_DEFAULT = 2456;
|
||||
public static int GLASS_BELL_DEFAULT = 2456;
|
||||
|
||||
/* Current block ids */
|
||||
public static int CALCINATOR;
|
||||
public static int ALUDEL;
|
||||
public static int ALCHEMICAL_CHEST;
|
||||
public static int RED_WATER_STILL;
|
||||
public static int GLASS_DOME;
|
||||
public static int GLASS_BELL;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ public class GuiIds {
|
|||
public static final int ALCHEMICAL_CHEST = 4;
|
||||
public static final int ALCHEMICAL_BAG = 5;
|
||||
public static final int SHARED_ALCHEMICAL_INVENTORY = 6;
|
||||
public static final int GLASS_DOME = 7;
|
||||
public static final int GLASS_BELL = 7;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@ 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_DOME = MODEL_LOCATION + "aludel.obj";
|
||||
public static final String GLASS_BELL = MODEL_LOCATION + "aludel.obj";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@ public class RenderIds {
|
|||
public static int calcinatorRenderId;
|
||||
public static int aludelRenderId;
|
||||
public static int alchemicalChestRenderId;
|
||||
public static int glassDomeId;
|
||||
public static int glassBellId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public class Strings {
|
|||
public static final String CALCINATOR_NAME = "calcinator";
|
||||
public static final String ALUDEL_NAME = "aludel";
|
||||
public static final String ALCHEMICAL_CHEST_NAME = "alchemicalChest";
|
||||
public static final String GLASS_DOME_NAME = "glassDome";
|
||||
public static final String GLASS_BELL_NAME = "glassBell";
|
||||
public static final String RED_WATER_STILL_NAME = "redWaterStill";
|
||||
public static final String RED_WATER_FLOWING_NAME = "redWaterFlowing";
|
||||
|
||||
|
|
@ -52,14 +52,14 @@ public class Strings {
|
|||
public static final String INERT_STONE_NAME = "stoneInert";
|
||||
public static final String MINIUM_STONE_NAME = "stoneMinium";
|
||||
public static final String PHILOSOPHERS_STONE_NAME = "stonePhilosophers";
|
||||
public static final String ALCHEMICAL_DUST_NAME = "dustAlchemical";
|
||||
public static final String ALCHEMICAL_DUST_NAME = "alchemicalDust";
|
||||
public static final String ALCHEMICAL_BAG_NAME = "alchemicalBag";
|
||||
|
||||
/* TileEntity name constants */
|
||||
public static final String TE_CALCINATOR_NAME = "tileCalcinator";
|
||||
public static final String TE_ALUDEL_NAME = "tileAludel";
|
||||
public static final String TE_ALCHEMICAL_CHEST_NAME = "tileAlchemicalChest";
|
||||
public static final String TE_GLASS_DOME_NAME = "tileGlassDome";
|
||||
public static final String TE_GLASS_BELL_NAME = "tileGlassBell";
|
||||
|
||||
/* Transmutation cost related constants */
|
||||
public static final String TRANSMUTATION_COST = "_cost";
|
||||
|
|
@ -72,7 +72,7 @@ public class Strings {
|
|||
public static final String CONTAINER_ALUDEL_NAME = "container." + ALUDEL_NAME;
|
||||
public static final String CONTAINER_ALCHEMICAL_CHEST_NAME = "container." + ALCHEMICAL_CHEST_NAME;
|
||||
public static final String CONTAINER_ALCHEMICAL_BAG_NAME = "container." + ALCHEMICAL_BAG_NAME;
|
||||
public static final String CONTAINER_GLASS_DOME_NAME = "container." + GLASS_DOME_NAME;
|
||||
public static final String CONTAINER_GLASS_BELL_NAME = "container." + GLASS_BELL_NAME;
|
||||
public static final String CONTAINER_INVENTORY = "container.inventory";
|
||||
public static final String CONTAINER_PORTABLE_CRAFTING = "container.crafting";
|
||||
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ public class Textures {
|
|||
public static final String GUI_SHARED_ALCHEMICAL_STORAGE = GUI_SHEET_LOCATION + "sharedAlchemicalStorage.png";
|
||||
public static final String GUI_PORTABLE_CRAFTING = "/gui/crafting.png";
|
||||
public static final String GUI_PORTABLE_TRANSMUTATION = GUI_SHEET_LOCATION + "portableTransmutation.png";
|
||||
public static final String GUI_GLASS_DOME = GUI_SHEET_LOCATION + "glassDome.png";
|
||||
public static final String GUI_GLASS_BELL = GUI_SHEET_LOCATION + "glassBell.png";
|
||||
|
||||
// Model textures
|
||||
public static final String MODEL_CALCINATOR = MODEL_SHEET_LOCATION + "calcinator.png";
|
||||
public static final String MODEL_ALUDEL = MODEL_SHEET_LOCATION + "aludel.png";
|
||||
public static final String MODEL_ALCHEMICAL_CHEST = MODEL_SHEET_LOCATION + "alchemicalChest.png";
|
||||
public static final String MODEL_GLASS_DOME = MODEL_SHEET_LOCATION + "aludel.png";
|
||||
public static final String MODEL_GLASS_BELL = MODEL_SHEET_LOCATION + "aludel.png";
|
||||
|
||||
// Effect textures
|
||||
public static final String EFFECT_WORLD_TRANSMUTATION = EFFECTS_LOCATION + "noise.png";
|
||||
|
|
|
|||
|
|
@ -25,12 +25,9 @@ import com.pahimar.ee3.network.packet.PacketTileUpdate;
|
|||
*
|
||||
*/
|
||||
public enum PacketTypeHandler {
|
||||
KEY(PacketKeyPressed.class),
|
||||
TILE(PacketTileUpdate.class),
|
||||
REQUEST_EVENT(PacketRequestEvent.class),
|
||||
SPAWN_PARTICLE(PacketSpawnParticle.class),
|
||||
SOUND_EVENT(PacketSoundEvent.class),
|
||||
ITEM_UPDATE(PacketItemUpdate.class);
|
||||
KEY(PacketKeyPressed.class), TILE(PacketTileUpdate.class), REQUEST_EVENT(
|
||||
PacketRequestEvent.class), SPAWN_PARTICLE(PacketSpawnParticle.class), SOUND_EVENT(
|
||||
PacketSoundEvent.class), ITEM_UPDATE(PacketItemUpdate.class);
|
||||
|
||||
private Class<? extends PacketEE> clazz;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,10 @@ import net.minecraft.nbt.NBTTagList;
|
|||
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
|
||||
public class TileGlassDome extends TileEE implements IInventory {
|
||||
public class TileGlassBell extends TileEE implements IInventory {
|
||||
|
||||
/**
|
||||
* The ItemStacks that hold the items currently being used in the Glass Dome
|
||||
* The ItemStacks that hold the items currently being used in the Glass Bell
|
||||
*/
|
||||
private ItemStack[] inventory;
|
||||
|
||||
|
|
@ -19,7 +18,7 @@ public class TileGlassDome extends TileEE implements IInventory {
|
|||
|
||||
public static final int DISPLAY_SLOT_INVENTORY_INDEX = 0;
|
||||
|
||||
public TileGlassDome() {
|
||||
public TileGlassBell() {
|
||||
|
||||
inventory = new ItemStack[INVENTORY_SIZE];
|
||||
}
|
||||
|
|
@ -77,7 +76,7 @@ public class TileGlassDome extends TileEE implements IInventory {
|
|||
@Override
|
||||
public String getInvName() {
|
||||
|
||||
return this.hasCustomName() ? this.getCustomName() : Strings.CONTAINER_GLASS_DOME_NAME;
|
||||
return this.hasCustomName() ? this.getCustomName() : Strings.CONTAINER_GLASS_BELL_NAME;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -22,12 +22,12 @@
|
|||
<entry key="tile.calcinator.name">Calcinator</entry>
|
||||
<entry key="tile.aludel.name">Aludel</entry>
|
||||
<entry key="tile.alchemicalChest.name">Alchemical Chest</entry>
|
||||
<entry key="tile.glassDome.name">Glass Dome</entry>
|
||||
<entry key="tile.glassBell.name">Glass Bell</entry>
|
||||
<entry key="container.calcinator">Calcinator</entry>
|
||||
<entry key="container.aludel">Aludel</entry>
|
||||
<entry key="container.alchemicalChest">Alchemical Chest</entry>
|
||||
<entry key="container.alchemicalBag">Alchemical Bag</entry>
|
||||
<entry key="container.glassDome">Glass Dome</entry>
|
||||
<entry key="container.glassBell">Glass Bell</entry>
|
||||
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
|
||||
<entry key="version.init_log_message">Initializing remote version check against remote version authority, located at</entry>
|
||||
<entry key="version.uninitialized">Remote version check failed to initialize properly</entry>
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ f 30/21/16 56/107/16 55/113/16
|
|||
# 136 faces
|
||||
|
||||
#
|
||||
# object Dome
|
||||
# object Bell
|
||||
#
|
||||
|
||||
v 0.3768 0.3768 1.6600
|
||||
|
|
@ -517,7 +517,7 @@ vt 0.2188 0.7500 0.9239
|
|||
vt 0.2188 0.6250 0.9239
|
||||
# 32 texture coords
|
||||
|
||||
g Dome
|
||||
g Bell
|
||||
f 83/116/74 84/117/74 85/118/74
|
||||
f 85/118/74 86/119/74 83/116/74
|
||||
f 87/120/75 88/121/75 89/122/75
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 293 B After Width: | Height: | Size: 293 B |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
Loading…
Reference in a new issue