The return of achievements

- Re-added achievements
- Organised all imports (seemed all over the place)
- Formatted all code (seemed very combined, used the TinkerStyle)
This commit is contained in:
Arthur Uzulin committed 2014-09-09 18:30:15 +10:00
1 parent ae2d8d6e4d
commit 80efde613a
419 files changed
+2406 -4144

No files matched your search

@@ -1,15 +1,11 @@
package tconstruct.plugins.ic2;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import mantle.pulsar.pulse.*;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.*;
import tconstruct.TConstruct;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.LiquidCasting;
@@ -1,28 +1,21 @@
package tconstruct.plugins.imc;
import java.util.Arrays;
import java.util.List;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import java.util.*;
import mantle.pulsar.pulse.*;
import tconstruct.TConstruct;
import cpw.mods.fml.common.event.FMLInterModComms;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers AE2 Compatibility", description = "Tinkers Construct compatibility for Applied Energistics 2", modsRequired = "appliedenergistics2")
public class TinkerAE2
{
private static List<String> spatialIOLogics = Arrays.asList(
"EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these?
private static List<String> spatialIOLogics = Arrays.asList("EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these?
"MultiServantLogic"); //TODO Should Mantle handle this?
private static List<String> spatialIOSmelteryLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic",
"CastingTableLogic", "FaucetLogic", "LavaTankLogic", "SmelteryDrainLogic", "SmelteryLogic", "TankAirLogic", "TowerFurnaceLogic");
private static List<String> spatialIOSmelteryLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", "CastingTableLogic", "FaucetLogic", "LavaTankLogic", "SmelteryDrainLogic", "SmelteryLogic", "TankAirLogic", "TowerFurnaceLogic");
private static List<String> spatialIOToolLogics = Arrays.asList("CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", "PatternChestLogic",
"StencilTableLogic", "ToolForgeLogic", "ToolStationLogic");
private static List<String> spatialIOToolLogics = Arrays.asList("CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", "PatternChestLogic", "StencilTableLogic", "ToolForgeLogic", "ToolStationLogic");
@Handler
public void init (FMLInitializationEvent event)
@@ -32,18 +25,18 @@ public class TinkerAE2
addtoSpatialWhitelist("tconstruct.blocks.logic.DryingRackLogic");
addtoSpatialWhitelist("tconstruct.mechworks.logic.TileEntityLandmine");
for(String s : spatialIOSmelteryLogics)
for (String s : spatialIOSmelteryLogics)
{
addtoSpatialWhitelist("tconstruct.smeltery.logic." + s);
}
for(String s : spatialIOToolLogics)
for (String s : spatialIOToolLogics)
{
addtoSpatialWhitelist("tconstruct.tools.logic." + s);
}
}
public void addtoSpatialWhitelist(String teClass)
public void addtoSpatialWhitelist (String teClass)
{
FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", teClass);
}
@@ -1,13 +1,10 @@
package tconstruct.plugins.imc;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.*;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
import tconstruct.smeltery.TinkerSmeltery;
@@ -16,7 +13,7 @@ import tconstruct.smeltery.TinkerSmeltery;
public class TinkerBuildCraft
{
@Handler
public void init(FMLInitializationEvent event)
public void init (FMLInitializationEvent event)
{
TConstruct.logger.info("BuildCraft detected. Registering facades.");
// Smeltery Blocks
@@ -1,20 +1,16 @@
package tconstruct.plugins.imc;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import mantle.pulsar.pulse.*;
import net.minecraft.nbt.NBTTagCompound;
import tconstruct.TConstruct;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers Mystcraft Compatibility", forced = true, modsRequired = "Mystcraft")
public class TinkerMystcraft
{
private static String[] fluids = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten", "moltenArdite",
"ender", "steel.molten", "platinum.molten" };
private static String[] fluids = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten", "moltenArdite", "ender", "steel.molten", "platinum.molten" };
@Handler
public void init (FMLInitializationEvent event)
@@ -1,13 +1,11 @@
package tconstruct.plugins.imc;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.*;
import net.minecraft.item.ItemStack;
import tconstruct.TConstruct;
import tconstruct.world.TinkerWorld;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers Thaumcraft Compatibility", description = "Tinkers Construct compatibility for Thaumcraft", modsRequired = "Thaumcraft", pulsesRequired = "Tinkers' World")
@@ -1,9 +1,7 @@
package tconstruct.plugins.mfr;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.potion.*;
import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler;
public class Drinkables implements ILiquidDrinkHandler
@@ -1,16 +1,11 @@
package tconstruct.plugins.mfr;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.*;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import powercrystals.minefactoryreloaded.api.IFactoryGrindable;
import powercrystals.minefactoryreloaded.api.MobDrop;
import powercrystals.minefactoryreloaded.api.*;
import tconstruct.tools.TinkerTools;
public class GrindableHorse implements IFactoryGrindable
@@ -1,17 +1,10 @@
package tconstruct.plugins.mfr;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.*;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.*;
import net.minecraft.world.World;
import powercrystals.minefactoryreloaded.api.HarvestType;
import powercrystals.minefactoryreloaded.api.IFactoryHarvestable;
import powercrystals.minefactoryreloaded.api.*;
public class HarvestableOreBerry implements IFactoryHarvestable
{
@@ -1,7 +1,6 @@
package tconstruct.plugins.mfr;
import powercrystals.minefactoryreloaded.api.FactoryRegistry;
import powercrystals.minefactoryreloaded.api.ValuedItem;
import powercrystals.minefactoryreloaded.api.*;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.world.TinkerWorld;
@@ -2,8 +2,7 @@ package tconstruct.plugins.mfr;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import mantle.pulsar.pulse.*;
import tconstruct.TConstruct;
@ObjectHolder(TConstruct.modID)
@@ -1,10 +1,10 @@
package tconstruct.plugins.nei;
import tconstruct.tools.gui.CraftingStationGui;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.common.FMLCommonHandler;
import codechicken.nei.recipe.DefaultOverlayHandler;
import codechicken.nei.api.API;
import codechicken.nei.recipe.DefaultOverlayHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import tconstruct.tools.gui.CraftingStationGui;
public class NEICompat
{
@@ -1,10 +1,9 @@
package tconstruct.plugins.nei;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.*;
import tconstruct.TConstruct;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers NEI Compatibility", description = "Tinkers Construct compatibility for NEI", modsRequired = "NotEnoughItems")
@@ -1,11 +1,10 @@
package tconstruct.plugins.te4;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.event.FMLInterModComms;
/**
* Taken from CoFHLib
*
@@ -14,9 +13,11 @@ import cpw.mods.fml.common.event.FMLInterModComms;
public class TE4Helper
{
public static void addFurnaceRecipe(int energy, ItemStack input, ItemStack output) {
public static void addFurnaceRecipe (int energy, ItemStack input, ItemStack output)
{
if (input == null || output == null) {
if (input == null || output == null)
{
return;
}
NBTTagCompound toSend = new NBTTagCompound();
@@ -30,19 +31,23 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "FurnaceRecipe", toSend);
}
public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput) {
public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput)
{
addPulverizerRecipe(energy, input, primaryOutput, null, 0);
}
public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) {
public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput)
{
addPulverizerRecipe(energy, input, primaryOutput, secondaryOutput, 100);
}
public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) {
public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance)
{
if (input == null || primaryOutput == null || secondaryOutput == null) {
if (input == null || primaryOutput == null || secondaryOutput == null)
{
return;
}
NBTTagCompound toSend = new NBTTagCompound();
@@ -60,19 +65,23 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "PulverizerRecipe", toSend);
}
public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput) {
public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput)
{
addSawmillRecipe(energy, input, primaryOutput, null, 0);
}
public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) {
public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput)
{
addSawmillRecipe(energy, input, primaryOutput, secondaryOutput, 100);
}
public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) {
public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance)
{
if (input == null || primaryOutput == null || secondaryOutput == null) {
if (input == null || primaryOutput == null || secondaryOutput == null)
{
return;
}
NBTTagCompound toSend = new NBTTagCompound();
@@ -90,20 +99,23 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "SawmillRecipe", toSend);
}
public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) {
public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput)
{
addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, null, 0);
}
public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput) {
public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput)
{
addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, secondaryOutput, 100);
}
public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput,
int secondaryChance) {
public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance)
{
if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) {
if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null)
{
return;
}
NBTTagCompound toSend = new NBTTagCompound();
@@ -131,7 +143,8 @@ public class TE4Helper
*
* @param oreType
*/
public static void addSmelterBlastOre(String oreType) {
public static void addSmelterBlastOre (String oreType)
{
NBTTagCompound toSend = new NBTTagCompound();
@@ -140,9 +153,11 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "SmelterBlastOreType", toSend);
}
public static void addCrucibleRecipe(int energy, ItemStack input, FluidStack output) {
public static void addCrucibleRecipe (int energy, ItemStack input, FluidStack output)
{
if (input == null || output == null) {
if (input == null || output == null)
{
return;
}
NBTTagCompound toSend = new NBTTagCompound();
@@ -157,9 +172,11 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
}
public static void addTransposerFill(int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) {
public static void addTransposerFill (int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible)
{
if (input == null || output == null || fluid == null) {
if (input == null || output == null || fluid == null)
{
return;
}
NBTTagCompound toSend = new NBTTagCompound();
@@ -177,9 +194,11 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "TransposerFillRecipe", toSend);
}
public static void addTransposerExtract(int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) {
public static void addTransposerExtract (int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible)
{
if (input == null || output == null || fluid == null) {
if (input == null || output == null || fluid == null)
{
return;
}
NBTTagCompound toSend = new NBTTagCompound();
@@ -198,7 +217,8 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "TransposerExtractRecipe", toSend);
}
public static void addMagmaticFuel(String fluidName, int energy) {
public static void addMagmaticFuel (String fluidName, int energy)
{
NBTTagCompound toSend = new NBTTagCompound();
@@ -208,7 +228,8 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "MagmaticFuel", toSend);
}
public static void addCompressionFuel(String fluidName, int energy) {
public static void addCompressionFuel (String fluidName, int energy)
{
NBTTagCompound toSend = new NBTTagCompound();
@@ -218,7 +239,8 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "CompressionFuel", toSend);
}
public static void addReactantFuel(String fluidName, int energy) {
public static void addReactantFuel (String fluidName, int energy)
{
NBTTagCompound toSend = new NBTTagCompound();
@@ -228,7 +250,8 @@ public class TE4Helper
FMLInterModComms.sendMessage("ThermalExpansion", "ReactantFuel", toSend);
}
public static void addCoolant(String fluidName, int energy) {
public static void addCoolant (String fluidName, int energy)
{
NBTTagCompound toSend = new NBTTagCompound();
@@ -1,14 +1,11 @@
package tconstruct.plugins.te4;
import cpw.mods.fml.common.registry.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.*;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import net.minecraftforge.oredict.*;
import tconstruct.TConstruct;
import tconstruct.tools.TinkerTools;
import tconstruct.world.TinkerWorld;
@@ -1,15 +1,11 @@
package tconstruct.plugins.waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.SpecialChars;
import java.util.List;
import mcp.mobius.waila.api.*;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.smeltery.logic.CastingBasinLogic;
import java.util.List;
public class BasinDataProvider implements IWailaDataProvider
{
@@ -1,16 +1,11 @@
package tconstruct.plugins.waila;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.SpecialChars;
import mcp.mobius.waila.api.*;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.*;
import tconstruct.smeltery.logic.CastingChannelLogic;
public class CastingChannelDataProvider implements IWailaDataProvider
@@ -1,15 +1,11 @@
package tconstruct.plugins.waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.SpecialChars;
import java.util.List;
import mcp.mobius.waila.api.*;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.smeltery.logic.LavaTankLogic;
import java.util.List;
public class SearedTankDataProvider implements IWailaDataProvider
{
@@ -1,15 +1,11 @@
package tconstruct.plugins.waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.SpecialChars;
import java.util.List;
import mcp.mobius.waila.api.*;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.smeltery.logic.SmelteryLogic;
import java.util.List;
public class SmelteryDataProvider implements IWailaDataProvider
{
@@ -1,13 +1,10 @@
package tconstruct.plugins.waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import java.util.List;
import mcp.mobius.waila.api.*;
import net.minecraft.item.ItemStack;
import tconstruct.smeltery.logic.CastingTableLogic;
import java.util.List;
public class TableDataProvider implements IWailaDataProvider
{
@@ -1,10 +1,8 @@
package tconstruct.plugins.waila;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import cpw.mods.fml.common.event.FMLInterModComms;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import mantle.pulsar.pulse.*;
import tconstruct.TConstruct;
@ObjectHolder(TConstruct.modID)
@@ -3,11 +3,8 @@ package tconstruct.plugins.waila;
import mcp.mobius.waila.api.IWailaRegistrar;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.TConstruct;
import tconstruct.smeltery.blocks.LavaTankBlock;
import tconstruct.smeltery.blocks.SmelteryBlock;
import tconstruct.smeltery.logic.CastingBasinLogic;
import tconstruct.smeltery.logic.CastingChannelLogic;
import tconstruct.smeltery.logic.CastingTableLogic;
import tconstruct.smeltery.blocks.*;
import tconstruct.smeltery.logic.*;
public class WailaRegistrar
{