Code formatting and import organizing
This commit is contained in:
parent
ffb7b5fbef
commit
f07e52a5ee
47 changed files with 708 additions and 706 deletions
|
@ -106,8 +106,7 @@ public class EquivalentExchange3 {
|
||||||
VersionHelper.execute();
|
VersionHelper.execute();
|
||||||
|
|
||||||
// Initialize the Version Check Tick Handler (Client only)
|
// Initialize the Version Check Tick Handler (Client only)
|
||||||
TickRegistry.registerTickHandler(new VersionCheckTickHandler(),
|
TickRegistry.registerTickHandler(new VersionCheckTickHandler(), Side.CLIENT);
|
||||||
Side.CLIENT);
|
|
||||||
|
|
||||||
// Initialize the Render Tick Handler (Client only)
|
// Initialize the Render Tick Handler (Client only)
|
||||||
proxy.registerRenderTickHandler();
|
proxy.registerRenderTickHandler();
|
||||||
|
|
|
@ -37,12 +37,8 @@ public class GuiAlchemicalBag extends GuiContainer {
|
||||||
@Override
|
@Override
|
||||||
protected void drawGuiContainerForegroundLayer(int x, int y) {
|
protected void drawGuiContainerForegroundLayer(int x, int y) {
|
||||||
|
|
||||||
fontRenderer.drawString(StatCollector
|
fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6, 4210752);
|
||||||
.translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6,
|
fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), 44, ySize - 96 + 2, 4210752);
|
||||||
4210752);
|
|
||||||
fontRenderer.drawString(
|
|
||||||
StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY),
|
|
||||||
44, ySize - 96 + 2, 4210752);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -66,10 +62,8 @@ public class GuiAlchemicalBag extends GuiContainer {
|
||||||
if (mc.thePlayer != null) {
|
if (mc.thePlayer != null) {
|
||||||
for (ItemStack itemStack : mc.thePlayer.inventory.mainInventory) {
|
for (ItemStack itemStack : mc.thePlayer.inventory.mainInventory) {
|
||||||
if (itemStack != null) {
|
if (itemStack != null) {
|
||||||
if (NBTHelper.hasTag(itemStack,
|
if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) {
|
||||||
Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) {
|
NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN);
|
||||||
NBTHelper.removeTag(itemStack,
|
|
||||||
Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,7 @@ public class GuiAlchemyTable extends GuiContainer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
|
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ package com.pahimar.ee3.client.gui.inventory;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import com.pahimar.ee3.lib.Strings;
|
import com.pahimar.ee3.lib.Strings;
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package com.pahimar.ee3.client.model;
|
package com.pahimar.ee3.client.model;
|
||||||
|
|
||||||
|
import net.minecraft.client.model.ModelBase;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import net.minecraft.client.model.ModelBase;
|
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public class ModelAlchemyTable extends ModelBase {
|
public class ModelAlchemyTable extends ModelBase {
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package com.pahimar.ee3.client.model;
|
package com.pahimar.ee3.client.model;
|
||||||
|
|
||||||
import com.pahimar.ee3.lib.Models;
|
|
||||||
|
|
||||||
import net.minecraftforge.client.model.AdvancedModelLoader;
|
import net.minecraftforge.client.model.AdvancedModelLoader;
|
||||||
import net.minecraftforge.client.model.IModelCustom;
|
import net.minecraftforge.client.model.IModelCustom;
|
||||||
|
|
||||||
|
import com.pahimar.ee3.lib.Models;
|
||||||
|
|
||||||
public class ModelRenderingTank {
|
public class ModelRenderingTank {
|
||||||
|
|
||||||
private IModelCustom modelRenderingTank;
|
private IModelCustom modelRenderingTank;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package com.pahimar.ee3.client.renderer.item;
|
package com.pahimar.ee3.client.renderer.item;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.client.IItemRenderer;
|
import net.minecraftforge.client.IItemRenderer;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import com.pahimar.ee3.client.model.ModelRenderingTank;
|
import com.pahimar.ee3.client.model.ModelRenderingTank;
|
||||||
import com.pahimar.ee3.lib.Textures;
|
import com.pahimar.ee3.lib.Textures;
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ package com.pahimar.ee3.client.renderer.tileentity;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import com.pahimar.ee3.client.model.ModelCalcinator;
|
import com.pahimar.ee3.client.model.ModelCalcinator;
|
||||||
|
|
|
@ -97,6 +97,7 @@ public class CommandEE extends CommandBase {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getCommandUsage(ICommandSender icommandsender) {
|
public String getCommandUsage(ICommandSender icommandsender) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,7 +75,8 @@ public class ItemUtil {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
itemId = Integer.parseInt(splitString[0]);
|
itemId = Integer.parseInt(splitString[0]);
|
||||||
} catch (NumberFormatException e) {
|
}
|
||||||
|
catch (NumberFormatException e) {
|
||||||
itemId = ERROR;
|
itemId = ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -85,7 +86,8 @@ public class ItemUtil {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
meta = Integer.parseInt(splitString[1]);
|
meta = Integer.parseInt(splitString[1]);
|
||||||
} catch (NumberFormatException e) {
|
}
|
||||||
|
catch (NumberFormatException e) {
|
||||||
meta = ERROR;
|
meta = ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.util;
|
||||||
|
|
||||||
import com.pahimar.ee3.lib.Reference;
|
|
||||||
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
|
import com.pahimar.ee3.lib.Reference;
|
||||||
|
|
||||||
public class ResourceLocationHelper {
|
public class ResourceLocationHelper {
|
||||||
|
|
||||||
public static ResourceLocation getResourceLocation(String modId, String path) {
|
public static ResourceLocation getResourceLocation(String modId, String path) {
|
||||||
|
|
|
@ -160,11 +160,7 @@ public class VersionHelper implements Runnable {
|
||||||
|
|
||||||
public static String getResultMessageForClient() {
|
public static String getResultMessageForClient() {
|
||||||
|
|
||||||
return StatCollector.translateToLocalFormatted(Strings.OUTDATED_MESSAGE,
|
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);
|
||||||
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() {
|
public static byte getResult() {
|
||||||
|
|
|
@ -71,7 +71,8 @@ public class DynEMC {
|
||||||
if (recipeOutput.getStackSize() != 0) {
|
if (recipeOutput.getStackSize() != 0) {
|
||||||
try {
|
try {
|
||||||
graph.addEdge(unWrappedRecipeOutput, unWrappedRecipeInput, (recipeInput.getStackSize() * 1.0f) / recipeOutput.getStackSize());
|
graph.addEdge(unWrappedRecipeOutput, unWrappedRecipeInput, (recipeInput.getStackSize() * 1.0f) / recipeOutput.getStackSize());
|
||||||
} catch (NoSuchElementException e) {
|
}
|
||||||
|
catch (NoSuchElementException e) {
|
||||||
LogHelper.severe(e.getLocalizedMessage());
|
LogHelper.severe(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
package com.pahimar.ee3.emc;
|
package com.pahimar.ee3.emc;
|
||||||
|
|
||||||
public enum EmcType {
|
public enum EmcType {
|
||||||
OMNI,
|
OMNI, CORPOREAL, KINETIC, TEMPORAL, ESSENTIA, AMORPHOUS, VOID;
|
||||||
CORPOREAL,
|
|
||||||
KINETIC,
|
|
||||||
TEMPORAL,
|
|
||||||
ESSENTIA,
|
|
||||||
AMORPHOUS,
|
|
||||||
VOID;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ public class ContainerAlchemyTable extends Container {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canInteractWith(EntityPlayer entityplayer) {
|
public boolean canInteractWith(EntityPlayer entityplayer) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
* For every stack we have discovered, check to see if we know a recipe
|
||||||
* and we haven't already added it to the recipeless stack list, add it to the recipeless stack
|
* for it. If we don't and we haven't already added it to the recipeless
|
||||||
* list
|
* stack list, add it to the recipeless stack list
|
||||||
*/
|
*/
|
||||||
for (CustomWrappedStack discoveredStack : discoveredStacks) {
|
for (CustomWrappedStack discoveredStack : discoveredStacks) {
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,7 @@ public class NBTHelper {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encodes the given NBT object as a String
|
* Encodes the given NBT object as a String
|
||||||
|
*
|
||||||
* @param nbtBase
|
* @param nbtBase
|
||||||
* @return String encoding of the given NBT object
|
* @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())));
|
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
|
// Encode the value of the tag, depending on the type of the tag
|
||||||
switch (nbtBase.getId())
|
switch (nbtBase.getId()) {
|
||||||
{
|
|
||||||
case 0: {
|
case 0: {
|
||||||
stringBuilder.append(((NBTTagEnd) nbtBase).toString());
|
stringBuilder.append(((NBTTagEnd) nbtBase).toString());
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -11,66 +11,77 @@ public class TileAlchemyTable extends TileEE implements IInventory {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getSizeInventory() {
|
public int getSizeInventory() {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStackInSlot(int slotIndex) {
|
public ItemStack getStackInSlot(int slotIndex) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack decrStackSize(int slotIndex, int decrementAmount) {
|
public ItemStack decrStackSize(int slotIndex, int decrementAmount) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStackInSlotOnClosing(int slotIndex) {
|
public ItemStack getStackInSlotOnClosing(int slotIndex) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setInventorySlotContents(int slotIndex, ItemStack itemstack) {
|
public void setInventorySlotContents(int slotIndex, ItemStack itemstack) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInvName() {
|
public String getInvName() {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isInvNameLocalized() {
|
public boolean isInvNameLocalized() {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getInventoryStackLimit() {
|
public int getInventoryStackLimit() {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void openChest() {
|
public void openChest() {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void closeChest() {
|
public void closeChest() {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) {
|
public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) {
|
||||||
|
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue