Committing (you guessed it) a whack of stuff

pahimar · Jul 17, 2014 · 2093c48 · 2093c48
1 parent 5464f1a
commit 2093c48
Show file tree

Hide file tree

Showing 50 changed files with 690 additions and 187 deletions.
diff --git a/build.properties b/build.properties
@@ -1,5 +1,5 @@
 #
 #Sat Dec 28 00:14:08 EST 2013
 minecraft_version = 1.7.10
-forge_version = 10.13.0.1183
+forge_version = 10.13.0.1186
 mod_version = 0.2
diff --git a/src/main/java/com/pahimar/ee3/block/BlockAugmentationTable.java b/src/main/java/com/pahimar/ee3/block/BlockAugmentationTable.java
@@ -0,0 +1,67 @@
+package com.pahimar.ee3.block;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.reference.GuiId;
+import com.pahimar.ee3.reference.Names;
+import com.pahimar.ee3.reference.RenderIds;
+import com.pahimar.ee3.tileentity.TileEntityAugmentationTable;
+import net.minecraft.block.ITileEntityProvider;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class BlockAugmentationTable extends BlockEE implements ITileEntityProvider
+{
+    public BlockAugmentationTable()
+    {
+        super(Material.rock);
+        this.setHardness(2.0f);
+        this.setBlockName(Names.Blocks.AUGMENTATION_TABLE);
+    }
+
+    @Override
+    public TileEntity createNewTileEntity(World world, int metaData)
+    {
+        return new TileEntityAugmentationTable();
+    }
+
+    @Override
+    public boolean renderAsNormalBlock()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean isOpaqueCube()
+    {
+        return false;
+    }
+
+    @Override
+    public int getRenderType()
+    {
+        return RenderIds.augmentationTable;
+    }
+
+    @Override
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9)
+    {
+        if (player.isSneaking())
+        {
+            return false;
+        }
+        else
+        {
+            if (!world.isRemote)
+            {
+                if (world.getTileEntity(x, y, z) instanceof TileEntityAugmentationTable)
+                {
+                    player.openGui(EquivalentExchange3.instance, GuiId.AUGMENTATION_TABLE.ordinal(), world, x, y, z);
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
@@ -60,15 +60,15 @@ protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y)
 
         if (this.parentItemStack.getItemDamage() == 0)
         {
-            this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_BAG_SMALL);
+            this.mc.getTextureManager().bindTexture(Textures.Gui.ALCHEMICAL_BAG_SMALL);
         }
         else if (this.parentItemStack.getItemDamage() == 1)
         {
-            this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_BAG_MEDIUM);
+            this.mc.getTextureManager().bindTexture(Textures.Gui.ALCHEMICAL_BAG_MEDIUM);
         }
         else if (this.parentItemStack.getItemDamage() == 2)
         {
-            this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_BAG_LARGE);
+            this.mc.getTextureManager().bindTexture(Textures.Gui.ALCHEMICAL_BAG_LARGE);
         }
 
         int xStart = (width - xSize) / 2;

diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java
@@ -52,15 +52,15 @@ protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y)
 
         if (tileEntityAlchemicalChest.getState() == 0)
         {
-            this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_CHEST_SMALL);
+            this.mc.getTextureManager().bindTexture(Textures.Gui.ALCHEMICAL_CHEST_SMALL);
         }
         else if (tileEntityAlchemicalChest.getState() == 1)
         {
-            this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_CHEST_MEDIUM);
+            this.mc.getTextureManager().bindTexture(Textures.Gui.ALCHEMICAL_CHEST_MEDIUM);
         }
         else if (tileEntityAlchemicalChest.getState() == 2)
         {
-            this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_CHEST_LARGE);
+            this.mc.getTextureManager().bindTexture(Textures.Gui.ALCHEMICAL_CHEST_LARGE);
         }
 
         int xStart = (width - xSize) / 2;

diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java
@@ -37,7 +37,7 @@ protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 
-        this.mc.getTextureManager().bindTexture(Textures.GUI_ALUDEL);
+        this.mc.getTextureManager().bindTexture(Textures.Gui.ALUDEL);
 
         int xStart = (width - xSize) / 2;
         int yStart = (height - ySize) / 2;

diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAugmentationTable.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAugmentationTable.java
@@ -0,0 +1,46 @@
+package com.pahimar.ee3.client.gui.inventory;
+
+import com.pahimar.ee3.inventory.ContainerAugmentationTable;
+import com.pahimar.ee3.reference.Names;
+import com.pahimar.ee3.reference.Textures;
+import com.pahimar.ee3.tileentity.TileEntityAugmentationTable;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+import org.lwjgl.opengl.GL11;
+
+@SideOnly(Side.CLIENT)
+public class GuiAugmentationTable extends GuiContainer
+{
+    private TileEntityAugmentationTable tileEntityAugmentationTable;
+
+    public GuiAugmentationTable(InventoryPlayer inventoryPlayer, TileEntityAugmentationTable tileEntityAugmentationTable)
+    {
+        super(new ContainerAugmentationTable(inventoryPlayer, tileEntityAugmentationTable));
+        this.tileEntityAugmentationTable = tileEntityAugmentationTable;
+        xSize = 176;
+        ySize = 187;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int x, int y)
+    {
+        String containerName = StatCollector.translateToLocal(tileEntityAugmentationTable.getInventoryName());
+        fontRendererObj.drawString(containerName, xSize / 2 - fontRendererObj.getStringWidth(containerName) / 2, 6, 4210752);
+        fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 8, ySize - 104, 4210752);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3)
+    {
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
+        this.mc.getTextureManager().bindTexture(Textures.Gui.AUGMENTATION_TABLE);
+
+        int xStart = (width - xSize) / 2;
+        int yStart = (height - ySize) / 2;
+        this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java
@@ -36,7 +36,7 @@ protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 
-        this.mc.getTextureManager().bindTexture(Textures.GUI_CALCINATOR);
+        this.mc.getTextureManager().bindTexture(Textures.Gui.CALCINATOR);
 
         int xStart = (width - xSize) / 2;
         int yStart = (height - ySize) / 2;

diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java
@@ -37,7 +37,7 @@ protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3)
     {
 
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        this.mc.getTextureManager().bindTexture(Textures.GUI_GLASS_BELL);
+        this.mc.getTextureManager().bindTexture(Textures.Gui.GLASS_BELL);
         int xStart = (width - xSize) / 2;
         int yStart = (height - ySize) / 2;
         this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize);

diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiResearchStation.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiResearchStation.java
@@ -36,7 +36,7 @@ protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 
-        this.mc.getTextureManager().bindTexture(Textures.GUI_RESEARCH_STATION);
+        this.mc.getTextureManager().bindTexture(Textures.Gui.RESEARCH_STATION);
 
         int xStart = (width - xSize) / 2;
         int yStart = (height - ySize) / 2;

diff --git a/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightEventHandler.java
@@ -40,7 +40,7 @@ private void drawSelectionBoxForPickAxe(DrawBlockHighlightEvent event)
         ToolMode toolMode = ((ItemDarkMatterPickAxe) event.currentItem.getItem()).getCurrentToolMode(event.currentItem);
         int facing = MathHelper.floor_double(event.player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
 
-        if (toolMode == ToolMode.SINGLE)
+        if (toolMode == ToolMode.STANDARD)
         {
             drawSelectionBox(event.context, event.player, new MovingObjectPosition(event.target.blockX, event.target.blockY, event.target.blockZ, event.target.sideHit, event.target.hitVec), 0, event.partialTicks);
         }

diff --git a/...rer/item/ItemAlchemicalChestRenderer.java → ...rer/item/ItemRendererAlchemicalChest.java b/...rer/item/ItemAlchemicalChestRenderer.java → ...rer/item/ItemRendererAlchemicalChest.java
@@ -10,50 +10,50 @@
 import org.lwjgl.opengl.GL11;
 
 @SideOnly(Side.CLIENT)
-public class ItemAlchemicalChestRenderer implements IItemRenderer
+public class ItemRendererAlchemicalChest implements IItemRenderer
 {
     private final ModelChest modelChest;
 
-    public ItemAlchemicalChestRenderer()
+    public ItemRendererAlchemicalChest()
     {
         modelChest = new ModelChest();
     }
 
     @Override
-    public boolean handleRenderType(ItemStack item, ItemRenderType type)
+    public boolean handleRenderType(ItemStack itemStack, ItemRenderType itemRenderType)
     {
         return true;
     }
 
     @Override
-    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
+    public boolean shouldUseRenderHelper(ItemRenderType itemRenderType, ItemStack itemStack, ItemRendererHelper itemRendererHelper)
     {
         return true;
     }
 
     @Override
-    public void renderItem(ItemRenderType type, ItemStack item, Object... data)
+    public void renderItem(ItemRenderType itemRenderType, ItemStack itemStack, Object... data)
     {
-        switch (type)
+        switch (itemRenderType)
         {
             case ENTITY:
             {
-                renderAlchemicalChest(0.5F, 0.5F, 0.5F, item.getItemDamage());
+                renderAlchemicalChest(0.5F, 0.5F, 0.5F, itemStack.getItemDamage());
                 break;
             }
             case EQUIPPED:
             {
-                renderAlchemicalChest(1.0F, 1.0F, 1.0F, item.getItemDamage());
+                renderAlchemicalChest(1.0F, 1.0F, 1.0F, itemStack.getItemDamage());
                 break;
             }
             case EQUIPPED_FIRST_PERSON:
             {
-                renderAlchemicalChest(1.0F, 1.0F, 1.0F, item.getItemDamage());
+                renderAlchemicalChest(1.0F, 1.0F, 1.0F, itemStack.getItemDamage());
                 break;
             }
             case INVENTORY:
             {
-                renderAlchemicalChest(0.0F, 0.075F, 0.0F, item.getItemDamage());
+                renderAlchemicalChest(0.0F, 0.075F, 0.0F, itemStack.getItemDamage());
                 break;
             }
             default:
@@ -65,15 +65,15 @@ private void renderAlchemicalChest(float x, float y, float z, int metaData)
     {
         if (metaData == 0)
         {
-            FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST_SMALL);
+            FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.Model.ALCHEMICAL_CHEST_SMALL);
         }
         else if (metaData == 1)
         {
-            FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST_MEDIUM);
+            FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.Model.ALCHEMICAL_CHEST_MEDIUM);
         }
         else if (metaData == 2)
         {
-            FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST_LARGE);
+            FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.Model.ALCHEMICAL_CHEST_LARGE);
         }
 
         GL11.glPushMatrix(); //start

diff --git a/...ent/renderer/item/ItemAludelRenderer.java → ...ent/renderer/item/ItemRendererAludel.java b/...ent/renderer/item/ItemAludelRenderer.java → ...ent/renderer/item/ItemRendererAludel.java
@@ -10,31 +10,31 @@
 import org.lwjgl.opengl.GL11;
 
 @SideOnly(Side.CLIENT)
-public class ItemAludelRenderer implements IItemRenderer
+public class ItemRendererAludel implements IItemRenderer
 {
     private final ModelAludel modelAludel;
 
-    public ItemAludelRenderer()
+    public ItemRendererAludel()
     {
         modelAludel = new ModelAludel();
     }
 
     @Override
-    public boolean handleRenderType(ItemStack item, ItemRenderType type)
+    public boolean handleRenderType(ItemStack itemStack, ItemRenderType itemRenderType)
     {
         return true;
     }
 
     @Override
-    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
+    public boolean shouldUseRenderHelper(ItemRenderType itemRenderType, ItemStack itemStack, ItemRendererHelper itemRendererHelper)
     {
         return true;
     }
 
     @Override
-    public void renderItem(ItemRenderType type, ItemStack item, Object... data)
+    public void renderItem(ItemRenderType itemRenderType, ItemStack itemStack, Object... data)
     {
-        switch (type)
+        switch (itemRenderType)
         {
             case ENTITY:
             {
@@ -71,7 +71,7 @@ private void renderAludel(float x, float y, float z)
         GL11.glRotatef(-90F, 1F, 0, 0);
 
         // Bind texture
-        FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL);
+        FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.Model.ALUDEL);
 
         // Render
         modelAludel.render();