mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +00:00
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:
1 parent
ae2d8d6e4d
commit
80efde613a
419 files changed
+2406
-4144
No files matched your search
@@ -1,15 +1,9 @@
|
||||
package tconstruct.util;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import java.util.*;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.ShapedRecipes;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.item.crafting.*;
|
||||
|
||||
public class CraftingRecipeHelper
|
||||
{
|
||||
@@ -70,7 +64,6 @@ public class CraftingRecipeHelper
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray)
|
||||
{
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package tconstruct.util;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
import net.minecraft.util.*;
|
||||
|
||||
public class DamageSourceFireworkExplode extends DamageSource
|
||||
{
|
||||
@@ -17,7 +15,7 @@ public class DamageSourceFireworkExplode extends DamageSource
|
||||
@Override
|
||||
public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase)
|
||||
{
|
||||
return new ChatComponentTranslation("death.attack.FireworkExplode", par1EntityLivingBase.func_145748_c_());
|
||||
return new ChatComponentTranslation("death.attack.FireworkExplode", par1EntityLivingBase.func_145748_c_());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +1,7 @@
|
||||
package tconstruct.util;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
import net.minecraft.util.*;
|
||||
|
||||
public class DamageSourceLandmine extends DamageSource
|
||||
{
|
||||
|
||||
@@ -1,16 +1,11 @@
|
||||
package tconstruct.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import mantle.crash.CallableSuppConfig;
|
||||
import mantle.crash.CallableUnsuppConfig;
|
||||
import cpw.mods.fml.common.*;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import java.util.*;
|
||||
import mantle.crash.*;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import tconstruct.TConstruct;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.ICrashCallable;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
public class EnvironmentChecks
|
||||
{
|
||||
@@ -64,9 +59,7 @@ public class EnvironmentChecks
|
||||
String n = consoleFormat ? System.getProperty("line.separator") : "\n";
|
||||
if (type.equals("GregTech"))
|
||||
{
|
||||
return "- GregTech is a meta-mod that changes how a lot of mods interact with the base game and with each other." + n
|
||||
+ "- The mod restructures the registration of various ores within the Ore Dictionary. This may alter or break the original design intention of various other mods." + n
|
||||
+ "- This mod alters various fundamental recipes from vanilla Minecraft.";
|
||||
return "- GregTech is a meta-mod that changes how a lot of mods interact with the base game and with each other." + n + "- The mod restructures the registration of various ores within the Ore Dictionary. This may alter or break the original design intention of various other mods." + n + "- This mod alters various fundamental recipes from vanilla Minecraft.";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
package tconstruct.util;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.*;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
|
||||
public class ItemHelper
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package tconstruct.util.config;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import tconstruct.TConstruct;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
|
||||
public class DimensionBlacklist
|
||||
{
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
package tconstruct.util.config;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.common.config.Property;
|
||||
import net.minecraftforge.common.config.*;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
|
||||
public class PHConstruct
|
||||
{
|
||||
@@ -77,6 +74,8 @@ public class PHConstruct
|
||||
|
||||
capesEnabled = config.get("Superfun", "Enable-TCon-Capes", true).getBoolean(true);
|
||||
|
||||
achievementsEnabled = config.get("Achievements", "Enable Achievements", true).getBoolean(true);
|
||||
|
||||
boolean ic2 = true;
|
||||
boolean xycraft = true;
|
||||
try
|
||||
@@ -177,8 +176,7 @@ public class PHConstruct
|
||||
|
||||
// dimension blacklist
|
||||
cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}, "Add dimension ID's to prevent slime islands from generating in them").getIntList();
|
||||
slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false,
|
||||
"True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages").getBoolean(false);
|
||||
slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false, "True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages").getBoolean(false);
|
||||
slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true, "True: slime islands generate in overworld; False they do not generate").getBoolean(true);
|
||||
genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false, "Generate slime islands in flat worlds").getBoolean(false);
|
||||
|
||||
@@ -212,6 +210,9 @@ public class PHConstruct
|
||||
|
||||
public static boolean capesEnabled;
|
||||
|
||||
// Achievements
|
||||
public static boolean achievementsEnabled;
|
||||
|
||||
// Ore values
|
||||
public static boolean generateCopper;
|
||||
public static boolean generateTin;
|
||||
|
||||
@@ -9,7 +9,9 @@ import tconstruct.armor.player.TPlayerStats;
|
||||
|
||||
public class BeltPacket extends AbstractPacket
|
||||
{
|
||||
public BeltPacket() {}
|
||||
public BeltPacket()
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer)
|
||||
|
||||
@@ -10,7 +10,9 @@ public class GogglePacket extends AbstractPacket
|
||||
{
|
||||
boolean active;
|
||||
|
||||
public GogglePacket() {}
|
||||
public GogglePacket()
|
||||
{
|
||||
}
|
||||
|
||||
public GogglePacket(boolean active)
|
||||
{
|
||||
|
||||
@@ -1,31 +1,17 @@
|
||||
package tconstruct.util.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import io.netty.channel.ChannelHandler;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.handler.codec.MessageToMessageCodec;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.EnumMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import mantle.common.network.AbstractPacket;
|
||||
import mantle.common.network.PacketUpdateTE;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.network.INetHandler;
|
||||
import net.minecraft.network.NetHandlerPlayServer;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
|
||||
import cpw.mods.fml.common.network.FMLOutboundHandler;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.network.*;
|
||||
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import cpw.mods.fml.relauncher.*;
|
||||
import io.netty.buffer.*;
|
||||
import io.netty.channel.*;
|
||||
import io.netty.handler.codec.MessageToMessageCodec;
|
||||
import java.util.*;
|
||||
import mantle.common.network.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.*;
|
||||
import net.minecraft.network.*;
|
||||
|
||||
/**
|
||||
* Packet pipeline class. Directs all registered packet data to be handled by
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package tconstruct.util.network;
|
||||
|
||||
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import mantle.blocks.abstracts.InventoryLogic;
|
||||
@@ -8,7 +9,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||
|
||||
public class PatternTablePacket extends AbstractPacket
|
||||
{
|
||||
|
||||
@@ -2,8 +2,7 @@ package tconstruct.util.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import mantle.common.network.AbstractPacket;
|
||||
import mantle.common.network.PacketUpdateTE;
|
||||
import mantle.common.network.*;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
package tconstruct.util.network;
|
||||
|
||||
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import mantle.common.network.AbstractPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.tools.logic.ToolForgeLogic;
|
||||
import tconstruct.tools.logic.ToolStationLogic;
|
||||
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||
import tconstruct.tools.logic.*;
|
||||
|
||||
public class ToolStationPacket extends AbstractPacket
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user