diff --git a/src/main/java/gregtechmod/GT_Mod.java b/src/main/java/gregtechmod/GT_Mod.java index 1472feb..f0b561c 100644 --- a/src/main/java/gregtechmod/GT_Mod.java +++ b/src/main/java/gregtechmod/GT_Mod.java @@ -475,28 +475,28 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder { if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e); } -// -// GT_Log.out.println("GT_Mod: Adding Scrap with a Weight of " + tScrapChance + " to the Scrapbox Drops."); -// GT_ModHandler.addScrapboxDrop(tScrapChance, GT_ModHandler.getIC2Item("scrap", 1)); -// -// if (isClientSide()) { -// GT_Log.out.println("GT_Mod: Register BlockRenderer"); -// new GT_Block_Renderer(); -// GT_Log.out.println("GT_Mod: Downloading Cape List."); -// try {new Thread(new Runnable() {@Override public void run() {try { -// Scanner tScanner = new Scanner(new URL("https://dl.dropbox.com/u/88825306/CapeList.txt").openStream()); -// while (tScanner.hasNextLine()) { -// String tName = tScanner.nextLine(); -// if (!GT_Mod.mGregTechCapeList.contains(tName.toLowerCase())) GT_Mod.mGregTechCapeList.add(tName.toLowerCase()); -// } -// } catch(Throwable e) {}}}).start();} catch(Throwable e) {} -// GT_Log.out.println("GT_Mod: Downloading News."); -// try {new Thread(new Runnable() {@Override public void run() {try { -// Scanner tScanner = new Scanner(new URL("https://dl.dropboxusercontent.com/u/88825306/Message.txt").openStream()); -// while (tScanner.hasNextLine()) sMessage += tScanner.nextLine() + " "; -// } catch(Throwable e) {}}}).start();} catch(Throwable e) {} -// } -// + + GT_Log.log.info("GT_Mod: Adding Scrap with a Weight of " + tScrapChance + " to the Scrapbox Drops."); + GT_ModHandler.addScrapboxDrop(tScrapChance, GT_ModHandler.getIC2Item("scrap", 1)); + + if (isClientSide()) { + GT_Log.log.info("GT_Mod: Register BlockRenderer"); + new GT_Block_Renderer(); + GT_Log.log.info("GT_Mod: Downloading Cape List."); + try {new Thread(new Runnable() {@Override public void run() {try { + Scanner tScanner = new Scanner(new URL("https://dl.dropbox.com/u/88825306/CapeList.txt").openStream()); + while (tScanner.hasNextLine()) { + String tName = tScanner.nextLine(); + if (!GT_Mod.mGregTechCapeList.contains(tName.toLowerCase())) GT_Mod.mGregTechCapeList.add(tName.toLowerCase()); + } + } catch(Throwable e) {}}}).start();} catch(Throwable e) {} + GT_Log.log.info("GT_Mod: Downloading News."); + try {new Thread(new Runnable() {@Override public void run() {try { + Scanner tScanner = new Scanner(new URL("https://dl.dropboxusercontent.com/u/88825306/Message.txt").openStream()); + while (tScanner.hasNextLine()) sMessage += tScanner.nextLine() + " "; + } catch(Throwable e) {}}}).start();} catch(Throwable e) {} + } + // GregTech_API.sPreloadFinished = true; // GT_Log.out.println("GT_Mod: Preload-Phase finished!"); // for (Runnable tRunnable : GregTech_API.sAfterGTPreload) { diff --git a/src/main/java/gregtechmod/common/GT_FuelHandler.java b/src/main/java/gregtechmod/common/GT_FuelHandler.java index 35e6711..eeca6b0 100644 --- a/src/main/java/gregtechmod/common/GT_FuelHandler.java +++ b/src/main/java/gregtechmod/common/GT_FuelHandler.java @@ -3,7 +3,7 @@ package gregtechmod.common; import gregtechmod.api.GregTech_API; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; -import net.minecraft.item.Item; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; @@ -17,8 +17,8 @@ public class GT_FuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack aFuel) { if (aFuel == null) return 0; - if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Item.sign, 1))) return 600; - if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Item.doorWood, 1))) return 1800; + if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) return 600; + if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) return 1800; if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustWood")) return 100; if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallWood")) return 25; if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyWood")) return 11; diff --git a/src/main/java/gregtechmod/common/GT_Proxy.java b/src/main/java/gregtechmod/common/GT_Proxy.java index 3bd3c8d..873e683 100644 --- a/src/main/java/gregtechmod/common/GT_Proxy.java +++ b/src/main/java/gregtechmod/common/GT_Proxy.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; public abstract class GT_Proxy { - public static GT_TickHandler mServerTickHandler = new GT_TickHandler(true); +// public static GT_TickHandler mServerTickHandler = new GT_TickHandler(true); public static GT_FuelHandler mFuelHandler = new GT_FuelHandler(); /** @@ -17,11 +17,6 @@ public abstract class GT_Proxy { */ public abstract boolean isClientSide(); - /** - * This means that Bukkit specific Basefiles are definitely existing! Not if the World is actually bukkit server or not! - */ - public abstract boolean isBukkitSide(); - public abstract void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ); public abstract int addArmor(String aPrefix); diff --git a/src/main/java/gregtechmod/common/GT_TickHandler.java b/src/main/java/gregtechmod/common/GT_TickHandler.java index 4b02820..5469f7d 100644 --- a/src/main/java/gregtechmod/common/GT_TickHandler.java +++ b/src/main/java/gregtechmod/common/GT_TickHandler.java @@ -13,11 +13,7 @@ import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.EnumGameType; import net.minecraft.world.World; -import cpw.mods.fml.common.ITickHandler; -import cpw.mods.fml.common.TickType; -import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; public class GT_TickHandler implements ITickHandler {