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

Cleaning

Browse source
This commit is contained in:
pahimar 2013-12-19 18:41:22 -05:00
parent a545d4519e
commit e2378f77b6
131 changed files with 175 additions and 348 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -40,7 +40,6 @@ import java.io.File;
* EquivalentExchange3
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, dependencies = Reference.DEPENDENCIES, certificateFingerprint = Reference.FINGERPRINT)
@NetworkMod(channels = {Reference.CHANNEL_NAME}, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)

2
src/main/java/com/pahimar/ee3/addon/AddonHandler.java
View file

@ -25,7 +25,7 @@ public class AddonHandler
AddonIndustrialCraft2.init();
}
public static void sendAddRecipe(Object outputObject, Object ... inputObjects)
public static void sendAddRecipe(Object outputObject, Object... inputObjects)
{
List<?> inputObjectsList = Arrays.asList(inputObjects);
FMLInterModComms.sendMessage(Reference.MOD_ID, InterModCommsOperations.RECIPE_ADD, new RecipeMapping(outputObject, inputObjectsList).toJson());

4
src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java
View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.addon;
import com.pahimar.ee3.api.OreStack;
import com.pahimar.ee3.api.WrappedStack;
import com.pahimar.ee3.emc.EmcValue;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

17
src/main/java/com/pahimar/ee3/item/EnergyStack.java → src/main/java/com/pahimar/ee3/api/EnergyStack.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.item;
package com.pahimar.ee3.api;
import com.pahimar.ee3.lib.Compare;
@ -15,14 +15,12 @@ public class EnergyStack implements Comparable<EnergyStack>
public EnergyStack(String energyName, int stackSize)
{
this.energyName = energyName;
this.stackSize = stackSize;
}
public EnergyStack(String energyName)
{
this(energyName, 1);
}
@ -35,18 +33,11 @@ public class EnergyStack implements Comparable<EnergyStack>
@Override
public boolean equals(Object object)
{
if (!(object instanceof EnergyStack))
{
return false;
}
return (this.compareTo((EnergyStack) object) == Compare.EQUALS);
return object instanceof EnergyStack && (this.compareTo((EnergyStack) object) == Compare.EQUALS);
}
public static boolean compareEnergyNames(EnergyStack energyStack1, EnergyStack energyStack2)
{
if (energyStack1 != null && energyStack2 != null)
{
if ((energyStack1.energyName != null) && (energyStack2.energyName != null))
@ -61,7 +52,6 @@ public class EnergyStack implements Comparable<EnergyStack>
@Override
public int compareTo(EnergyStack energyStack)
{
return comparator.compare(this, energyStack);
}
@ -72,11 +62,9 @@ public class EnergyStack implements Comparable<EnergyStack>
public static Comparator<EnergyStack> comparator = new Comparator<EnergyStack>()
{
@Override
public int compare(EnergyStack energyStack1, EnergyStack energyStack2)
{
if (energyStack1 != null)
{
if (energyStack2 != null)
@ -107,6 +95,5 @@ public class EnergyStack implements Comparable<EnergyStack>
}
}
}
};
}

28
src/main/java/com/pahimar/ee3/item/OreStack.java → src/main/java/com/pahimar/ee3/api/OreStack.java
View file

@ -1,7 +1,9 @@
package com.pahimar.ee3.item;
package com.pahimar.ee3.api;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.lib.Compare;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@ -44,12 +46,7 @@ public class OreStack implements Comparable<OreStack>
@Override
public boolean equals(Object object)
{
if (!(object instanceof OreStack))
{
return false;
}
return (comparator.compare(this, (OreStack) object) == Compare.EQUALS);
return object instanceof OreStack && (comparator.compare(this, (OreStack) object) == Compare.EQUALS);
}
public static boolean compareOreNames(OreStack oreStack1, OreStack oreStack2)
@ -72,12 +69,12 @@ public class OreStack implements Comparable<OreStack>
}
/**
* Deserializes a OreStack object from the given serialized json
* String
* Deserializes a OreStack object from the given serialized json String
*
* @param jsonOreStack Json encoded String representing a OreStack object
* @return The OreStack that was encoded as json, or null if a valid
* OreStack could not be decoded from given String
* @param jsonOreStack
* Json encoded String representing a OreStack object
*
* @return The OreStack that was encoded as json, or null if a valid OreStack could not be decoded from given String
*/
public static OreStack createFromJson(String jsonOreStack)
{
@ -87,7 +84,11 @@ public class OreStack implements Comparable<OreStack>
}
catch (JsonSyntaxException exception)
{
// TODO Log something regarding the failed parse
LogHelper.severe(exception.getMessage());
}
catch (JsonParseException exception)
{
LogHelper.severe(exception.getMessage());
}
return null;
@ -163,6 +164,5 @@ public class OreStack implements Comparable<OreStack>
}
}
}
};
}

27
src/main/java/com/pahimar/ee3/api/RecipeMapping.java
View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.api;
import com.google.gson.*;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.helper.LogHelper;
import java.lang.reflect.Type;
import java.util.ArrayList;
@ -54,8 +54,11 @@ public class RecipeMapping implements JsonSerializer<RecipeMapping>, JsonDeseria
}
catch (JsonSyntaxException exception)
{
exception.printStackTrace();
// TODO Log something regarding the failed parse
LogHelper.severe(exception.getMessage());
}
catch (JsonParseException exception)
{
LogHelper.severe(exception.getMessage());
}
return null;
@ -67,23 +70,28 @@ public class RecipeMapping implements JsonSerializer<RecipeMapping>, JsonDeseria
}
@Override
public RecipeMapping deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext context) throws JsonParseException {
public RecipeMapping deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext context) throws JsonParseException
{
if (!jsonElement.isJsonPrimitive()) {
if (!jsonElement.isJsonPrimitive())
{
JsonObject jsonRecipeMapping = (JsonObject) jsonElement;
WrappedStack outputStack = null;
List<WrappedStack> inputStacks = new ArrayList<WrappedStack>();
if (jsonRecipeMapping.get("outputWrappedStack") != null) {
if (jsonRecipeMapping.get("outputWrappedStack") != null)
{
outputStack = new WrappedStack().deserialize(jsonRecipeMapping.get("outputWrappedStack").getAsJsonObject(), type, context);
}
if (jsonRecipeMapping.get("inputWrappedStacks") != null) {
if (jsonRecipeMapping.get("inputWrappedStacks") != null)
{
JsonArray jsonInputStacks = jsonRecipeMapping.get("inputWrappedStacks").getAsJsonArray();
for (int i = 0; i < jsonInputStacks.size(); i++) {
for (int i = 0; i < jsonInputStacks.size(); i++)
{
WrappedStack inputStack = new WrappedStack().deserialize(jsonInputStacks.get(i).getAsJsonObject(), type, context);
inputStacks.add(inputStack);
}
@ -96,7 +104,8 @@ public class RecipeMapping implements JsonSerializer<RecipeMapping>, JsonDeseria
}
@Override
public JsonElement serialize(RecipeMapping recipeMapping, Type type, JsonSerializationContext context) {
public JsonElement serialize(RecipeMapping recipeMapping, Type type, JsonSerializationContext context)
{
JsonObject jsonRecipeMapping = new JsonObject();

8
src/main/java/com/pahimar/ee3/api/StackValueMapping.java
View file

@ -2,7 +2,7 @@ package com.pahimar.ee3.api;
import com.google.gson.*;
import com.pahimar.ee3.emc.EmcValue;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.helper.LogHelper;
import java.lang.reflect.Type;
@ -35,7 +35,11 @@ public class StackValueMapping implements JsonSerializer<StackValueMapping>, Jso
}
catch (JsonSyntaxException exception)
{
// TODO Log something regarding the failed parse
LogHelper.severe(exception.getMessage());
}
catch (JsonParseException exception)
{
LogHelper.severe(exception.getMessage());
}
return null;

6
src/main/java/com/pahimar/ee3/item/WrappedStack.java → src/main/java/com/pahimar/ee3/api/WrappedStack.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.item;
package com.pahimar.ee3.api;
import com.google.gson.*;
import com.pahimar.ee3.helper.FluidHelper;
@ -290,11 +290,11 @@ public class WrappedStack
}
catch (JsonSyntaxException exception)
{
LogHelper.warning(exception.getMessage());
LogHelper.severe(exception.getMessage());
}
catch (JsonParseException exception)
{
LogHelper.warning(exception.getMessage());
LogHelper.severe(exception.getMessage());
}
return null;

4
src/main/java/com/pahimar/ee3/block/BlockAlchemicalChest.java
View file

@ -23,14 +23,12 @@ import java.util.Random;
* BlockAlchemicalChest
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class BlockAlchemicalChest extends BlockEE
{
/**
* Is the random generator used by alchemical chest to drop the inventory
* contents in random directions.
* Is the random generator used by alchemical chest to drop the inventory contents in random directions.
*/
private Random rand = new Random();

4
src/main/java/com/pahimar/ee3/block/BlockAludelBase.java
View file

@ -26,14 +26,12 @@ import java.util.Random;
* BlockAludel
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class BlockAludelBase extends BlockEE
{
/**
* Is the random generator used by aludel to drop the inventory contents in
* random directions.
* Is the random generator used by aludel to drop the inventory contents in random directions.
*/
private Random rand = new Random();

4
src/main/java/com/pahimar/ee3/block/BlockCalcinator.java
View file

@ -22,14 +22,12 @@ import java.util.Random;
* BlockCalcinator
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class BlockCalcinator extends BlockEE
{
/**
* Is the random generator used by calcinator to drop the inventory contents
* in random directions.
* Is the random generator used by calcinator to drop the inventory contents in random directions.
*/
private Random rand = new Random();

1
src/main/java/com/pahimar/ee3/block/BlockEE.java
View file

@ -19,7 +19,6 @@ import net.minecraftforge.common.ForgeDirection;
* BlockEE
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public abstract class BlockEE extends BlockContainer
{

7
src/main/java/com/pahimar/ee3/block/BlockGlassBell.java
View file

@ -28,8 +28,7 @@ public class BlockGlassBell extends BlockEE
{
/**
* Is the random generator used by glass bell 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();
@ -144,8 +143,8 @@ public class BlockGlassBell extends BlockEE
}
/**
* Ray traces through the blocks collision from start vector to end vector
* returning a ray trace hit. Args: world, x, y, z, startVec, endVec
* Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world,
* x, y, z, startVec, endVec
*/
@Override
public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec)

5
src/main/java/com/pahimar/ee3/block/ModBlocks.java
View file

@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
* ModBlocks
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ModBlocks
{
@ -43,7 +42,7 @@ public class ModBlocks
private static void initBlockRecipes()
{
GameRegistry.addRecipe(new ItemStack(glassBell), new Object[] {"iii", "i i", "i i", 'i', Block.glass});
GameRegistry.addRecipe(new ItemStack(aludelBase), new Object[] {"iii", "sis", "iii", 'i', Item.ingotIron, 's', Block.stone});
GameRegistry.addRecipe(new ItemStack(glassBell), new Object[]{"iii", "i i", "i i", 'i', Block.glass});
GameRegistry.addRecipe(new ItemStack(aludelBase), new Object[]{"iii", "sis", "iii", 'i', Item.ingotIron, 's', Block.stone});
}
}

1
src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java
View file

@ -11,7 +11,6 @@ import net.minecraftforge.event.ForgeSubscribe;
* SoundHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class SoundHandler
{

1
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
View file

@ -18,7 +18,6 @@ import org.lwjgl.opengl.GL11;
* GuiAlchemicalBag
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class GuiAlchemicalBag extends GuiContainer

1
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java
View file

@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
* GuiAlchemicalChest
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class GuiAlchemicalChest extends GuiContainer

1
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java
View file

@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
* GuiAludel
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class GuiAludel extends GuiContainer

1
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java
View file

@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
* GuiCalcinator
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class GuiCalcinator extends GuiContainer

1
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java
View file

@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
* GuiGlassBell
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class GuiGlassBell extends GuiContainer

7
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java
View file

@ -19,7 +19,6 @@ import org.lwjgl.opengl.GL11;
* GuiPortableCrafting
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class GuiPortableCrafting extends GuiContainer
@ -32,8 +31,7 @@ public class GuiPortableCrafting extends GuiContainer
}
/**
* Draw the foreground layer for the GuiContainer (everything in front of
* the items)
* Draw the foreground layer for the GuiContainer (everything in front of the items)
*/
@Override
protected void drawGuiContainerForegroundLayer(int par1, int par2)
@ -44,8 +42,7 @@ public class GuiPortableCrafting extends GuiContainer
}
/**
* Draw the background layer for the GuiContainer (everything behind the
* items)
* Draw the background layer for the GuiContainer (everything behind the items)
*/
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)

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

@ -16,7 +16,6 @@ import org.lwjgl.opengl.GL11;
* GuiPortableTransmutation
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class GuiPortableTransmutation extends GuiContainer

1
src/main/java/com/pahimar/ee3/client/model/ModelAludel.java
View file

@ -12,7 +12,6 @@ import net.minecraftforge.client.model.IModelCustom;
* ModelAludel
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class ModelAludel

1
src/main/java/com/pahimar/ee3/client/model/ModelCalcinator.java
View file

@ -12,7 +12,6 @@ import net.minecraftforge.client.model.IModelCustom;
* Model for the Calcinator
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class ModelCalcinator

2
src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java
View file

@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
* RenderUtils
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class RenderUtils
{
@ -67,7 +66,6 @@ public class RenderUtils
GL11.glColor4f(red, green, blue, opacity);
drawTexturedQuad(x, y, icon, 16 * scale, 16 * scale, -90);
GL11.glEnable(GL11.GL_LIGHTING);
}
public static void drawTexturedQuad(int x, int y, Icon icon, float width, float height, double zLevel)

1
src/main/java/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java
View file

@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
* ItemAlchemicalChestRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class ItemAlchemicalChestRenderer implements IItemRenderer

1
src/main/java/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java
View file

@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
* ItemAludelRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class ItemAludelRenderer implements IItemRenderer

4
src/main/java/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java
View file

@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
* ItemCalcinatorRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class ItemCalcinatorRenderer implements IItemRenderer
@ -70,7 +69,8 @@ public class ItemCalcinatorRenderer implements IItemRenderer
return;
}
default:
return;
{
}
}
}

4
src/main/java/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java
View file

@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
* ItemGlassBellRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class ItemGlassBellRenderer implements IItemRenderer
@ -70,7 +69,8 @@ public class ItemGlassBellRenderer implements IItemRenderer
return;
}
default:
return;
{
}
}
}

1
src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java
View file

@ -18,7 +18,6 @@ import org.lwjgl.opengl.GL12;
* TileEntityAlchemicalChestRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class TileEntityAlchemicalChestRenderer extends

1
src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java
View file

@ -23,7 +23,6 @@ import org.lwjgl.opengl.GL11;
* TileEntityAludelRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class TileEntityAludelRenderer extends TileEntitySpecialRenderer

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

@ -16,7 +16,6 @@ import org.lwjgl.opengl.GL11;
* TileEntityCalcinatorRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer

1
src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java
View file

@ -22,7 +22,6 @@ import org.lwjgl.opengl.GL11;
* TileEntityGlassBellRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class TileEntityGlassBellRenderer extends TileEntitySpecialRenderer

15
src/main/java/com/pahimar/ee3/command/CommandEE.java
View file

@ -14,7 +14,6 @@ import java.util.List;
* CommandEE
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CommandEE extends CommandBase
{
@ -42,25 +41,25 @@ public class CommandEE extends CommandBase
{
case 1:
{
return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_OVERLAY, Commands.COMMAND_PARTICLES, Commands.COMMAND_SOUNDS, Commands.COMMAND_VERSION});
return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_OVERLAY, Commands.COMMAND_PARTICLES, Commands.COMMAND_SOUNDS, Commands.COMMAND_VERSION});
}
case 2:
{
if (args[0].equalsIgnoreCase(Commands.COMMAND_OVERLAY))
{
return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_ON, Commands.COMMAND_OFF, Commands.COMMAND_POSITION, Commands.COMMAND_SCALE, Commands.COMMAND_OPACITY});
return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_ON, Commands.COMMAND_OFF, Commands.COMMAND_POSITION, Commands.COMMAND_SCALE, Commands.COMMAND_OPACITY});
}
else if (args[0].equalsIgnoreCase(Commands.COMMAND_PARTICLES))
{
return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_ON, Commands.COMMAND_OFF});
return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_ON, Commands.COMMAND_OFF});
}
else if (args[0].equalsIgnoreCase(Commands.COMMAND_SOUNDS))
{
return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_ALL, Commands.COMMAND_SELF, Commands.COMMAND_OFF});
return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_ALL, Commands.COMMAND_SELF, Commands.COMMAND_OFF});
}
else if (args[0].equalsIgnoreCase(Commands.COMMAND_VERSION))
{
return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_CHANGELOG});
return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_CHANGELOG});
}
}
case 3:
@ -69,7 +68,7 @@ public class CommandEE extends CommandBase
{
if (args[1].equalsIgnoreCase(Commands.COMMAND_POSITION))
{
return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_TOP, Commands.COMMAND_BOTTOM});
return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_TOP, Commands.COMMAND_BOTTOM});
}
}
}
@ -81,7 +80,7 @@ public class CommandEE extends CommandBase
{
if (args[2].equalsIgnoreCase(Commands.COMMAND_TOP) || args[2].equalsIgnoreCase(Commands.COMMAND_BOTTOM))
{
return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_LEFT, Commands.COMMAND_RIGHT});
return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_LEFT, Commands.COMMAND_RIGHT});
}
}
}

1
src/main/java/com/pahimar/ee3/command/CommandHandler.java
View file

@ -8,7 +8,6 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
* CommandHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CommandHandler
{

13
src/main/java/com/pahimar/ee3/command/CommandOverlay.java
View file

@ -14,7 +14,6 @@ import net.minecraft.util.ChatMessageComponent;
* CommandOverlay
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CommandOverlay
{
@ -84,7 +83,7 @@ public class CommandOverlay
if (scale <= 0F)
{
throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_SCALE_USAGE});
throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_SCALE_USAGE});
}
else
{
@ -95,12 +94,12 @@ public class CommandOverlay
}
catch (Exception e)
{
throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_SCALE_USAGE});
throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_SCALE_USAGE});
}
}
else
{
throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_SCALE_USAGE});
throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_SCALE_USAGE});
}
}
@ -115,7 +114,7 @@ public class CommandOverlay
if (opacity < 0F || opacity > 1F)
{
throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_OPACITY_USAGE});
throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_OPACITY_USAGE});
}
else
{
@ -126,12 +125,12 @@ public class CommandOverlay
}
catch (Exception e)
{
throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_OPACITY_USAGE});
throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_OPACITY_USAGE});
}
}
else
{
throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_OPACITY_USAGE});
throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_OPACITY_USAGE});
}
}

1
src/main/java/com/pahimar/ee3/command/CommandParticles.java
View file

@ -14,7 +14,6 @@ import net.minecraft.util.ChatMessageComponent;
* CommandParticles
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CommandParticles
{

1
src/main/java/com/pahimar/ee3/command/CommandSounds.java
View file

@ -13,7 +13,6 @@ import net.minecraft.util.ChatMessageComponent;
* CommandSounds
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CommandSounds
{

2
src/main/java/com/pahimar/ee3/command/CommandVersion.java
View file

@ -12,7 +12,6 @@ import net.minecraft.util.ChatMessageComponent;
* CommandVersion
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CommandVersion
{
@ -55,5 +54,4 @@ public class CommandVersion
{
}
}

1
src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java
View file

@ -36,5 +36,4 @@ public class BlockConfiguration
blockConfiguration.save();
}
}
}

2
src/main/java/com/pahimar/ee3/configuration/ConfigurationHandler.java
View file

@ -10,7 +10,6 @@ import java.io.File;
* ConfigurationHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ConfigurationHandler
{
@ -27,5 +26,4 @@ public class ConfigurationHandler
ItemConfiguration.init(new File(configPath + "item.properties"));
TransmutationConfiguration.init(new File(configPath + "transmutation.properties"));
}
}

2
src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java
View file

@ -8,7 +8,6 @@ import com.pahimar.ee3.lib.Strings;
* ConfigurationSettings
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ConfigurationSettings
{
@ -113,5 +112,4 @@ public class ConfigurationSettings
public static int TRANSMUTE_COST_MOB;
public static final String TRANSMUTE_COST_MOB_CONFIGNAME = Strings.TRANSMUTATION_COST_MOB;
public static final int TRANSMUTE_COST_MOB_DEFAULT = 1;
}

1
src/main/java/com/pahimar/ee3/configuration/ItemConfiguration.java
View file

@ -47,5 +47,4 @@ public class ItemConfiguration
itemConfiguration.save();
}
}
}

1
src/main/java/com/pahimar/ee3/configuration/TransmutationConfiguration.java
View file

@ -37,5 +37,4 @@ public class TransmutationConfiguration
transmutationConfiguration.save();
}
}
}

2
src/main/java/com/pahimar/ee3/creativetab/CreativeTabEE3.java
View file

@ -11,7 +11,6 @@ import net.minecraft.creativetab.CreativeTabs;
* CreativeTabEE3
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CreativeTabEE3 extends CreativeTabs
{
@ -32,5 +31,4 @@ public class CreativeTabEE3 extends CreativeTabs
return ItemIds.MINIUM_SHARD;
}
}

6
src/main/java/com/pahimar/ee3/emc/EmcRegistry.java
View file

@ -1,9 +1,9 @@
package com.pahimar.ee3.emc;
import com.google.common.collect.ImmutableSortedMap;
import com.pahimar.ee3.api.OreStack;
import com.pahimar.ee3.api.WrappedStack;
import com.pahimar.ee3.helper.EmcHelper;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.item.crafting.RecipeRegistry;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@ -391,6 +391,4 @@ public class EmcRegistry
return stacksInRange;
}
}

7
src/main/java/com/pahimar/ee3/emc/EmcValue.java
View file

@ -179,9 +179,10 @@ public class EmcValue implements Comparable<EmcValue>, JsonDeserializer<EmcValue
/**
* Deserializes an EmcValue object from the given serialized json String
*
* @param jsonEmcValue Json encoded String representing a EmcValue object
* @return The EmcValue that was encoded as json, or null if a valid
* EmcValue could not be decoded from given String
* @param jsonEmcValue
* Json encoded String representing a EmcValue object
*
* @return The EmcValue that was encoded as json, or null if a valid EmcValue could not be decoded from given String
*/
@SuppressWarnings("unused")
public static EmcValue createFromJson(String jsonEmcValue)

4
src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.emc;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.api.OreStack;
import com.pahimar.ee3.api.WrappedStack;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

3
src/main/java/com/pahimar/ee3/emc/EmcValuesIMC.java
View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.emc;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.api.WrappedStack;
import java.util.Map;
import java.util.TreeMap;
@ -11,7 +11,6 @@ import java.util.TreeMap;
* EmcIMCValues
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class EmcValuesIMC
{

2
src/main/java/com/pahimar/ee3/event/ActionEvent.java
View file

@ -11,7 +11,6 @@ import net.minecraftforge.event.Event;
* ActionEvent
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ActionEvent extends Event
{
@ -43,5 +42,4 @@ public class ActionEvent extends Event
this.hasActionOccured = hasActionOccured;
this.data = data;
}
}

2
src/main/java/com/pahimar/ee3/event/ActionRequestEvent.java
View file

@ -13,7 +13,6 @@ import static net.minecraftforge.event.Event.Result.DENY;
* ActionRequestEvent
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@Cancelable
public class ActionRequestEvent extends PlayerEvent
@ -46,5 +45,4 @@ public class ActionRequestEvent extends PlayerEvent
super.setCanceled(cancel);
allowEvent = cancel ? DENY : allowEvent == DENY ? DENY : DEFAULT;
}
}

2
src/main/java/com/pahimar/ee3/event/WorldTransmutationEvent.java
View file

@ -10,7 +10,6 @@ import net.minecraft.world.World;
* WorldTransmutationEvent
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class WorldTransmutationEvent extends ActionEvent
{
@ -25,5 +24,4 @@ public class WorldTransmutationEvent extends ActionEvent
targetMeta = Integer.parseInt(data.substring(data.indexOf(":") + 1));
actionResult = ActionResult.DEFAULT;
}
}

2
src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java
View file

@ -9,7 +9,6 @@ import net.minecraftforge.event.ForgeSubscribe;
* ActionRequestHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ActionRequestHandler
{
@ -19,5 +18,4 @@ public class ActionRequestHandler
{
}
}

12
src/main/java/com/pahimar/ee3/handler/CraftingHandler.java
View file

@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack;
* CraftingHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class CraftingHandler implements ICraftingHandler
{
@ -35,12 +34,13 @@ public class CraftingHandler implements ICraftingHandler
}
/**
* Check to see if the crafting is occurring from the portable crafting
* interface. If so, do durability damage to the appropriate transmutation
* stone that was used for portable crafting.
* Check to see if the crafting is occurring from the portable crafting interface. If so, do durability damage to
* the appropriate transmutation stone that was used for portable crafting.
*
* @param player The player that is completing the crafting
* @param craftMatrix The contents of the crafting matrix
* @param player
* The player that is completing the crafting
* @param craftMatrix
* The contents of the crafting matrix
*/
private void doPortableCrafting(EntityPlayer player, IInventory craftMatrix)
{

2
src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java
View file

@ -24,7 +24,6 @@ import org.lwjgl.opengl.GL12;
* DrawBlockHighlightHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class DrawBlockHighlightHandler
@ -214,5 +213,4 @@ public class DrawBlockHighlightHandler
return pulse;
}
}

2
src/main/java/com/pahimar/ee3/handler/EntityLivingHandler.java
View file

@ -13,7 +13,6 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
* EntityLivingHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class EntityLivingHandler
{
@ -43,5 +42,4 @@ public class EntityLivingHandler
}
}
}
}

25
src/main/java/com/pahimar/ee3/handler/EquivalencyHandler.java
View file

@ -12,7 +12,6 @@ import java.util.ArrayList;
* EquivalencyHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class EquivalencyHandler
{
@ -51,13 +50,13 @@ public class EquivalencyHandler
{
currentList = equivalencyList.get(stack1Index.intValue());
currentList.add(stack2);
equivalencyList.set(stack1Index.intValue(), currentList);
equivalencyList.set(stack1Index, currentList);
}
else if (stack1Index == null && stack2Index != null)
{
currentList = equivalencyList.get(stack2Index.intValue());
currentList.add(stack1);
equivalencyList.set(stack2Index.intValue(), currentList);
equivalencyList.set(stack2Index, currentList);
}
else if (stack1Index == null && stack2Index == null)
{
@ -262,18 +261,9 @@ public class EquivalencyHandler
public boolean areEquivalent(Object obj1, Object obj2)
{
if (getEquivalencyList(obj1) != null && getEquivalencyList(obj2) != null)
{
// TODO This could be cleaner
if (GeneralHelper.convertObjectToItemStack(obj1).itemID == GeneralHelper.convertObjectToItemStack(obj2).itemID && GeneralHelper.convertObjectToItemStack(obj1).getItemDamage() == GeneralHelper.convertObjectToItemStack(obj2).getItemDamage())
{
return true;
}
else
{
return getEquivalencyList(obj1).equals(getEquivalencyList(obj2));
}
return GeneralHelper.convertObjectToItemStack(obj1).itemID == GeneralHelper.convertObjectToItemStack(obj2).itemID && GeneralHelper.convertObjectToItemStack(obj1).getItemDamage() == GeneralHelper.convertObjectToItemStack(obj2).getItemDamage() || getEquivalencyList(obj1).equals(getEquivalencyList(obj2));
}
else
{
@ -298,14 +288,7 @@ public class EquivalencyHandler
if (getEquivalencyList(first.itemID, first.getItemDamage()) != null && getEquivalencyList(second.itemID, second.getItemDamage()) != null)
{
if (first.itemID == second.itemID && first.getItemDamage() == second.getItemDamage())
{
return true;
}
else
{
return getEquivalencyList(first.itemID, first.getItemDamage()).equals(getEquivalencyList(second.itemID, second.getItemDamage()));
}
return first.itemID == second.itemID && first.getItemDamage() == second.getItemDamage() || getEquivalencyList(first.itemID, first.getItemDamage()).equals(getEquivalencyList(second.itemID, second.getItemDamage()));
}
else
{

1
src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java
View file

@ -14,7 +14,6 @@ import net.minecraftforge.event.entity.player.PlayerDropsEvent;
* ItemEventHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemEventHandler
{

5
src/main/java/com/pahimar/ee3/handler/ItemTooltipEventHandler.java
View file

@ -1,10 +1,10 @@
package com.pahimar.ee3.handler;
import com.pahimar.ee3.api.OreStack;
import com.pahimar.ee3.api.WrappedStack;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.emc.EmcType;
import com.pahimar.ee3.emc.EmcValue;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.item.crafting.RecipeRegistry;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.ForgeSubscribe;
@ -16,7 +16,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
* ItemTooltipEventHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemTooltipEventHandler
{

1
src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java
View file

@ -21,7 +21,6 @@ import java.util.EnumSet;
* KeyBindingHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler
{

2
src/main/java/com/pahimar/ee3/handler/PlayerDestroyItemHandler.java
View file

@ -9,7 +9,6 @@ import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
* PlayerDestroyItemHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class PlayerDestroyItemHandler
{
@ -21,5 +20,4 @@ public class PlayerDestroyItemHandler
// TODO Come back and actually do what I want here
}
}

2
src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java
View file

@ -27,7 +27,6 @@ import java.util.EnumSet;
* TransmutationTargetOverlayHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
@SideOnly(Side.CLIENT)
public class TransmutationTargetOverlayHandler implements ITickHandler
@ -158,5 +157,4 @@ public class TransmutationTargetOverlayHandler implements ITickHandler
GL11.glPopMatrix();
GL11.glPopMatrix();
}
}

2
src/main/java/com/pahimar/ee3/handler/VersionCheckTickHandler.java
View file

@ -18,7 +18,6 @@ import java.util.EnumSet;
* VersionCheckTickHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class VersionCheckTickHandler implements ITickHandler
{
@ -76,5 +75,4 @@ public class VersionCheckTickHandler implements ITickHandler
return Reference.MOD_NAME + ": " + this.getClass().getSimpleName();
}
}

2
src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java
View file

@ -30,7 +30,6 @@ import net.minecraftforge.event.ForgeSubscribe;
* WorldTransmutationHandler
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class WorldTransmutationHandler
{
@ -204,5 +203,4 @@ public class WorldTransmutationHandler
event.actionResult = ActionResult.FAILURE;
}
}
}

10
src/main/java/com/pahimar/ee3/helper/DebugHelper.java
View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.helper;
import com.pahimar.ee3.api.OreStack;
import com.pahimar.ee3.api.WrappedStack;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.item.crafting.RecipeRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.ItemStack;
@ -13,7 +13,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class DebugHelper {
public class DebugHelper
{
public static void printOreDictionaryContents()
{
@ -36,7 +37,8 @@ public class DebugHelper {
for (String oreName : oreNames)
{
if (!EmcRegistry.hasEmcValue(new OreStack(oreName))) {
if (!EmcRegistry.hasEmcValue(new OreStack(oreName)))
{
LogHelper.debug(String.format("OreStack '%s' requires an EmcValue", oreName));
}
}

2
src/main/java/com/pahimar/ee3/helper/EmcHelper.java
View file

@ -1,9 +1,9 @@
package com.pahimar.ee3.helper;
import com.pahimar.ee3.api.WrappedStack;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.emc.EmcType;
import com.pahimar.ee3.emc.EmcValue;
import com.pahimar.ee3.item.WrappedStack;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry;

6
src/main/java/com/pahimar/ee3/helper/FluidHelper.java
View file

@ -19,9 +19,11 @@ public class FluidHelper
// Register Milk in the FluidRegistry if it hasn't already been done
if (!FluidRegistry.isFluidRegistered("milk"))
{
Fluid milk = new Fluid("milk") {
Fluid milk = new Fluid("milk")
{
@Override
public String getLocalizedName() {
public String getLocalizedName()
{
return StatCollector.translateToLocal("item.milk.name");
}
}.setUnlocalizedName(Item.bucketMilk.getUnlocalizedName());

2
src/main/java/com/pahimar/ee3/helper/GeneralHelper.java
View file

@ -14,7 +14,6 @@ import java.util.ArrayList;
* GeneralHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class GeneralHelper
{
@ -60,5 +59,4 @@ public class GeneralHelper
return entity instanceof IMob;
}
}

14
src/main/java/com/pahimar/ee3/helper/ItemHelper.java
View file

@ -16,7 +16,6 @@ import java.util.Comparator;
* ItemDropHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemHelper
{
@ -24,11 +23,14 @@ public class ItemHelper
private static double rand;
/**
* Compares two ItemStacks for equality, testing itemID, metaData,
* stackSize, and their NBTTagCompounds (if they are present)
* Compares two ItemStacks for equality, testing itemID, metaData, stackSize, and their NBTTagCompounds (if they are
* present)
*
* @param first
* The first ItemStack being tested for equality
* @param second
* The second ItemStack being tested for equality
*
* @param first The first ItemStack being tested for equality
* @param second The second ItemStack being tested for equality
* @return true if the two ItemStacks are equivalent, false otherwise
*/
public static boolean equals(ItemStack first, ItemStack second)
@ -181,8 +183,6 @@ public class ItemHelper
{
return 0;
}
}
};
}

14
src/main/java/com/pahimar/ee3/helper/ItemStackNBTHelper.java
View file

@ -9,7 +9,6 @@ import net.minecraft.nbt.NBTTagCompound;
* NBTHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemStackNBTHelper
{
@ -17,8 +16,8 @@ public class ItemStackNBTHelper
/**
* Initializes the NBT Tag Compound for the given ItemStack if it is null
*
* @param itemStack The ItemStack for which its NBT Tag Compound is being checked
* for initialization
* @param itemStack
* The ItemStack for which its NBT Tag Compound is being checked for initialization
*/
private static void initNBTTagCompound(ItemStack itemStack)
{
@ -31,13 +30,7 @@ public class ItemStackNBTHelper
public static boolean hasTag(ItemStack itemStack, String keyName)
{
if (itemStack.stackTagCompound != null)
{
return itemStack.stackTagCompound.hasKey(keyName);
}
return false;
return itemStack.stackTagCompound != null && itemStack.stackTagCompound.hasKey(keyName);
}
public static void removeTag(ItemStack itemStack, String keyName)
@ -224,5 +217,4 @@ public class ItemStackNBTHelper
itemStack.stackTagCompound.setDouble(keyName, keyValue);
}
}

3
src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java
View file

@ -11,7 +11,6 @@ import java.util.ArrayList;
* KeyBindingHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class KeyBindingHelper
{
@ -54,7 +53,7 @@ public class KeyBindingHelper
for (int x = 0; x < isRepeating.length; x++)
{
isRepeating[x] = isRepeatingList.get(x).booleanValue();
isRepeating[x] = isRepeatingList.get(x);
}
return isRepeating;

1
src/main/java/com/pahimar/ee3/helper/LogHelper.java
View file

@ -12,7 +12,6 @@ import java.util.logging.Logger;
* LogHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class LogHelper
{

2
src/main/java/com/pahimar/ee3/helper/QualityHelper.java
View file

@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
* QualityHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class QualityHelper
{
@ -42,5 +41,4 @@ public class QualityHelper
return -1;
}
}

23
src/main/java/com/pahimar/ee3/helper/RecipeHelper.java
View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.helper;
import com.pahimar.ee3.item.EnergyStack;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.api.EnergyStack;
import com.pahimar.ee3.api.OreStack;
import com.pahimar.ee3.api.WrappedStack;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes;
@ -20,7 +20,6 @@ import java.util.List;
* RecipeHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class RecipeHelper
{
@ -28,9 +27,10 @@ public class RecipeHelper
/**
* Returns a list of elements that constitute the input in a crafting recipe
*
* @param recipe The IRecipe being examined
* @return List of elements that constitute the input of the given IRecipe.
* Could be an ItemStack or an Arraylist
* @param recipe
* The IRecipe being examined
*
* @return List of elements that constitute the input of the given IRecipe. Could be an ItemStack or an Arraylist
*/
public static ArrayList<WrappedStack> getRecipeInputs(IRecipe recipe)
{
@ -146,10 +146,11 @@ public class RecipeHelper
}
/**
* Collates an uncollated, unsorted List of Objects into a sorted, collated
* List of WrappedStacks
* Collates an uncollated, unsorted List of Objects into a sorted, collated List of WrappedStacks
*
* @param uncollatedStacks
* List of objects for collating
*
* @param uncollatedStacks List of objects for collating
* @return A sorted, collated List of WrappedStacks
*/
public static List<WrappedStack> collateInputStacks(List<?> uncollatedStacks)
@ -196,7 +197,6 @@ public class RecipeHelper
collatedStacks.get(i).setStackSize(collatedStacks.get(i).getStackSize() + stack.getStackSize());
found = true;
}
}
else if (stack.getWrappedStack() instanceof EnergyStack && collatedStacks.get(i).getWrappedStack() instanceof EnergyStack)
{
@ -215,7 +215,6 @@ public class RecipeHelper
}
}
}
}
Collections.sort(collatedStacks);
return collatedStacks;

2
src/main/java/com/pahimar/ee3/helper/TransmutationHelper.java
View file

@ -15,7 +15,6 @@ import java.util.ArrayList;
* TransmutationHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class TransmutationHelper
{
@ -177,5 +176,4 @@ public class TransmutationHelper
// In the event the list is null, return null
return prevStack;
}
}

6
src/main/java/com/pahimar/ee3/helper/VersionHelper.java
View file

@ -46,9 +46,8 @@ public class VersionHelper implements Runnable
public static String remoteUpdateLocation = null;
/**
* Checks the version of the currently running instance of the mod against
* the remote version authority, and sets the result of the check
* appropriately
* Checks the version of the currently running instance of the mod against the remote version authority, and sets
* the result of the check appropriately
*/
public static void checkVersion()
{
@ -94,7 +93,6 @@ public class VersionHelper implements Runnable
result = OUTDATED;
}
}
}
else
{

3
src/main/java/com/pahimar/ee3/imc/InterModCommsHandler.java
View file

@ -5,10 +5,10 @@ import com.google.gson.Gson;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.api.RecipeMapping;
import com.pahimar.ee3.api.StackValueMapping;
import com.pahimar.ee3.api.WrappedStack;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.emc.EmcValue;
import com.pahimar.ee3.emc.EmcValuesIMC;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.item.crafting.RecipesIMC;
import com.pahimar.ee3.lib.Reference;
import cpw.mods.fml.common.IScheduledTickHandler;
@ -224,7 +224,6 @@ public class InterModCommsHandler implements ITickHandler, IScheduledTickHandler
imcMessage.getSender(),
InterModCommsOperations.EMC_RETURN_GET_VALUE,
String.format("%s==%s", gson.toJson(itemStack), EmcRegistry.getEmcValue(itemStack).toJson()));
}
else
{

1
src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java
View file

@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack;
* ContainerAlchemicalBag
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ContainerAlchemicalBag extends Container
{

1
src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java
View file

@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
* ContainerAlchemicalChest
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ContainerAlchemicalChest extends Container
{

1
src/main/java/com/pahimar/ee3/inventory/ContainerAludel.java
View file

@ -15,7 +15,6 @@ import net.minecraft.tileentity.TileEntityFurnace;
* ContainerAludel
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ContainerAludel extends Container
{

2
src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java
View file

@ -14,7 +14,6 @@ import net.minecraft.tileentity.TileEntityFurnace;
* ContainerCalcinator
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ContainerCalcinator extends Container
{
@ -118,5 +117,4 @@ public class ContainerCalcinator extends Container
return itemStack;
}
}

1
src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java
View file

@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
* ContainerGlassBell
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ContainerGlassBell extends Container
{

2
src/main/java/com/pahimar/ee3/inventory/ContainerPortableCrafting.java
View file

@ -14,7 +14,6 @@ import net.minecraft.world.World;
* ContainerPortableCrafting
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ContainerPortableCrafting extends ContainerWorkbench
{
@ -53,5 +52,4 @@ public class ContainerPortableCrafting extends ContainerWorkbench
}
}
}
}

1
src/main/java/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java
View file

@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
* ContainerPortableTransmutation
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ContainerPortableTransmutation extends Container
{

2
src/main/java/com/pahimar/ee3/inventory/SlotCalcinator.java
View file

@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack;
* SlotCalcinator
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class SlotCalcinator extends Slot
{
@ -27,5 +26,4 @@ public class SlotCalcinator extends Slot
return false;
}
}

2
src/main/java/com/pahimar/ee3/item/IChargeable.java
View file

@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
* IChargeable
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public interface IChargeable
{
@ -20,5 +19,4 @@ public interface IChargeable
public abstract void increaseCharge(ItemStack stack);
public abstract void decreaseCharge(ItemStack stack);
}

2
src/main/java/com/pahimar/ee3/item/IKeyBound.java
View file

@ -9,11 +9,9 @@ import net.minecraft.item.ItemStack;
* IKeyBound
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public interface IKeyBound
{
public abstract void doKeyBindingAction(EntityPlayer thePlayer, ItemStack itemStack, String keyBinding);
}

2
src/main/java/com/pahimar/ee3/item/ITransmutationStone.java
View file

@ -10,7 +10,6 @@ import net.minecraft.world.World;
* ITransmutationStone
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public interface ITransmutationStone
{
@ -20,5 +19,4 @@ public interface ITransmutationStone
public abstract void openPortableTransmutationGUI(EntityPlayer thePlayer, ItemStack itemStack);
public abstract void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit);
}

3
src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java
View file

@ -21,12 +21,11 @@ import net.minecraft.world.World;
* ItemAlchemicalBag
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemAlchemicalBag extends ItemEE
{
private static final String[] ALCHEMICAL_BAG_SUBTYPES = new String[] {"Open", "OpenDrawString", "Closed", "ClosedDrawString"};
private static final String[] ALCHEMICAL_BAG_SUBTYPES = new String[]{"Open", "OpenDrawString", "Closed", "ClosedDrawString"};
@SideOnly(Side.CLIENT)
private Icon[] icons;

1
src/main/java/com/pahimar/ee3/item/ItemAlchemicalChalk.java
View file

@ -13,5 +13,4 @@ public class ItemAlchemicalChalk extends ItemEE
this.setUnlocalizedName(Strings.RESOURCE_PREFIX + Strings.ALCHEMICAL_CHALK_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
}
}

3
src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
View file

@ -19,12 +19,11 @@ import java.util.List;
* ItemAlchemicalDust
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemAlchemicalDust extends ItemEE
{
private static final String[] ALCHEMICAL_DUST_NAMES = new String[] {"Ash", "Minium", "Verdant", "Azure", "Amaranthine", "Iridescent"};
private static final String[] ALCHEMICAL_DUST_NAMES = new String[]{"Ash", "Minium", "Verdant", "Azure", "Amaranthine", "Iridescent"};
@SideOnly(Side.CLIENT)
private Icon[] icons;

1
src/main/java/com/pahimar/ee3/item/ItemEE.java
View file

@ -12,7 +12,6 @@ import net.minecraft.item.Item;
* ItemEE
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemEE extends Item
{

1
src/main/java/com/pahimar/ee3/item/ItemInertStone.java
View file

@ -9,7 +9,6 @@ import com.pahimar.ee3.lib.Strings;
* ItemInertStone
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemInertStone extends ItemEE
{

1
src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java
View file

@ -9,7 +9,6 @@ import com.pahimar.ee3.lib.Strings;
* ItemMiniumShard
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemMiniumShard extends ItemEE
{

3
src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java
View file

@ -19,7 +19,6 @@ import net.minecraft.world.World;
* ItemMiniumStone
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemMiniumStone extends ItemEE
implements ITransmutationStone, IKeyBound
@ -140,7 +139,5 @@ public class ItemMiniumStone extends ItemEE
}
}
}
}
}

3
src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java
View file

@ -23,7 +23,6 @@ import net.minecraft.world.World;
* ItemPhilosophersStone
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ItemPhilosophersStone extends ItemEE
implements ITransmutationStone, IChargeable, IKeyBound
@ -211,7 +210,5 @@ public class ItemPhilosophersStone extends ItemEE
}
}
}
}
}

5
src/main/java/com/pahimar/ee3/item/ModItems.java
View file

@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
* ModItems
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class ModItems
{
@ -53,8 +52,8 @@ public class ModItems
GameRegistry.registerItem(alchemicalChalk, Strings.ALCHEMICAL_CHALK_NAME);
// Add recipes for items
GameRegistry.addRecipe(new ItemStack(inertStone), new Object[] {"sis", "igi", "sis", 's', Block.stone, 'i', Item.ingotIron, 'g', Item.ingotGold});
GameRegistry.addRecipe(new ItemStack(miniumStone), new Object[] {"sss", "sis", "sss", 's', miniumShard, 'i', inertStone});
GameRegistry.addRecipe(new ItemStack(inertStone), new Object[]{"sis", "igi", "sis", 's', Block.stone, 'i', Item.ingotIron, 'g', Item.ingotGold});
GameRegistry.addRecipe(new ItemStack(miniumStone), new Object[]{"sss", "sis", "sss", 's', miniumShard, 'i', inertStone});
GameRegistry.addShapelessRecipe(new ItemStack(alchemicalChalk), new ItemStack(Item.clay), new ItemStack(Item.dyePowder.itemID, 1, 15), new ItemStack(Item.dyePowder.itemID, 1, 15), new ItemStack(Item.dyePowder.itemID, 1, 15), new ItemStack(Item.dyePowder.itemID, 1, 15));
}
}

38
src/main/java/com/pahimar/ee3/item/crafting/RecipeRegistry.java
View file

@ -2,7 +2,7 @@ package com.pahimar.ee3.item.crafting;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.api.WrappedStack;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -39,36 +39,48 @@ public class RecipeRegistry
private void init()
{
// Add recipes in the vanilla crafting manager
for (WrappedStack outputStack : RecipesVanilla.getVanillaRecipes().keySet()) {
for (List<WrappedStack> inputStacks : RecipesVanilla.getVanillaRecipes().get(outputStack)) {
if (!recipeMap.get(outputStack).contains(inputStacks)) {
for (WrappedStack outputStack : RecipesVanilla.getVanillaRecipes().keySet())
{
for (List<WrappedStack> inputStacks : RecipesVanilla.getVanillaRecipes().get(outputStack))
{
if (!recipeMap.get(outputStack).contains(inputStacks))
{
recipeMap.put(outputStack, inputStacks);
}
}
}
// Add fluid container recipes
for (WrappedStack outputStack : RecipesFluidContainers.getFluidContainerRecipes().keySet()) {
for (List<WrappedStack> inputStacks : RecipesFluidContainers.getFluidContainerRecipes().get(outputStack)) {
if (!recipeMap.get(outputStack).contains(inputStacks)) {
for (WrappedStack outputStack : RecipesFluidContainers.getFluidContainerRecipes().keySet())
{
for (List<WrappedStack> inputStacks : RecipesFluidContainers.getFluidContainerRecipes().get(outputStack))
{
if (!recipeMap.get(outputStack).contains(inputStacks))
{
recipeMap.put(outputStack, inputStacks);
}
}
}
// Add potion recipes
for (WrappedStack outputStack : RecipesPotions.getPotionRecipes().keySet()) {
for (List<WrappedStack> inputStacks : RecipesPotions.getPotionRecipes().get(outputStack)) {
if (!recipeMap.get(outputStack).contains(inputStacks)) {
for (WrappedStack outputStack : RecipesPotions.getPotionRecipes().keySet())
{
for (List<WrappedStack> inputStacks : RecipesPotions.getPotionRecipes().get(outputStack))
{
if (!recipeMap.get(outputStack).contains(inputStacks))
{
recipeMap.put(outputStack, inputStacks);
}
}
}
// Add recipes gathered via IMC
for (WrappedStack outputStack : RecipesIMC.getIMCRecipes().keySet()) {
for (List<WrappedStack> inputStacks : RecipesIMC.getIMCRecipes().get(outputStack)) {
if (!recipeMap.get(outputStack).contains(inputStacks)) {
for (WrappedStack outputStack : RecipesIMC.getIMCRecipes().keySet())
{
for (List<WrappedStack> inputStacks : RecipesIMC.getIMCRecipes().get(outputStack))
{
if (!recipeMap.get(outputStack).contains(inputStacks))
{
recipeMap.put(outputStack, inputStacks);
}
}

2
src/main/java/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java
View file

@ -17,7 +17,6 @@ import java.util.ArrayList;
* RecipesAlchemicalBagDyes
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class RecipesAlchemicalBagDyes implements IRecipe
{
@ -167,5 +166,4 @@ public class RecipesAlchemicalBagDyes implements IRecipe
return null;
}
}

2
src/main/java/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java
View file

@ -2,7 +2,7 @@ package com.pahimar.ee3.item.crafting;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.api.WrappedStack;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;

Some files were not shown because too many files have changed in this diff Show more