Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code formatting and import organizing

Browse source
This commit is contained in:
pahimar 2013-09-06 22:47:12 -04:00
parent ffb7b5fbef
commit f07e52a5ee
47 changed files with 708 additions and 706 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -106,8 +106,7 @@ public class EquivalentExchange3 {
VersionHelper.execute();
// Initialize the Version Check Tick Handler (Client only)
TickRegistry.registerTickHandler(new VersionCheckTickHandler(),
Side.CLIENT);
TickRegistry.registerTickHandler(new VersionCheckTickHandler(), Side.CLIENT);
// Initialize the Render Tick Handler (Client only)
proxy.registerRenderTickHandler();

34
common/com/pahimar/ee3/block/BlockAlchemyTable.java
View file

@ -30,23 +30,23 @@ public class BlockAlchemyTable extends BlockEE {
}
// 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 boolean renderAsNormalBlock() {
//
// return false;
// }
//
// @Override
// public boolean isOpaqueCube() {
//
// return false;
// }
//
// @Override
// public int getRenderType() {
//
// return RenderIds.alchemyTable;
// }
@Override
public TileEntity createNewTileEntity(World world) {

14
common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
View file

@ -37,12 +37,8 @@ public class GuiAlchemicalBag extends GuiContainer {
@Override
protected void drawGuiContainerForegroundLayer(int x, int y) {
fontRenderer.drawString(StatCollector
.translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6,
4210752);
fontRenderer.drawString(
StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY),
44, ySize - 96 + 2, 4210752);
fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6, 4210752);
fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), 44, ySize - 96 + 2, 4210752);
}
@Override
@ -66,10 +62,8 @@ public class GuiAlchemicalBag extends GuiContainer {
if (mc.thePlayer != null) {
for (ItemStack itemStack : mc.thePlayer.inventory.mainInventory) {
if (itemStack != null) {
if (NBTHelper.hasTag(itemStack,
Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) {
NBTHelper.removeTag(itemStack,
Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN);
if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) {
NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN);
}
}
}

1
common/com/pahimar/ee3/client/gui/inventory/GuiAlchemyTable.java
View file

@ -22,6 +22,7 @@ public class GuiAlchemyTable extends GuiContainer {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
// TODO Auto-generated method stub
}

1
common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java
View file

@ -3,6 +3,7 @@ package com.pahimar.ee3.client.gui.inventory;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import com.pahimar.ee3.lib.Strings;

2
common/com/pahimar/ee3/client/model/ModelAlchemyTable.java
View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.client.model;
import net.minecraft.client.model.ModelBase;
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 {

4
common/com/pahimar/ee3/client/model/ModelRenderingTank.java
View file

@ -1,10 +1,10 @@
package com.pahimar.ee3.client.model;
import com.pahimar.ee3.lib.Models;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import com.pahimar.ee3.lib.Models;
public class ModelRenderingTank {
private IModelCustom modelRenderingTank;

4
common/com/pahimar/ee3/client/renderer/item/ItemRenderingTankRenderer.java
View file

@ -1,10 +1,10 @@
package com.pahimar.ee3.client.renderer.item;
import org.lwjgl.opengl.GL11;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import com.pahimar.ee3.client.model.ModelRenderingTank;
import com.pahimar.ee3.lib.Textures;

1
common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java
View file

@ -2,6 +2,7 @@ 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.ModelCalcinator;

1
common/com/pahimar/ee3/command/CommandEE.java
View file

@ -97,6 +97,7 @@ public class CommandEE extends CommandBase {
@Override
public String getCommandUsage(ICommandSender icommandsender) {
// TODO Auto-generated method stub
return null;
}

6
common/com/pahimar/ee3/core/util/ItemUtil.java
View file

@ -75,7 +75,8 @@ public class ItemUtil {
try {
itemId = Integer.parseInt(splitString[0]);
} catch (NumberFormatException e) {
}
catch (NumberFormatException e) {
itemId = ERROR;
}
}
@ -85,7 +86,8 @@ public class ItemUtil {
try {
meta = Integer.parseInt(splitString[1]);
} catch (NumberFormatException e) {
}
catch (NumberFormatException e) {
meta = ERROR;
}
}

4
common/com/pahimar/ee3/core/util/ResourceLocationHelper.java
View file

@ -1,9 +1,9 @@
package com.pahimar.ee3.core.util;
import com.pahimar.ee3.lib.Reference;
import net.minecraft.util.ResourceLocation;
import com.pahimar.ee3.lib.Reference;
public class ResourceLocationHelper {
public static ResourceLocation getResourceLocation(String modId, String path) {

6
common/com/pahimar/ee3/core/util/VersionHelper.java
View file

@ -160,11 +160,7 @@ public class VersionHelper implements Runnable {
public static String getResultMessageForClient() {
return StatCollector.translateToLocalFormatted(Strings.OUTDATED_MESSAGE,
Colours.TEXT_COLOUR_PREFIX_YELLOW + Reference.MOD_NAME + Colours.TEXT_COLOUR_PREFIX_WHITE,
Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteVersion + Colours.TEXT_COLOUR_PREFIX_WHITE,
Colours.TEXT_COLOUR_PREFIX_YELLOW + Loader.instance().getMCVersionString() + Colours.TEXT_COLOUR_PREFIX_WHITE,
Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteUpdateLocation + Colours.TEXT_COLOUR_PREFIX_WHITE);
return StatCollector.translateToLocalFormatted(Strings.OUTDATED_MESSAGE, Colours.TEXT_COLOUR_PREFIX_YELLOW + Reference.MOD_NAME + Colours.TEXT_COLOUR_PREFIX_WHITE, Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteVersion + Colours.TEXT_COLOUR_PREFIX_WHITE, Colours.TEXT_COLOUR_PREFIX_YELLOW + Loader.instance().getMCVersionString() + Colours.TEXT_COLOUR_PREFIX_WHITE, Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteUpdateLocation + Colours.TEXT_COLOUR_PREFIX_WHITE);
}
public static byte getResult() {

3
common/com/pahimar/ee3/emc/DynEMC.java
View file

@ -71,7 +71,8 @@ public class DynEMC {
if (recipeOutput.getStackSize() != 0) {
try {
graph.addEdge(unWrappedRecipeOutput, unWrappedRecipeInput, (recipeInput.getStackSize() * 1.0f) / recipeOutput.getStackSize());
} catch (NoSuchElementException e) {
}
catch (NoSuchElementException e) {
LogHelper.severe(e.getLocalizedMessage());
}
}

8
common/com/pahimar/ee3/emc/EmcType.java
View file

@ -1,11 +1,5 @@
package com.pahimar.ee3.emc;
public enum EmcType {
OMNI,
CORPOREAL,
KINETIC,
TEMPORAL,
ESSENTIA,
AMORPHOUS,
VOID;
OMNI, CORPOREAL, KINETIC, TEMPORAL, ESSENTIA, AMORPHOUS, VOID;
}

1
common/com/pahimar/ee3/inventory/ContainerAlchemyTable.java
View file

@ -17,6 +17,7 @@ public class ContainerAlchemyTable extends Container {
@Override
public boolean canInteractWith(EntityPlayer entityplayer) {
// TODO Auto-generated method stub
return false;
}

6
common/com/pahimar/ee3/item/crafting/RecipeRegistry.java
View file

@ -138,9 +138,9 @@ public class RecipeRegistry {
}
/*
* For every stack we have discovered, check to see if we know a recipe for it. If we don't
* and we haven't already added it to the recipeless stack list, add it to the recipeless stack
* list
* For every stack we have discovered, check to see if we know a recipe
* for it. If we don't and we haven't already added it to the recipeless
* stack list, add it to the recipeless stack list
*/
for (CustomWrappedStack discoveredStack : discoveredStacks) {

4
common/com/pahimar/ee3/nbt/NBTHelper.java
View file

@ -39,6 +39,7 @@ public class NBTHelper {
/**
* Encodes the given NBT object as a String
*
* @param nbtBase
* @return String encoding of the given NBT object
*/
@ -51,8 +52,7 @@ public class NBTHelper {
stringBuilder.append(String.format("'%s':%s:", nbtBase.getName(), NBTBase.getTagName(nbtBase.getId())));
// Encode the value of the tag, depending on the type of the tag
switch (nbtBase.getId())
{
switch (nbtBase.getId()) {
case 0: {
stringBuilder.append(((NBTTagEnd) nbtBase).toString());
break;

11
common/com/pahimar/ee3/tileentity/TileAlchemyTable.java
View file

@ -11,66 +11,77 @@ public class TileAlchemyTable extends TileEE implements IInventory {
@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;
}