diff --git a/src/api/java/invtweaks/api/IItemTree.java b/src/api/java/invtweaks/api/IItemTree.java index 8d65e4127..0ca749a92 100644 --- a/src/api/java/invtweaks/api/IItemTree.java +++ b/src/api/java/invtweaks/api/IItemTree.java @@ -50,7 +50,7 @@ public interface IItemTree { void addCategory(String parentCategory, IItemTreeCategory newCategory) throws NullPointerException; IItemTreeItem addItem(String parentCategory, String name, String id, int damage, int order) - throws NullPointerException; + throws NullPointerException; void addItem(String parentCategory, IItemTreeItem newItem) throws NullPointerException; diff --git a/src/main/java/moze_intel/projecte/PECore.java b/src/main/java/moze_intel/projecte/PECore.java index 2235defce..cf5349fc8 100644 --- a/src/main/java/moze_intel/projecte/PECore.java +++ b/src/main/java/moze_intel/projecte/PECore.java @@ -4,30 +4,6 @@ import java.util.List; import java.util.UUID; -import moze_intel.projecte.config.CustomEMCParser; -import moze_intel.projecte.config.NBTWhitelistParser; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.emc.EMCMapper; -import moze_intel.projecte.events.ConnectionHandler; -import moze_intel.projecte.events.PlayerEvents; -import moze_intel.projecte.events.TickEvents; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.handlers.PlayerChecks; -import moze_intel.projecte.handlers.TileEntityHandler; -import moze_intel.projecte.impl.IMCHandler; -import moze_intel.projecte.integration.Integration; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.ThreadCheckUUID; -import moze_intel.projecte.network.ThreadCheckUpdate; -import moze_intel.projecte.network.commands.ProjectECMD; -import moze_intel.projecte.playerData.Transmutation; -import moze_intel.projecte.playerData.TransmutationOffline; -import moze_intel.projecte.proxies.IProxy; -import moze_intel.projecte.utils.AchievementHandler; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.GuiHandler; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; @@ -51,6 +27,29 @@ import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import moze_intel.projecte.config.CustomEMCParser; +import moze_intel.projecte.config.NBTWhitelistParser; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.emc.EMCMapper; +import moze_intel.projecte.events.ConnectionHandler; +import moze_intel.projecte.events.PlayerEvents; +import moze_intel.projecte.events.TickEvents; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.handlers.PlayerChecks; +import moze_intel.projecte.handlers.TileEntityHandler; +import moze_intel.projecte.impl.IMCHandler; +import moze_intel.projecte.integration.Integration; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.ThreadCheckUUID; +import moze_intel.projecte.network.ThreadCheckUpdate; +import moze_intel.projecte.network.commands.ProjectECMD; +import moze_intel.projecte.playerData.Transmutation; +import moze_intel.projecte.playerData.TransmutationOffline; +import moze_intel.projecte.proxies.IProxy; +import moze_intel.projecte.utils.AchievementHandler; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.GuiHandler; +import moze_intel.projecte.utils.PELogger; @Mod(modid = PECore.MODID, name = PECore.MODNAME, version = PECore.VERSION) public class PECore { @@ -59,8 +58,8 @@ public class PECore { public static final String MODNAME = "ProjectE"; public static final String VERSION = "1.7.10-PE1.10.1"; public static final GameProfile FAKEPLAYER_GAMEPROFILE = new GameProfile( - UUID.fromString("590e39c7-9fb6-471b-a4c2-c0e539b2423d"), - "[ProjectE]"); + UUID.fromString("590e39c7-9fb6-471b-a4c2-c0e539b2423d"), + "[ProjectE]"); public static File CONFIG_DIR; public static File PREGENERATED_EMC_FILE; @@ -68,8 +67,8 @@ public class PECore { public static PECore instance; @SidedProxy( - clientSide = "moze_intel.projecte.proxies.ClientProxy", - serverSide = "moze_intel.projecte.proxies.ServerProxy") + clientSide = "moze_intel.projecte.proxies.ClientProxy", + serverSide = "moze_intel.projecte.proxies.ServerProxy") public static IProxy proxy; public static final List uuids = Lists.newArrayList(); @@ -95,10 +94,16 @@ public void preInit(FMLPreInitializationEvent event) { PlayerEvents pe = new PlayerEvents(); MinecraftForge.EVENT_BUS.register(pe); - FMLCommonHandler.instance().bus().register(pe); + FMLCommonHandler.instance() + .bus() + .register(pe); - FMLCommonHandler.instance().bus().register(new TickEvents()); - FMLCommonHandler.instance().bus().register(new ConnectionHandler()); + FMLCommonHandler.instance() + .bus() + .register(new TickEvents()); + FMLCommonHandler.instance() + .bus() + .register(new ConnectionHandler()); proxy.registerClientOnlyEvents(); @@ -143,12 +148,17 @@ public void serverStarting(FMLServerStartingEvent event) { EMCMapper.map(); PELogger.logInfo( - "Registered " + EMCMapper.emc.size() - + " EMC values. (took " - + (System.currentTimeMillis() - start) - + " ms)"); - - File dir = new File(event.getServer().getEntityWorld().getSaveHandler().getWorldDirectory(), "ProjectE"); + "Registered " + EMCMapper.emc.size() + + " EMC values. (took " + + (System.currentTimeMillis() - start) + + " ms)"); + + File dir = new File( + event.getServer() + .getEntityWorld() + .getSaveHandler() + .getWorldDirectory(), + "ProjectE"); if (!dir.exists()) { dir.mkdirs(); @@ -204,10 +214,10 @@ public void remap(FMLMissingMappingsEvent event) { if (remappedItem != null) { mapping.remap(remappedItem); PELogger.logInfo( - String.format( - "Remapped ProjectE ItemBlock from %s to %s", - mapping.name, - PECore.MODID + ":" + newSubName)); + String.format( + "Remapped ProjectE ItemBlock from %s to %s", + mapping.name, + PECore.MODID + ":" + newSubName)); } else { PELogger.logFatal("Failed to remap ProjectE ItemBlock: " + mapping.name); } @@ -221,10 +231,10 @@ public void remap(FMLMissingMappingsEvent event) { if (remappedBlock != null) { mapping.remap(remappedBlock); PELogger.logInfo( - String.format( - "Remapped ProjectE Block from %s to %s", - mapping.name, - PECore.MODID + ":" + newSubName)); + String.format( + "Remapped ProjectE Block from %s to %s", + mapping.name, + PECore.MODID + ":" + newSubName)); } else { PELogger.logFatal("Failed to remap PE Block: " + mapping.name); } diff --git a/src/main/java/moze_intel/projecte/api/ProjectEAPI.java b/src/main/java/moze_intel/projecte/api/ProjectEAPI.java index 9b267808c..fef99d0eb 100644 --- a/src/main/java/moze_intel/projecte/api/ProjectEAPI.java +++ b/src/main/java/moze_intel/projecte/api/ProjectEAPI.java @@ -1,10 +1,10 @@ package moze_intel.projecte.api; +import cpw.mods.fml.common.FMLLog; import moze_intel.projecte.api.proxy.IBlacklistProxy; import moze_intel.projecte.api.proxy.IConversionProxy; import moze_intel.projecte.api.proxy.IEMCProxy; import moze_intel.projecte.api.proxy.ITransmutationProxy; -import cpw.mods.fml.common.FMLLog; public final class ProjectEAPI { @@ -24,10 +24,11 @@ public static IEMCProxy getEMCProxy() { if (emcProxy == null) { try { Class clazz = Class.forName("moze_intel.projecte.impl.EMCProxyImpl"); - emcProxy = (IEMCProxy) clazz.getField("instance").get(null); + emcProxy = (IEMCProxy) clazz.getField("instance") + .get(null); } catch (ReflectiveOperationException ex) { FMLLog.warning( - "[ProjectEAPI] Error retrieving EMCProxyImpl, ProjectE may be absent, damaged, or outdated."); + "[ProjectEAPI] Error retrieving EMCProxyImpl, ProjectE may be absent, damaged, or outdated."); } } return emcProxy; @@ -42,10 +43,11 @@ public static IConversionProxy getConversionProxy() { if (recipeProxy == null) { try { Class clazz = Class.forName("moze_intel.projecte.impl.ConversionProxyImpl"); - recipeProxy = (IConversionProxy) clazz.getField("instance").get(null); + recipeProxy = (IConversionProxy) clazz.getField("instance") + .get(null); } catch (ReflectiveOperationException ex) { FMLLog.warning( - "[ProjectEAPI] Error retrieving ConversionProxyImpl, ProjectE may be absent, damaged, or outdated."); + "[ProjectEAPI] Error retrieving ConversionProxyImpl, ProjectE may be absent, damaged, or outdated."); } } return recipeProxy; @@ -60,10 +62,11 @@ public static ITransmutationProxy getTransmutationProxy() { if (transProxy == null) { try { Class clazz = Class.forName("moze_intel.projecte.impl.TransmutationProxyImpl"); - transProxy = (ITransmutationProxy) clazz.getField("instance").get(null); + transProxy = (ITransmutationProxy) clazz.getField("instance") + .get(null); } catch (ReflectiveOperationException ex) { FMLLog.warning( - "[ProjectEAPI] Error retrieving TransmutationProxyImpl, ProjectE may be absent, damaged, or outdated."); + "[ProjectEAPI] Error retrieving TransmutationProxyImpl, ProjectE may be absent, damaged, or outdated."); } } return transProxy; @@ -78,10 +81,11 @@ public static IBlacklistProxy getBlacklistProxy() { if (blacklistProxy == null) { try { Class clazz = Class.forName("moze_intel.projecte.impl.BlacklistProxyImpl"); - blacklistProxy = (IBlacklistProxy) clazz.getField("instance").get(null); + blacklistProxy = (IBlacklistProxy) clazz.getField("instance") + .get(null); } catch (ReflectiveOperationException ex) { FMLLog.warning( - "[ProjectEAPI] Error retrieving BlacklistProxyImpl, ProjectE may be absent, damaged, or outdated."); + "[ProjectEAPI] Error retrieving BlacklistProxyImpl, ProjectE may be absent, damaged, or outdated."); } } return blacklistProxy; diff --git a/src/main/java/moze_intel/projecte/api/proxy/ITransmutationProxy.java b/src/main/java/moze_intel/projecte/api/proxy/ITransmutationProxy.java index 87beca8ab..669378a34 100644 --- a/src/main/java/moze_intel/projecte/api/proxy/ITransmutationProxy.java +++ b/src/main/java/moze_intel/projecte/api/proxy/ITransmutationProxy.java @@ -23,7 +23,7 @@ public interface ITransmutationProxy { * @return Whether the registration succeeded. It may fail if transmutations already exist for block origin */ boolean registerWorldTransmutation(Block origin, int originMeta, Block result1, int result1Meta, - @Nullable Block result2, int result2meta); + @Nullable Block result2, int result2meta); /** * Queries the knowledge of the provided player Can be called on both sides, only if the client player exists or the diff --git a/src/main/java/moze_intel/projecte/config/CustomEMCParser.java b/src/main/java/moze_intel/projecte/config/CustomEMCParser.java index c2df7e779..8b00f737d 100644 --- a/src/main/java/moze_intel/projecte/config/CustomEMCParser.java +++ b/src/main/java/moze_intel/projecte/config/CustomEMCParser.java @@ -10,18 +10,18 @@ import java.util.List; import java.util.Map; -import moze_intel.projecte.PECore; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.utils.FileHelper; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import moze_intel.projecte.PECore; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.utils.FileHelper; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.PELogger; + public final class CustomEMCParser { private static final String VERSION = "#0.2"; @@ -97,7 +97,8 @@ public static void readUserData() { } userValues.put(NormalizedSimpleStack.getFor(stack), (entry.emc > 0 ? entry.emc : 0)); } else { - if (OreDictionary.getOres(entry.name).isEmpty()) { + if (OreDictionary.getOres(entry.name) + .isEmpty()) { PELogger.logFatal("Error in custom EMC file: no OD entry for " + entry.name); PELogger.logFatal("At line number: " + reader.getLineNumber()); continue; @@ -348,9 +349,9 @@ private static void writeDefaultFile() { writer.println(VERSION); writer.println("Custom EMC file"); writer.println( - "This file is used for custom EMC registration, it is recommended that you do not modify it manually."); - writer.println( - "In game commands are avaliable to set custom values. Type /projecte in game for usage info."); + "This file is used for custom EMC registration, it is recommended that you do not modify it manually."); + writer + .println("In game commands are avaliable to set custom values. Type /projecte in game for usage info."); } catch (IOException e) { e.printStackTrace(); } finally { diff --git a/src/main/java/moze_intel/projecte/config/NBTWhitelistParser.java b/src/main/java/moze_intel/projecte/config/NBTWhitelistParser.java index 6112064ff..d95388269 100644 --- a/src/main/java/moze_intel/projecte/config/NBTWhitelistParser.java +++ b/src/main/java/moze_intel/projecte/config/NBTWhitelistParser.java @@ -7,14 +7,14 @@ import java.io.LineNumberReader; import java.io.PrintWriter; +import net.minecraft.item.ItemStack; + import moze_intel.projecte.PECore; import moze_intel.projecte.utils.FileHelper; import moze_intel.projecte.utils.ItemHelper; import moze_intel.projecte.utils.NBTWhitelist; import moze_intel.projecte.utils.PELogger; -import net.minecraft.item.ItemStack; - public final class NBTWhitelistParser { private static final String VERSION = "#0.1a"; diff --git a/src/main/java/moze_intel/projecte/config/ProjectEConfig.java b/src/main/java/moze_intel/projecte/config/ProjectEConfig.java index ced80bf43..68e91b68c 100644 --- a/src/main/java/moze_intel/projecte/config/ProjectEConfig.java +++ b/src/main/java/moze_intel/projecte/config/ProjectEConfig.java @@ -2,10 +2,10 @@ import java.io.File; -import moze_intel.projecte.utils.PELogger; - import net.minecraftforge.common.config.Configuration; +import moze_intel.projecte.utils.PELogger; + public final class ProjectEConfig { public static boolean showUnlocalizedNames; @@ -57,214 +57,215 @@ public static void init(File configFile) { enableDebugLog = config.getBoolean("debugLogging", "misc", false, "Enable a more verbose debug logging"); showUnlocalizedNames = config.getBoolean( - "unToolTips", - "misc", - false, - "Show item unlocalized names in tooltips (useful for custom EMC registration)"); + "unToolTips", + "misc", + false, + "Show item unlocalized names in tooltips (useful for custom EMC registration)"); showODNames = config.getBoolean( - "odToolTips", - "misc", - false, - "Show item Ore Dictionary names in tooltips (useful for custom EMC registration)"); + "odToolTips", + "misc", + false, + "Show item Ore Dictionary names in tooltips (useful for custom EMC registration)"); showEMCTooltip = config - .getBoolean("emcToolTips", "misc", true, "Show the EMC value as a tooltip on items and blocks"); + .getBoolean("emcToolTips", "misc", true, "Show the EMC value as a tooltip on items and blocks"); showStatTooltip = config - .getBoolean("statToolTips", "misc", true, "Show stats as tooltips for various ProjectE blocks"); + .getBoolean("statToolTips", "misc", true, "Show stats as tooltips for various ProjectE blocks"); showPedestalTooltip = config - .getBoolean("pedestalToolTips", "misc", true, "Show DM pedestal functions in item tooltips"); + .getBoolean("pedestalToolTips", "misc", true, "Show DM pedestal functions in item tooltips"); showPedestalTooltipInGUI = config.getBoolean( - "pedestalToolTipsInGUI", - "misc", - false, - "Show pedestal function tooltips only in pedestal GUI"); + "pedestalToolTipsInGUI", + "misc", + false, + "Show pedestal function tooltips only in pedestal GUI"); useLootBalls = config.getBoolean( - "useLootBalls", - "misc", - true, - "Make loot balls for drops. Disabling this may potentially cause bad performance when large amounts of loot are spawned!"); + "useLootBalls", + "misc", + true, + "Make loot balls for drops. Disabling this may potentially cause bad performance when large amounts of loot are spawned!"); pulsatingOverlay = config - .getBoolean("pulsatingOverlay", "misc", false, "The Philosopher's Stone overlay softly pulsates"); + .getBoolean("pulsatingOverlay", "misc", false, "The Philosopher's Stone overlay softly pulsates"); unsafeKeyBinds = config.getBoolean( - "unsafeKeyBinds", - "misc", - false, - "False requires your hand be empty for Gem Armor Offensive Abilities to be readied or triggered"); + "unsafeKeyBinds", + "misc", + false, + "False requires your hand be empty for Gem Armor Offensive Abilities to be readied or triggered"); projectileCooldown = config.getInt( - "projectileCooldown", - "misc", - 0, - 0, - Integer.MAX_VALUE, - "A cooldown (in ticks) for firing projectiles"); + "projectileCooldown", + "misc", + 0, + 0, + Integer.MAX_VALUE, + "A cooldown (in ticks) for firing projectiles"); gemChestCooldown = config.getInt( - "gemChestCooldown", - "misc", - 0, - 0, - Integer.MAX_VALUE, - "A cooldown (in ticks) for Gem Chestplate explosion"); + "gemChestCooldown", + "misc", + 0, + 0, + Integer.MAX_VALUE, + "A cooldown (in ticks) for Gem Chestplate explosion"); enableTimeWatch = config.getBoolean("enableTimeWatch", "items", true, "Enable Watch of Flowing Time"); craftableTome = config - .getBoolean("craftableTome", "difficulty", false, "The Tome of Knowledge can be crafted."); + .getBoolean("craftableTome", "difficulty", false, "The Tome of Knowledge can be crafted."); altCraftingMat = config.getBoolean( - "altCraftingMat", - "difficulty", - false, - "If true some ProjectE items require a nether star instead of a diamond."); + "altCraftingMat", + "difficulty", + false, + "If true some ProjectE items require a nether star instead of a diamond."); useOldDamage = config.getBoolean( - "useOldDamage", - "difficulty", - false, - "If true the old damage amounts from ProjectE 1.4.7 and before will be used for weapons."); + "useOldDamage", + "difficulty", + false, + "If true the old damage amounts from ProjectE 1.4.7 and before will be used for weapons."); offensiveAbilities = config.getBoolean( - "offensiveAbilities", - "difficulty", - true, - "Set to false to disable Gem Armor offensive abilities (helmet zap and chestplate explosion)"); + "offensiveAbilities", + "difficulty", + true, + "Set to false to disable Gem Armor offensive abilities (helmet zap and chestplate explosion)"); katarDeathAura = config.getFloat( - "katarDeathAura", - "difficulty", - 1000F, - 0, - Integer.MAX_VALUE, - "Amount of damage Katar 'C' key deals"); + "katarDeathAura", + "difficulty", + 1000F, + 0, + Integer.MAX_VALUE, + "Amount of damage Katar 'C' key deals"); covalenceLoss = config.getFloat( - "covalenceLoss ", - "difficulty", - 1.0F, - 0.1F, - 1.0F, - "Adjusting this ratio changes how much EMC is received when burning a item. For example setting this to 0.5 will return half of the EMC cost."); + "covalenceLoss ", + "difficulty", + 1.0F, + 0.1F, + 1.0F, + "Adjusting this ratio changes how much EMC is received when burning a item. For example setting this to 0.5 will return half of the EMC cost."); - config.getCategory("pedestalcooldown").setComment( + config.getCategory("pedestalcooldown") + .setComment( "Cooldown for various items within the pedestal. A cooldown of -1 will disable the functionality.\n" - + "A cooldown of 0 will cause the actions to happen every tick. Use caution as a very low value could cause TPS issues."); + + "A cooldown of 0 will cause the actions to happen every tick. Use caution as a very low value could cause TPS issues."); archangelPedCooldown = config.getInt( - "archangelPedCooldown", - "pedestalcooldown", - 40, - -1, - Integer.MAX_VALUE, - "Delay between Archangel Smite shooting arrows while in the pedestal."); + "archangelPedCooldown", + "pedestalcooldown", + 40, + -1, + Integer.MAX_VALUE, + "Delay between Archangel Smite shooting arrows while in the pedestal."); bodyPedCooldown = config.getInt( - "bodyPedCooldown", - "pedestalcooldown", - 10, - -1, - Integer.MAX_VALUE, - "Delay between Body Stone healing 0.5 shanks while in the pedestal."); + "bodyPedCooldown", + "pedestalcooldown", + 10, + -1, + Integer.MAX_VALUE, + "Delay between Body Stone healing 0.5 shanks while in the pedestal."); evertidePedCooldown = config.getInt( - "evertidePedCooldown", - "pedestalcooldown", - 20, - -1, - Integer.MAX_VALUE, - "Delay between Evertide Amulet trying to start rain while in the pedestal."); + "evertidePedCooldown", + "pedestalcooldown", + 20, + -1, + Integer.MAX_VALUE, + "Delay between Evertide Amulet trying to start rain while in the pedestal."); harvestPedCooldown = config.getInt( - "harvestPedCooldown", - "pedestalcooldown", - 10, - -1, - Integer.MAX_VALUE, - "Delay between Harvest Goddess trying to grow and harvest while in the pedestal."); + "harvestPedCooldown", + "pedestalcooldown", + 10, + -1, + Integer.MAX_VALUE, + "Delay between Harvest Goddess trying to grow and harvest while in the pedestal."); ignitePedCooldown = config.getInt( - "ignitePedCooldown", - "pedestalcooldown", - 40, - -1, - Integer.MAX_VALUE, - "Delay between Ignition Ring trying to light entities on fire while in the pedestal."); + "ignitePedCooldown", + "pedestalcooldown", + 40, + -1, + Integer.MAX_VALUE, + "Delay between Ignition Ring trying to light entities on fire while in the pedestal."); lifePedCooldown = config.getInt( - "lifePedCooldown", - "pedestalcooldown", - 5, - -1, - Integer.MAX_VALUE, - "Delay between Life Stone healing both food and hunger by 0.5 shank/heart while in the pedestal."); + "lifePedCooldown", + "pedestalcooldown", + 5, + -1, + Integer.MAX_VALUE, + "Delay between Life Stone healing both food and hunger by 0.5 shank/heart while in the pedestal."); repairPedCooldown = config.getInt( - "repairPedCooldown", - "pedestalcooldown", - 20, - -1, - Integer.MAX_VALUE, - "Delay between Talisman of Repair trying to repair player items while in the pedestal."); + "repairPedCooldown", + "pedestalcooldown", + 20, + -1, + Integer.MAX_VALUE, + "Delay between Talisman of Repair trying to repair player items while in the pedestal."); swrgPedCooldown = config.getInt( - "swrgPedCooldown", - "pedestalcooldown", - 70, - -1, - Integer.MAX_VALUE, - "Delay between SWRG trying to smite mobs while in the pedestal."); + "swrgPedCooldown", + "pedestalcooldown", + 70, + -1, + Integer.MAX_VALUE, + "Delay between SWRG trying to smite mobs while in the pedestal."); soulPedCooldown = config.getInt( - "soulPedCooldown", - "pedestalcooldown", - 10, - -1, - Integer.MAX_VALUE, - "Delay between Soul Stone healing 0.5 hearts while in the pedestal."); + "soulPedCooldown", + "pedestalcooldown", + 10, + -1, + Integer.MAX_VALUE, + "Delay between Soul Stone healing 0.5 hearts while in the pedestal."); volcanitePedCooldown = config.getInt( - "volcanitePedCooldown", - "pedestalcooldown", - 20, - -1, - Integer.MAX_VALUE, - "Delay between Volcanite Amulet trying to stop rain while in the pedestal."); + "volcanitePedCooldown", + "pedestalcooldown", + 20, + -1, + Integer.MAX_VALUE, + "Delay between Volcanite Amulet trying to stop rain while in the pedestal."); zeroPedCooldown = config.getInt( - "zeroPedCooldown", - "pedestalcooldown", - 40, - -1, - Integer.MAX_VALUE, - "Delay between Zero Ring trying to extinguish entities and freezing ground while in the pedestal."); + "zeroPedCooldown", + "pedestalcooldown", + 40, + -1, + Integer.MAX_VALUE, + "Delay between Zero Ring trying to extinguish entities and freezing ground while in the pedestal."); timePedBonus = config.getInt( - "timePedBonus", - "effects", - 18, - 0, - 256, - "Bonus ticks given by the Watch of Flowing Time while in the pedestal. 0 = effectively no bonus."); + "timePedBonus", + "effects", + 18, + 0, + 256, + "Bonus ticks given by the Watch of Flowing Time while in the pedestal. 0 = effectively no bonus."); timePedMobSlowness = config.getFloat( - "timePedMobSlowness", - "effects", - 0.10F, - 0.0F, - 1.0F, - "Factor the Watch of Flowing Time slows down mobs by while in the pedestal. Set to 1.0 for no slowdown."); + "timePedMobSlowness", + "effects", + 0.10F, + 0.0F, + 1.0F, + "Factor the Watch of Flowing Time slows down mobs by while in the pedestal. Set to 1.0 for no slowdown."); interdictionMode = config.getBoolean( - "interdictionMode", - "effects", - true, - "If true the Interdiction Torch only affects hostile mobs. If false it affects all non blacklisted living entities."); + "interdictionMode", + "effects", + true, + "If true the Interdiction Torch only affects hostile mobs. If false it affects all non blacklisted living entities."); pickaxeAoeVeinMining = config.getBoolean( - "pickaxeAoeVeinMining", - "items", - false, - "Instead of vein mining the ore you right click with your Dark/Red Matter Pick/Star it vein mines all ores in an AOE around you like it did in ProjectE before version 1.4.4."); + "pickaxeAoeVeinMining", + "items", + false, + "Instead of vein mining the ore you right click with your Dark/Red Matter Pick/Star it vein mines all ores in an AOE around you like it did in ProjectE before version 1.4.4."); harvBandGrass = config.getBoolean( - "harvBandGrass", - "items", - false, - "Allows the Harvest Goddess Band to passively grow tall grass, flowers, etc, on top of grass blocks."); + "harvBandGrass", + "items", + false, + "Allows the Harvest Goddess Band to passively grow tall grass, flowers, etc, on top of grass blocks."); disableAllRadiusMining = config.getBoolean( - "disableAllRadiusMining", - "items", - false, - "If set to true, disables all radius-based mining functionaliy (right click of tools)"); + "disableAllRadiusMining", + "items", + false, + "If set to true, disables all radius-based mining functionaliy (right click of tools)"); PELogger.logInfo("Loaded configuration file."); } catch (Exception e) { PELogger.logFatal("Caught exception while loading config file!"); diff --git a/src/main/java/moze_intel/projecte/emc/EMCMapper.java b/src/main/java/moze_intel/projecte/emc/EMCMapper.java index d6504431d..24d49961b 100644 --- a/src/main/java/moze_intel/projecte/emc/EMCMapper.java +++ b/src/main/java/moze_intel/projecte/emc/EMCMapper.java @@ -8,6 +8,15 @@ import java.util.List; import java.util.Map; +import net.minecraft.item.Item; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.oredict.OreDictionary; + +import org.apache.commons.lang3.math.Fraction; + +import com.google.common.collect.Maps; + import moze_intel.projecte.PECore; import moze_intel.projecte.api.event.EMCRemapEvent; import moze_intel.projecte.config.ProjectEConfig; @@ -25,15 +34,6 @@ import moze_intel.projecte.utils.PELogger; import moze_intel.projecte.utils.PrefixConfiguration; -import net.minecraft.item.Item; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.oredict.OreDictionary; - -import org.apache.commons.lang3.math.Fraction; - -import com.google.common.collect.Maps; - public final class EMCMapper { public static Map emc = new LinkedHashMap<>(); @@ -43,75 +43,78 @@ public final class EMCMapper { public static void map() { List> emcMappers = Arrays.asList( - new OreDictionaryMapper(), - new LazyMapper(), - new Chisel2Mapper(), - APICustomEMCMapper.instance, - new CustomConversionMapper(), - new CustomEMCMapper(), - new CraftingMapper(), - new FluidMapper(), - new SmeltingMapper(), - new APICustomConversionMapper()); + new OreDictionaryMapper(), + new LazyMapper(), + new Chisel2Mapper(), + APICustomEMCMapper.instance, + new CustomConversionMapper(), + new CustomEMCMapper(), + new CraftingMapper(), + new FluidMapper(), + new SmeltingMapper(), + new APICustomConversionMapper()); SimpleGraphMapper> mapper = new SimpleGraphMapper( - new HiddenDoubleArithmetic()); + new HiddenDoubleArithmetic()); IValueGenerator valueGenerator = new DoubleToLongGenerator(mapper); IExtendedMappingCollector> mappingCollector = new LongToDoubleCollector( - mapper); + mapper); Configuration config = new Configuration(new File(PECore.CONFIG_DIR, "mapping.cfg")); config.load(); if (config.getBoolean( - "dumpEverythingToFile", - "general", - false, - "Want to take a look at the internals of EMC Calculation? Enable this to write all the conversions and setValue-Commands to config/ProjectE/mappingdump.json")) { + "dumpEverythingToFile", + "general", + false, + "Want to take a look at the internals of EMC Calculation? Enable this to write all the conversions and setValue-Commands to config/ProjectE/mappingdump.json")) { mappingCollector = new DumpToFileCollector( - new File(PECore.CONFIG_DIR, "mappingdump.json"), - mappingCollector); + new File(PECore.CONFIG_DIR, "mappingdump.json"), + mappingCollector); } boolean shouldUsePregenerated = config.getBoolean( - "pregenerate", - "general", - false, - "When the next EMC mapping occurs write the results to config/ProjectE/pregenerated_emc.json and only ever run the mapping again" - + " when that file does not exist, this setting is set to false, or an error occurred parsing that file."); + "pregenerate", + "general", + false, + "When the next EMC mapping occurs write the results to config/ProjectE/pregenerated_emc.json and only ever run the mapping again" + + " when that file does not exist, this setting is set to false, or an error occurred parsing that file."); if (shouldUsePregenerated && PECore.PREGENERATED_EMC_FILE.canRead() - && PregeneratedEMC.tryRead(PECore.PREGENERATED_EMC_FILE, graphMapperValues = Maps.newHashMap())) { + && PregeneratedEMC.tryRead(PECore.PREGENERATED_EMC_FILE, graphMapperValues = Maps.newHashMap())) { PELogger.logInfo(String.format("Loaded %d values from pregenerated EMC File", graphMapperValues.size())); } else { SimpleGraphMapper.setLogFoundExploits( - config.getBoolean( - "logEMCExploits", - "general", - true, - "Log known EMC Exploits. This can not and will not find all possible exploits. " - + "This will only find exploits that result in fixed/custom emc values that the algorithm did not overwrite. " - + "Exploits that derive from conversions that are unknown to ProjectE will not be found.")); + config.getBoolean( + "logEMCExploits", + "general", + true, + "Log known EMC Exploits. This can not and will not find all possible exploits. " + + "This will only find exploits that result in fixed/custom emc values that the algorithm did not overwrite. " + + "Exploits that derive from conversions that are unknown to ProjectE will not be found.")); PELogger.logInfo("Starting to collect Mappings..."); for (IEMCMapper emcMapper : emcMappers) { try { if (config.getBoolean( - emcMapper.getName(), - "enabledMappers", - emcMapper.isAvailable(), - emcMapper.getDescription()) && emcMapper.isAvailable()) { + emcMapper.getName(), + "enabledMappers", + emcMapper.isAvailable(), + emcMapper.getDescription()) && emcMapper.isAvailable()) { DumpToFileCollector.currentGroupName = emcMapper.getName(); emcMapper.addMappings( - mappingCollector, - new PrefixConfiguration(config, "mapperConfigurations." + emcMapper.getName())); - PELogger.logInfo("Collected Mappings from " + emcMapper.getClass().getName()); + mappingCollector, + new PrefixConfiguration(config, "mapperConfigurations." + emcMapper.getName())); + PELogger.logInfo( + "Collected Mappings from " + emcMapper.getClass() + .getName()); } } catch (Exception e) { PELogger.logFatal( - String.format( - "Exception during Mapping Collection from Mapper %s. PLEASE REPORT THIS! EMC VALUES MIGHT BE INCONSISTENT!", - emcMapper.getClass().getName())); + String.format( + "Exception during Mapping Collection from Mapper %s. PLEASE REPORT THIS! EMC VALUES MIGHT BE INCONSISTENT!", + emcMapper.getClass() + .getName())); e.printStackTrace(); } } @@ -150,9 +153,9 @@ public static void map() { emc.put(new SimpleStack(id, 1, (int) normStackItem.damage), entry.getValue()); } else { PELogger.logWarn( - "Could not add EMC value for %s|%s. Can not get ItemID!", - normStackItem.itemName, - normStackItem.damage); + "Could not add EMC value for %s|%s. Can not get ItemID!", + normStackItem.itemName, + normStackItem.damage); } } } @@ -169,8 +172,8 @@ public static void map() { * @param map */ static void filterEMCMap(Map map) { - for (Iterator> iter = graphMapperValues.entrySet().iterator(); iter - .hasNext();) { + for (Iterator> iter = graphMapperValues.entrySet() + .iterator(); iter.hasNext();) { Map.Entry entry = iter.next(); NormalizedSimpleStack normStack = entry.getKey(); if (normStack instanceof NormalizedSimpleStack.NSSItem && entry.getValue() > 0) { diff --git a/src/main/java/moze_intel/projecte/emc/FuelMapper.java b/src/main/java/moze_intel/projecte/emc/FuelMapper.java index 9a77deb14..11d45570c 100644 --- a/src/main/java/moze_intel/projecte/emc/FuelMapper.java +++ b/src/main/java/moze_intel/projecte/emc/FuelMapper.java @@ -3,17 +3,17 @@ import java.util.Collections; import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.Comparators; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import com.google.common.collect.Lists; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.Comparators; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.PELogger; + public final class FuelMapper { private static final List FUEL_MAP = Lists.newArrayList(); @@ -68,7 +68,8 @@ public static ItemStack getFuelUpgrade(ItemStack stack) { int nextIndex = index == FUEL_MAP.size() - 1 ? 0 : index + 1; - return FUEL_MAP.get(nextIndex).toItemStack(); + return FUEL_MAP.get(nextIndex) + .toItemStack(); } private static void addToMap(SimpleStack stack) { diff --git a/src/main/java/moze_intel/projecte/emc/NormalizedSimpleStack.java b/src/main/java/moze_intel/projecte/emc/NormalizedSimpleStack.java index f0ad41eeb..567ec4e06 100644 --- a/src/main/java/moze_intel/projecte/emc/NormalizedSimpleStack.java +++ b/src/main/java/moze_intel/projecte/emc/NormalizedSimpleStack.java @@ -5,10 +5,6 @@ import java.util.Map; import java.util.Set; -import moze_intel.projecte.emc.collector.IMappingCollector; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,7 +12,11 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; + import cpw.mods.fml.common.registry.GameRegistry; +import moze_intel.projecte.emc.collector.IMappingCollector; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.PELogger; public abstract class NormalizedSimpleStack { @@ -51,8 +51,9 @@ private static GameRegistry.UniqueIdentifier getUniqueIdentifierOrNull(Block blo identifier = GameRegistry.findUniqueIdentifierFor(block); } catch (Exception e) { PELogger.logFatal( - "Could not findUniqueIdentifierFor(%s)", - block != null ? block.getClass().getName() : "null"); + "Could not findUniqueIdentifierFor(%s)", + block != null ? block.getClass() + .getName() : "null"); e.printStackTrace(); return null; } @@ -73,8 +74,9 @@ private static GameRegistry.UniqueIdentifier getUniqueIdentifierOrNull(Item item identifier = GameRegistry.findUniqueIdentifierFor(item); } catch (Exception e) { PELogger.logFatal( - "Could not findUniqueIdentifierFor(%s)", - item != null ? item.getClass().getName() : "null"); + "Could not findUniqueIdentifierFor(%s)", + item != null ? item.getClass() + .getName() : "null"); e.printStackTrace(); return null; } @@ -103,14 +105,16 @@ public static NormalizedSimpleStack getFor(net.minecraftforge.fluids.Fluid fluid public static > void addMappings(IMappingCollector mapper) { for (Map.Entry> entry : idWithUsedMetaData.entrySet()) { - entry.getValue().remove(OreDictionary.WILDCARD_VALUE); - entry.getValue().add(0); + entry.getValue() + .remove(OreDictionary.WILDCARD_VALUE); + entry.getValue() + .add(0); NormalizedSimpleStack stackWildcard = new NSSItem(entry.getKey(), OreDictionary.WILDCARD_VALUE); for (int metadata : entry.getValue()) { mapper.addConversion( - 1, - stackWildcard, - Arrays.asList((NormalizedSimpleStack) new NSSItem(entry.getKey(), metadata))); + 1, + stackWildcard, + Arrays.asList((NormalizedSimpleStack) new NSSItem(entry.getKey(), metadata))); } } @@ -181,10 +185,10 @@ public String toString() { if (obj != null) { return String.format( - "%s(%s:%s)", - itemName, - Item.itemRegistry.getIDForObject(obj), - damage == OreDictionary.WILDCARD_VALUE ? "*" : damage); + "%s(%s:%s)", + itemName, + Item.itemRegistry.getIDForObject(obj), + damage == OreDictionary.WILDCARD_VALUE ? "*" : damage); } return String.format("%s(???:%s)", itemName, damage == OreDictionary.WILDCARD_VALUE ? "*" : damage); @@ -291,7 +295,7 @@ public static NormalizedSimpleStack fromSerializedItem(String serializedItem) { int pipeIndex = serializedItem.lastIndexOf('|'); if (pipeIndex < 0) { throw new IllegalArgumentException( - String.format("Cannot parse '%s' as itemstack. Missing | to separate metadata.", serializedItem)); + String.format("Cannot parse '%s' as itemstack. Missing | to separate metadata.", serializedItem)); } String itemName = serializedItem.substring(0, pipeIndex); String itemDamageString = serializedItem.substring(pipeIndex + 1); @@ -303,8 +307,8 @@ public static NormalizedSimpleStack fromSerializedItem(String serializedItem) { itemDamage = Integer.parseInt(itemDamageString); } catch (NumberFormatException e) { throw new IllegalArgumentException( - String.format("Could not parse '%s' to metadata-integer", itemDamageString), - e); + String.format("Could not parse '%s' to metadata-integer", itemDamageString), + e); } } diff --git a/src/main/java/moze_intel/projecte/emc/SimpleGraphMapper.java b/src/main/java/moze_intel/projecte/emc/SimpleGraphMapper.java index c4ef5148b..e8bbacde3 100644 --- a/src/main/java/moze_intel/projecte/emc/SimpleGraphMapper.java +++ b/src/main/java/moze_intel/projecte/emc/SimpleGraphMapper.java @@ -4,15 +4,15 @@ import java.util.List; import java.util.Map; +import com.google.common.collect.Maps; + import moze_intel.projecte.emc.arithmetics.IValueArithmetic; import moze_intel.projecte.emc.collector.MappingCollector; import moze_intel.projecte.emc.generators.IValueGenerator; import moze_intel.projecte.utils.PELogger; -import com.google.common.collect.Maps; - public class SimpleGraphMapper, A extends IValueArithmetic> - extends MappingCollector implements IValueGenerator { + extends MappingCollector implements IValueGenerator { static boolean OVERWRITE_FIXED_VALUES = false; protected V ZERO; @@ -25,11 +25,13 @@ public SimpleGraphMapper(A arithmetic) { } protected static > boolean hasSmallerOrEqual(Map m, K key, V value) { - return (m.containsKey(key) && m.get(key).compareTo(value) <= 0); + return (m.containsKey(key) && m.get(key) + .compareTo(value) <= 0); } protected static > boolean hasSmaller(Map m, K key, V value) { - return (m.containsKey(key) && m.get(key).compareTo(value) < 0); + return (m.containsKey(key) && m.get(key) + .compareTo(value) < 0); } public static void setLogFoundExploits(boolean log) { @@ -48,7 +50,8 @@ protected static > boolean updateMapWithMinimum(Map generateValues() { debugPrintln("Loop"); for (Map.Entry entry : newValueFor.entrySet()) { if (canOverride(entry.getKey(), entry.getValue()) - && updateMapWithMinimum(values, entry.getKey(), entry.getValue())) { + && updateMapWithMinimum(values, entry.getKey(), entry.getValue())) { // The new Value is now set in 'values' debugFormat( - "Set Value for %s to %s because %s", - entry.getKey(), - entry.getValue(), - reasonForChange.get(entry.getKey())); + "Set Value for %s to %s because %s", + entry.getKey(), + entry.getValue(), + reasonForChange.get(entry.getKey())); // We have a new value for 'entry.getKey()' now we need to update everything that uses it as an // ingredient. for (Conversion conversion : getUsesFor(entry.getKey())) { if (overwriteConversion.containsKey(conversion.output) - && overwriteConversion.get(conversion.output) != conversion) { + && overwriteConversion.get(conversion.output) != conversion) { // There is a "SetValue-Conversion" for this item and its not this one, so we skip it. continue; } // Calculate how much the conversion-output costs with the new Value for entry.getKey V conversionValue = conversion.arithmeticForConversion - .div(valueForConversion(values, conversion), conversion.outnumber); + .div(valueForConversion(values, conversion), conversion.outnumber); if (conversionValue.compareTo(ZERO) > 0 - || conversion.arithmeticForConversion.isFree(conversionValue)) { + || conversion.arithmeticForConversion.isFree(conversionValue)) { // We could calculate a valid value for the conversion if (!hasSmallerOrEqual(values, conversion.output, conversionValue)) { // And there is no smaller value for that conversion output yet @@ -120,13 +123,13 @@ && updateMapWithMinimum(values, entry.getKey(), entry.getValue())) { V conversionValue = valueForConversion(values, conversion); // What would the output cost be, if that conversion would be used V conversionValueSingle = conversion.arithmeticForConversion - .div(conversionValue, conversion.outnumber); + .div(conversionValue, conversion.outnumber); // What is the actual emc value for the conversion output V resultValueSingle = values.containsKey(entry.getKey()) ? values.get(entry.getKey()) : ZERO; // Find the smallest EMC value for the conversion.output if (conversionValueSingle.compareTo(ZERO) > 0 - || conversion.arithmeticForConversion.isFree(conversionValueSingle)) { + || conversion.arithmeticForConversion.isFree(conversionValueSingle)) { if (minConversionValue == null || minConversionValue.compareTo(conversionValueSingle) > 0) { minConversionValue = conversionValueSingle; } @@ -135,42 +138,43 @@ && updateMapWithMinimum(values, entry.getKey(), entry.getValue())) { // This is a Loophole. We remove it by setting the value to 0. if (ZERO.compareTo(conversionValue) < 0 && conversionValueSingle.compareTo(resultValueSingle) < 0) { if (overwriteConversion.containsKey(conversion.output) - && overwriteConversion.get(conversion.output) != conversion) { + && overwriteConversion.get(conversion.output) != conversion) { PELogger.logWarn( - String.format( - "EMC Exploit: \"%s\" ingredient cost: %s value of result: %s setValueFromConversion: %s", - conversion, - conversionValue, - resultValueSingle, - overwriteConversion.get(conversion.output))); + String.format( + "EMC Exploit: \"%s\" ingredient cost: %s value of result: %s setValueFromConversion: %s", + conversion, + conversionValue, + resultValueSingle, + overwriteConversion.get(conversion.output))); } else if (canOverride(entry.getKey(), ZERO)) { debugFormat( - "Setting %s to 0 because result (%s) > cost (%s): %s", - entry.getKey(), - resultValueSingle, - conversionValue, - conversion); + "Setting %s to 0 because result (%s) > cost (%s): %s", + entry.getKey(), + resultValueSingle, + conversionValue, + conversion); newValueFor.put(conversion.output, ZERO); reasonForChange.put(conversion.output, "exploit recipe"); } else if (logFoundExploits) { PELogger.logWarn( - String.format( - "EMC Exploit: \"%s\" ingredient cost: %s fixed value of result: %s", - conversion, - conversionValue, - resultValueSingle)); + String.format( + "EMC Exploit: \"%s\" ingredient cost: %s fixed value of result: %s", + conversion, + conversionValue, + resultValueSingle)); } } } if (minConversionValue == null || minConversionValue.equals(ZERO)) { // we could not find any valid conversion - if (values.containsKey(entry.getKey()) && !values.get(entry.getKey()).equals(ZERO) - && canOverride(entry.getKey(), ZERO) - && !hasSmaller(values, entry.getKey(), ZERO)) { + if (values.containsKey(entry.getKey()) && !values.get(entry.getKey()) + .equals(ZERO) + && canOverride(entry.getKey(), ZERO) + && !hasSmaller(values, entry.getKey(), ZERO)) { // but the value for the conversion output is > 0, so we set it to 0. debugFormat( - "Removing Value for %s because it does not have any nonzero-conversions anymore.", - entry.getKey()); + "Removing Value for %s because it does not have any nonzero-conversions anymore.", + entry.getKey()); newValueFor.put(entry.getKey(), ZERO); reasonForChange.put(entry.getKey(), "all conversions dead"); } @@ -182,7 +186,8 @@ && canOverride(entry.getKey(), ZERO) values.put(fixedValueAfterInherit.getKey(), fixedValueAfterInherit.getValue()); } // Remove all 'free' items from the output-values - for (Iterator iter = values.keySet().iterator(); iter.hasNext();) { + for (Iterator iter = values.keySet() + .iterator(); iter.hasNext();) { T something = iter.next(); if (arithmetic.isFree(values.get(something))) { iter.remove(); @@ -202,12 +207,12 @@ protected V valueForConversion(Map values, Conversion conversion) { try { return valueForConversionUnsafe(values, conversion); } catch (ArithmeticException e) { - PELogger.logWarn( - String.format("Could not calculate value for %s: %s", conversion.toString(), e.toString())); + PELogger + .logWarn(String.format("Could not calculate value for %s: %s", conversion.toString(), e.toString())); return ZERO; } catch (Exception e) { - PELogger.logWarn( - String.format("Could not calculate value for %s: %s", conversion.toString(), e.toString())); + PELogger + .logWarn(String.format("Could not calculate value for %s: %s", conversion.toString(), e.toString())); e.printStackTrace(); return ZERO; } @@ -226,7 +231,7 @@ protected V valueForConversionUnsafe(Map values, Conversion conversion) { } // value = value + amount * ingredientcost V ingredientValue = conversion.arithmeticForConversion - .mul(entry.getValue(), values.get(entry.getKey())); + .mul(entry.getValue(), values.get(entry.getKey())); if (ingredientValue.compareTo(ZERO) != 0) { if (!conversion.arithmeticForConversion.isFree(ingredientValue)) { value = conversion.arithmeticForConversion.add(value, ingredientValue); diff --git a/src/main/java/moze_intel/projecte/emc/collector/AbstractMappingCollector.java b/src/main/java/moze_intel/projecte/emc/collector/AbstractMappingCollector.java index af02ba36a..15da768f6 100644 --- a/src/main/java/moze_intel/projecte/emc/collector/AbstractMappingCollector.java +++ b/src/main/java/moze_intel/projecte/emc/collector/AbstractMappingCollector.java @@ -6,7 +6,7 @@ import moze_intel.projecte.emc.arithmetics.IValueArithmetic; public abstract class AbstractMappingCollector, A extends IValueArithmetic> - implements IExtendedMappingCollector { + implements IExtendedMappingCollector { A defaultArithmetic; @@ -47,7 +47,7 @@ public void addConversion(int outnumber, T output, Map ingredientsWi } public abstract void addConversion(int outnumber, T output, Map ingredientsWithAmount, - A arithmeticForConversion); + A arithmeticForConversion); public A getArithmetic() { return this.defaultArithmetic; diff --git a/src/main/java/moze_intel/projecte/emc/collector/DumpToFileCollector.java b/src/main/java/moze_intel/projecte/emc/collector/DumpToFileCollector.java index bbcd21566..02ec746ce 100644 --- a/src/main/java/moze_intel/projecte/emc/collector/DumpToFileCollector.java +++ b/src/main/java/moze_intel/projecte/emc/collector/DumpToFileCollector.java @@ -11,7 +11,7 @@ import moze_intel.projecte.emc.mappers.customConversions.json.CustomConversionFile; public class DumpToFileCollector - extends AbstractMappingCollector { + extends AbstractMappingCollector { public static String currentGroupName = "default"; CustomConversionFile out = new CustomConversionFile(); @@ -26,7 +26,7 @@ public DumpToFileCollector(File f, IExtendedMappingCollector ingredientsWithAmount) { + Map ingredientsWithAmount) { inner.setValueFromConversion(outnumber, something, ingredientsWithAmount); if (something == null || ingredientsWithAmount.containsKey(null)) return; out.values.conversion.add(CustomConversion.getFor(outnumber, something, ingredientsWithAmount)); @@ -34,7 +34,7 @@ public void setValueFromConversion(int outnumber, NormalizedSimpleStack somethin @Override public void addConversion(int outnumber, NormalizedSimpleStack output, - Map ingredientsWithAmount, A arithmeticForConversion) { + Map ingredientsWithAmount, A arithmeticForConversion) { inner.addConversion(outnumber, output, ingredientsWithAmount, arithmeticForConversion); if (output == null || ingredientsWithAmount.containsKey(null)) return; if (!out.groups.containsKey(currentGroupName)) out.groups.put(currentGroupName, new ConversionGroup()); diff --git a/src/main/java/moze_intel/projecte/emc/collector/IExtendedMappingCollector.java b/src/main/java/moze_intel/projecte/emc/collector/IExtendedMappingCollector.java index 9826a96b2..0fefa5f13 100644 --- a/src/main/java/moze_intel/projecte/emc/collector/IExtendedMappingCollector.java +++ b/src/main/java/moze_intel/projecte/emc/collector/IExtendedMappingCollector.java @@ -5,10 +5,10 @@ import moze_intel.projecte.emc.arithmetics.IValueArithmetic; public interface IExtendedMappingCollector, A extends IValueArithmetic> - extends IMappingCollector { + extends IMappingCollector { public void addConversion(int outnumber, T output, Map ingredientsWithAmount, - A arithmeticForConversion); + A arithmeticForConversion); public void addConversion(int outnumber, T output, Iterable ingredients, A arithmeticForConversion); diff --git a/src/main/java/moze_intel/projecte/emc/collector/LongToDoubleCollector.java b/src/main/java/moze_intel/projecte/emc/collector/LongToDoubleCollector.java index ae973f3ea..e4c63130f 100644 --- a/src/main/java/moze_intel/projecte/emc/collector/LongToDoubleCollector.java +++ b/src/main/java/moze_intel/projecte/emc/collector/LongToDoubleCollector.java @@ -20,7 +20,7 @@ public void setValueFromConversion(int outnumber, T something, Map i @Override public void addConversion(int outnumber, T output, Map ingredientsWithAmount, - A arithmeticForConversion) { + A arithmeticForConversion) { inner.addConversion(outnumber, output, ingredientsWithAmount, arithmeticForConversion); } diff --git a/src/main/java/moze_intel/projecte/emc/collector/MappingCollector.java b/src/main/java/moze_intel/projecte/emc/collector/MappingCollector.java index 9620c5bfa..8d78f6b8a 100644 --- a/src/main/java/moze_intel/projecte/emc/collector/MappingCollector.java +++ b/src/main/java/moze_intel/projecte/emc/collector/MappingCollector.java @@ -5,13 +5,13 @@ import java.util.List; import java.util.Map; +import com.google.common.collect.Maps; + import moze_intel.projecte.emc.arithmetics.IValueArithmetic; import moze_intel.projecte.utils.PELogger; -import com.google.common.collect.Maps; - public abstract class MappingCollector, A extends IValueArithmetic> - extends AbstractMappingCollector { + extends AbstractMappingCollector { protected static final boolean DEBUG_GRAPHMAPPER = false; @@ -76,15 +76,15 @@ protected void addConversionToIngredientUsages(Conversion conversion) { } public void addConversion(int outnumber, T output, Map ingredientsWithAmount, - A arithmeticForConversion) { + A arithmeticForConversion) { ingredientsWithAmount = Maps.newHashMap(ingredientsWithAmount); if (output == null || ingredientsWithAmount.containsKey(null)) { PELogger.logWarn( - String.format( - "Ignoring Recipe because of invalid ingredient or output: %s -> %dx%s", - ingredientsWithAmount, - outnumber, - output)); + String.format( + "Ignoring Recipe because of invalid ingredient or output: %s -> %dx%s", + ingredientsWithAmount, + outnumber, + output)); return; } if (outnumber <= 0) throw new IllegalArgumentException("outnumber has to be > 0!"); @@ -102,11 +102,11 @@ public void addConversion(int outnumber, T output, Map ingredientsWi public void setValueBefore(T something, V value) { if (something == null) return; if (fixValueBeforeInherit.containsKey(something)) PELogger.logWarn( - "Overwriting fixValueBeforeInherit for " + something - + ":" - + fixValueBeforeInherit.get(something) - + " to " - + value); + "Overwriting fixValueBeforeInherit for " + something + + ":" + + fixValueBeforeInherit.get(something) + + " to " + + value); fixValueBeforeInherit.put(something, value); fixValueAfterInherit.remove(something); } @@ -115,11 +115,11 @@ public void setValueBefore(T something, V value) { public void setValueAfter(T something, V value) { if (something == null) return; if (fixValueAfterInherit.containsKey(something)) PELogger.logWarn( - "Overwriting fixValueAfterInherit for " + something - + ":" - + fixValueAfterInherit.get(something) - + " to " - + value); + "Overwriting fixValueAfterInherit for " + something + + ":" + + fixValueAfterInherit.get(something) + + " to " + + value); fixValueAfterInherit.put(something, value); } @@ -127,11 +127,11 @@ public void setValueAfter(T something, V value) { public void setValueFromConversion(int outnumber, T something, Map ingredientsWithAmount) { if (something == null || ingredientsWithAmount.containsKey(null)) { PELogger.logWarn( - String.format( - "Ignoring setValueFromConversion because of invalid ingredient or output: %s -> %dx%s", - ingredientsWithAmount, - outnumber, - something)); + String.format( + "Ignoring setValueFromConversion because of invalid ingredient or output: %s -> %dx%s", + ingredientsWithAmount, + outnumber, + something)); return; } if (outnumber <= 0) throw new IllegalArgumentException("outnumber has to be > 0!"); @@ -140,7 +140,7 @@ public void setValueFromConversion(int outnumber, T something, Map i if (overwriteConversion.containsKey(something)) { Conversion oldConversion = overwriteConversion.get(something); PELogger.logWarn( - "Overwriting setValueFromConversion " + overwriteConversion.get(something) + " with " + conversion); + "Overwriting setValueFromConversion " + overwriteConversion.get(something) + " with " + conversion); for (T ingredient : ingredientsWithAmount.keySet()) { getUsesFor(ingredient).remove(oldConversion); } @@ -186,13 +186,23 @@ public String ingredientsToString() { if (ingredientsWithAmount == null || ingredientsWithAmount.size() == 0) return "nothing"; StringBuilder sb = new StringBuilder(); boolean first = true; - Iterator> iter = ingredientsWithAmount.entrySet().iterator(); + Iterator> iter = ingredientsWithAmount.entrySet() + .iterator(); if (iter.hasNext()) { Map.Entry entry = iter.next(); - sb.append(entry.getValue()).append("*").append(entry.getKey().toString()); + sb.append(entry.getValue()) + .append("*") + .append( + entry.getKey() + .toString()); while (iter.hasNext()) { entry = iter.next(); - sb.append(" + ").append(entry.getValue()).append("*").append(entry.getKey().toString()); + sb.append(" + ") + .append(entry.getValue()) + .append("*") + .append( + entry.getKey() + .toString()); } } diff --git a/src/main/java/moze_intel/projecte/emc/mappers/APICustomConversionMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/APICustomConversionMapper.java index 3b7826f52..c2d2ab49b 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/APICustomConversionMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/APICustomConversionMapper.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.Map; +import net.minecraftforge.common.config.Configuration; + import moze_intel.projecte.emc.NormalizedSimpleStack; import moze_intel.projecte.emc.collector.IMappingCollector; import moze_intel.projecte.impl.ConversionProxyImpl; -import net.minecraftforge.common.config.Configuration; - public class APICustomConversionMapper implements IEMCMapper { @Override @@ -29,15 +29,16 @@ public boolean isAvailable() { @Override public void addMappings(IMappingCollector mapper, Configuration config) { for (Map.Entry> entry : ConversionProxyImpl.instance.storedConversions - .entrySet()) { + .entrySet()) { if (config.getBoolean( + entry.getKey(), + "allow", + true, + String.format( + "Allow Mod %s to add its %d Recipes to the EMC Calculation", entry.getKey(), - "allow", - true, - String.format( - "Allow Mod %s to add its %d Recipes to the EMC Calculation", - entry.getKey(), - entry.getValue().size()))) { + entry.getValue() + .size()))) { for (ConversionProxyImpl.APIConversion apiConversion : entry.getValue()) { mapper.addConversion(apiConversion.amount, apiConversion.output, apiConversion.ingredients); } diff --git a/src/main/java/moze_intel/projecte/emc/mappers/APICustomEMCMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/APICustomEMCMapper.java index 13e1de2f1..a91ce8f72 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/APICustomEMCMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/APICustomEMCMapper.java @@ -8,11 +8,6 @@ import java.util.Map; import java.util.Set; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.collector.IMappingCollector; -import moze_intel.projecte.impl.ConversionProxyImpl; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; @@ -21,6 +16,10 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.collector.IMappingCollector; +import moze_intel.projecte.impl.ConversionProxyImpl; +import moze_intel.projecte.utils.PELogger; public class APICustomEMCMapper implements IEMCMapper { @@ -39,7 +38,8 @@ private APICustomEMCMapper() {} public void registerCustomEMC(ItemStack stack, long emcValue) { if (stack == null || stack.getItem() == null) return; if (emcValue < 0) emcValue = 0; - ModContainer activeMod = Loader.instance().activeModContainer(); + ModContainer activeMod = Loader.instance() + .activeModContainer(); String modId = activeMod == null ? null : activeMod.getModId(); Map modMap; if (customEMCforMod.containsKey(modId)) { @@ -55,7 +55,8 @@ public void registerCustomEMC(Object o, long emcValue) { NormalizedSimpleStack stack = ConversionProxyImpl.instance.objectToNSS(o); if (stack == null) return; if (emcValue < 0) emcValue = 0; - ModContainer activeMod = Loader.instance().activeModContainer(); + ModContainer activeMod = Loader.instance() + .activeModContainer(); String modId = activeMod == null ? null : activeMod.getModId(); Map modMap; if (customNonItemEMCforMod.containsKey(modId)) { @@ -93,39 +94,43 @@ public void addMappings(IMappingCollector mapper, C if (modId == null) continue; int valueCount = 0; if (customEMCforMod.containsKey(modId)) { - valueCount += customEMCforMod.get(modId).size(); + valueCount += customEMCforMod.get(modId) + .size(); } if (customNonItemEMCforMod.containsKey(modId)) { - valueCount += customNonItemEMCforMod.get(modId).size(); + valueCount += customNonItemEMCforMod.get(modId) + .size(); } priorityMap.put( - modId, - config.getInt( - modId + "priority", - "customEMCPriorities", - PRIORITY_DEFAULT_VALUE, - PRIORITY_MIN_VALUE, - PRIORITY_MAX_VALUE, - "Priority for Mod with ModId = " + modId + ". Values: " + valueCount)); + modId, + config.getInt( + modId + "priority", + "customEMCPriorities", + PRIORITY_DEFAULT_VALUE, + PRIORITY_MIN_VALUE, + PRIORITY_MAX_VALUE, + "Priority for Mod with ModId = " + modId + ". Values: " + valueCount)); } if (modIdSet.contains(null)) { int valueCount = 0; if (customEMCforMod.containsKey(null)) { - valueCount += customEMCforMod.get(null).size(); + valueCount += customEMCforMod.get(null) + .size(); } if (customNonItemEMCforMod.containsKey(null)) { - valueCount += customNonItemEMCforMod.get(null).size(); + valueCount += customNonItemEMCforMod.get(null) + .size(); } priorityMap.put( - null, - config.getInt( - "modlessCustomEMCPriority", - "", - PRIORITY_DEFAULT_VALUE, - PRIORITY_MIN_VALUE, - PRIORITY_MAX_VALUE, - "Priority for custom EMC values for which the ModId could not be determined. 0 to disable. Values: " - + valueCount)); + null, + config.getInt( + "modlessCustomEMCPriority", + "", + PRIORITY_DEFAULT_VALUE, + PRIORITY_MIN_VALUE, + PRIORITY_MAX_VALUE, + "Priority for custom EMC values for which the ModId could not be determined. 0 to disable. Values: " + + valueCount)); } List modIds = new ArrayList<>(modIdSet); @@ -143,44 +148,40 @@ public int compare(String a, String b) { for (String modId : modIds) { String modIdOrUnknown = modId == null ? "unknown mod" : modId; if (customEMCforMod.containsKey(modId)) { - for (Map.Entry entry : customEMCforMod.get(modId).entrySet()) { + for (Map.Entry entry : customEMCforMod.get(modId) + .entrySet()) { NormalizedSimpleStack normStack = entry.getKey(); if (isAllowedToSet(modId, normStack, entry.getValue(), config)) { mapper.setValueBefore(normStack, entry.getValue()); PELogger.logInfo( - String.format( - "%s setting value for %s to %s", - modIdOrUnknown, - normStack, - entry.getValue())); + String + .format("%s setting value for %s to %s", modIdOrUnknown, normStack, entry.getValue())); } else { PELogger.logInfo( - String.format( - "Disallowed %s to set the value for %s to %s", - modIdOrUnknown, - normStack, - entry.getValue())); + String.format( + "Disallowed %s to set the value for %s to %s", + modIdOrUnknown, + normStack, + entry.getValue())); } } } if (customNonItemEMCforMod.containsKey(modId)) { - for (Map.Entry entry : customNonItemEMCforMod.get(modId).entrySet()) { + for (Map.Entry entry : customNonItemEMCforMod.get(modId) + .entrySet()) { NormalizedSimpleStack normStack = entry.getKey(); if (isAllowedToSet(modId, normStack, entry.getValue(), config)) { mapper.setValueBefore(normStack, entry.getValue()); PELogger.logInfo( - String.format( - "%s setting value for %s to %s", - modIdOrUnknown, - normStack, - entry.getValue())); + String + .format("%s setting value for %s to %s", modIdOrUnknown, normStack, entry.getValue())); } else { PELogger.logInfo( - String.format( - "Disallowed %s to set the value for %s to %s", - modIdOrUnknown, - normStack, - entry.getValue())); + String.format( + "Disallowed %s to set the value for %s to %s", + modIdOrUnknown, + normStack, + entry.getValue())); } } } @@ -197,14 +198,14 @@ protected boolean isAllowedToSet(String modId, NormalizedSimpleStack stack, Long } String modForItem = itemName.substring(0, itemName.indexOf(':')); String permission = config.getString( - modForItem, - "permissions." + modId, - "both", - String.format( - "Allow '%s' to set and or remove values for '%s'. Options: [both, set, remove, none]", - modId, - modForItem), - new String[] { "both", "set", "remove", "none" }); + modForItem, + "permissions." + modId, + "both", + String.format( + "Allow '%s' to set and or remove values for '%s'. Options: [both, set, remove, none]", + modId, + modForItem), + new String[] { "both", "set", "remove", "none" }); if (permission.equals("both")) { return true; } diff --git a/src/main/java/moze_intel/projecte/emc/mappers/Chisel2Mapper.java b/src/main/java/moze_intel/projecte/emc/mappers/Chisel2Mapper.java index a710ae206..16db1edab 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/Chisel2Mapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/Chisel2Mapper.java @@ -4,9 +4,6 @@ import java.util.Arrays; import java.util.List; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.collector.IMappingCollector; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; @@ -16,14 +13,17 @@ import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; import com.cricketcraft.chisel.api.carving.ICarvingVariation; + import cpw.mods.fml.common.Loader; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.collector.IMappingCollector; // Thanks to bdew for a first implementation of this: // https://github.com/bdew/ProjectE/blob/f1b08624ff47c6cc716576701024cdb38ff3d297/src/main/java/moze_intel/projecte/emc/ChiselMapper.java public class Chisel2Mapper implements IEMCMapper { public final static String[] chiselBlockNames = new String[] { "marble", "limestone", "andesite", "granite", - "diorite" }; + "diorite" }; @Override public String getName() { @@ -57,7 +57,7 @@ public void addMappings(IMappingCollector mapper, C } protected void handleCarvingGroup(IMappingCollector mapper, Configuration config, - ICarvingGroup group) { + ICarvingGroup group) { // XXX: Generates way too much Configs /* * if (!config.getBoolean(group.getName(), "enableCarvingGroups", true, "Enable ICarvingGroup with name=" + diff --git a/src/main/java/moze_intel/projecte/emc/mappers/CraftingMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/CraftingMapper.java index 5697b75f2..e5f483793 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/CraftingMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/CraftingMapper.java @@ -8,13 +8,6 @@ import java.util.Map; import java.util.Set; -import moze_intel.projecte.emc.IngredientMap; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.collector.IMappingCollector; -import moze_intel.projecte.gameObjs.customRecipes.RecipeShapedKleinStar; -import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -29,10 +22,17 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import moze_intel.projecte.emc.IngredientMap; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.collector.IMappingCollector; +import moze_intel.projecte.gameObjs.customRecipes.RecipeShapedKleinStar; +import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; +import moze_intel.projecte.utils.PELogger; + public class CraftingMapper implements IEMCMapper { List recipeMappers = Arrays - .asList(new VanillaRecipeMapper(), new VanillaOreRecipeMapper(), new PECustomRecipeMapper()); + .asList(new VanillaRecipeMapper(), new VanillaOreRecipeMapper(), new PECustomRecipeMapper()); Set canNotMap = Sets.newHashSet(); Map recipeCount = Maps.newHashMap(); @@ -40,18 +40,18 @@ public class CraftingMapper implements IEMCMapper { public void addMappings(IMappingCollector mapper, final Configuration config) { recipeCount.clear(); canNotMap.clear(); - recipeloop: for (IRecipe recipe : (Iterable) CraftingManager.getInstance().getRecipeList()) { + recipeloop: for (IRecipe recipe : (Iterable) CraftingManager.getInstance() + .getRecipeList()) { boolean handled = false; ItemStack recipeOutput = recipe.getRecipeOutput(); if (recipeOutput == null) continue; NormalizedSimpleStack recipeOutputNorm = NormalizedSimpleStack.getFor(recipeOutput); for (IRecipeMapper recipeMapper : recipeMappers) { if (!config.getBoolean( - "enable" + recipeMapper.getName(), - "IRecipeImplementations", - true, - recipeMapper.getDescription())) - continue; + "enable" + recipeMapper.getName(), + "IRecipeImplementations", + true, + recipeMapper.getDescription())) continue; if (recipeMapper.canHandle(recipe)) { handled = true; Iterable craftingIngredientIterable = recipeMapper.getIngredientsFor(recipe); @@ -66,28 +66,32 @@ public void addMappings(IMappingCollector mapper, f } else { // stack does not have a wildcard damage value try { - if (stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) { - if (stack.getItem().hasContainerItem(stack)) { + if (stack.getItem() + .doesContainerItemLeaveCraftingGrid(stack)) { + if (stack.getItem() + .hasContainerItem(stack)) { ingredientMap.addIngredient( - NormalizedSimpleStack - .getFor(stack.getItem().getContainerItem(stack)), - -1); + NormalizedSimpleStack.getFor( + stack.getItem() + .getContainerItem(stack)), + -1); } ingredientMap.addIngredient(NormalizedSimpleStack.getFor(stack), 1); } else if (config.getBoolean( - "emcDependencyForUnconsumedItems", - "", - true, - "If this option is enabled items that are made by crafting, with unconsumed ingredients, should only get an emc value, if the unconsumed item also has a value. (Examples: Extra Utilities Sigil, Cutting Board, Mixer, Juicer...)")) { - // Container Item does not leave the crafting grid: we add an EMC - // dependency anyway. - ingredientMap.addIngredient(NormalizedSimpleStack.getFor(stack), 0); - } + "emcDependencyForUnconsumedItems", + "", + true, + "If this option is enabled items that are made by crafting, with unconsumed ingredients, should only get an emc value, if the unconsumed item also has a value. (Examples: Extra Utilities Sigil, Cutting Board, Mixer, Juicer...)")) { + // Container Item does not leave the crafting grid: we add an EMC + // dependency anyway. + ingredientMap.addIngredient(NormalizedSimpleStack.getFor(stack), 0); + } } catch (Exception e) { PELogger.logFatal( - "Exception in CraftingMapper when parsing Recipe Ingredients: RecipeType: %s, Ingredient: %s", - recipe.getClass().getName(), - stack.toString()); + "Exception in CraftingMapper when parsing Recipe Ingredients: RecipeType: %s, Ingredient: %s", + recipe.getClass() + .getName(), + stack.toString()); e.printStackTrace(); continue recipeloop; } @@ -95,17 +99,20 @@ public void addMappings(IMappingCollector mapper, f } for (Iterable multiIngredient : variation.multiIngredients) { NormalizedSimpleStack normalizedSimpleStack = NormalizedSimpleStack - .createFake(multiIngredient.toString()); + .createFake(multiIngredient.toString()); ingredientMap.addIngredient(normalizedSimpleStack, 1); for (ItemStack stack : multiIngredient) { if (stack == null || stack.getItem() == null) continue; - if (stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) { + if (stack.getItem() + .doesContainerItemLeaveCraftingGrid(stack)) { IngredientMap groupIngredientMap = new IngredientMap<>(); - if (stack.getItem().hasContainerItem(stack)) { + if (stack.getItem() + .hasContainerItem(stack)) { groupIngredientMap.addIngredient( - NormalizedSimpleStack - .getFor(stack.getItem().getContainerItem(stack)), - -1); + NormalizedSimpleStack.getFor( + stack.getItem() + .getContainerItem(stack)), + -1); } groupIngredientMap.addIngredient(NormalizedSimpleStack.getFor(stack), 1); mapper.addConversion(1, normalizedSimpleStack, groupIngredientMap.getMap()); @@ -116,9 +123,8 @@ public void addMappings(IMappingCollector mapper, f mapper.addConversion(recipeOutput.stackSize, recipeOutputNorm, ingredientMap.getMap()); } else { PELogger.logWarn( - "Ignoring Recipe because outnumber <= 0: " + ingredientMap.getMap().toString() - + " -> " - + recipeOutput); + "Ignoring Recipe because outnumber <= 0: " + ingredientMap.getMap() + .toString() + " -> " + recipeOutput); } } } else { @@ -130,7 +136,9 @@ public void addMappings(IMappingCollector mapper, f if (!handled) { if (!canNotMap.contains(recipe.getClass())) { canNotMap.add(recipe.getClass()); - PELogger.logWarn("Can not map Crafting Recipes with Type: " + recipe.getClass().getName()); + PELogger.logWarn( + "Can not map Crafting Recipes with Type: " + recipe.getClass() + .getName()); } } else { int count = 0; @@ -180,7 +188,7 @@ public static class CraftingIngredients { public Iterable> multiIngredients; public CraftingIngredients(Iterable fixedIngredients, - Iterable> multiIngredients) { + Iterable> multiIngredients) { this.fixedIngredients = fixedIngredients; this.multiIngredients = multiIngredients; } @@ -262,15 +270,16 @@ public Iterable getIngredientsFor(IRecipe recipe) { List recipeItemOptions = new LinkedList<>(); Collection recipeItemCollection = ((Collection) recipeItem); if (recipeItemCollection.size() == 1) { - Object element = recipeItemCollection.iterator().next(); + Object element = recipeItemCollection.iterator() + .next(); if (element instanceof ItemStack) { fixedInputs.add(((ItemStack) element).copy()); } else { PELogger.logWarn( - "Can not map recipe " + recipe - + " because found " - + element.toString() - + " instead of ItemStack"); + "Can not map recipe " + recipe + + " because found " + + element.toString() + + " instead of ItemStack"); return null; } continue; @@ -280,10 +289,10 @@ public Iterable getIngredientsFor(IRecipe recipe) { recipeItemOptions.add(((ItemStack) option).copy()); } else { PELogger.logWarn( - "Can not map recipe " + recipe - + " because found " - + option.toString() - + " instead of ItemStack"); + "Can not map recipe " + recipe + + " because found " + + option.toString() + + " instead of ItemStack"); return null; } } diff --git a/src/main/java/moze_intel/projecte/emc/mappers/CustomEMCMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/CustomEMCMapper.java index dd8f247de..af856d644 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/CustomEMCMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/CustomEMCMapper.java @@ -2,13 +2,13 @@ import java.util.Map; +import net.minecraftforge.common.config.Configuration; + import moze_intel.projecte.config.CustomEMCParser; import moze_intel.projecte.emc.NormalizedSimpleStack; import moze_intel.projecte.emc.collector.IMappingCollector; import moze_intel.projecte.utils.PELogger; -import net.minecraftforge.common.config.Configuration; - public class CustomEMCMapper implements IEMCMapper { @Override diff --git a/src/main/java/moze_intel/projecte/emc/mappers/FluidMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/FluidMapper.java index 28d846926..58043f827 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/FluidMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/FluidMapper.java @@ -3,12 +3,6 @@ import java.util.Arrays; import java.util.List; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.arithmetics.DoubleArithmetic; -import moze_intel.projecte.emc.collector.IExtendedMappingCollector; -import moze_intel.projecte.emc.collector.IMappingCollector; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -24,6 +18,12 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.arithmetics.DoubleArithmetic; +import moze_intel.projecte.emc.collector.IExtendedMappingCollector; +import moze_intel.projecte.emc.collector.IMappingCollector; +import moze_intel.projecte.utils.PELogger; + public class FluidMapper implements IEMCMapper { private static List> melting = Lists.newArrayList(); @@ -90,21 +90,21 @@ public static void addMelting(NormalizedSimpleStack stack, String fluidName, int @Override public void addMappings(IMappingCollector mapper, Configuration config) { mapper.setValueBefore( - NormalizedSimpleStack.getFor(FluidRegistry.WATER), - Long.MIN_VALUE/* =Free. TODO: Use IntArithmetic */); + NormalizedSimpleStack.getFor(FluidRegistry.WATER), + Long.MIN_VALUE/* =Free. TODO: Use IntArithmetic */); // 1 Bucket of Lava = 1 Block of Obsidian mapper.addConversion( - 1000, - NormalizedSimpleStack.getFor(FluidRegistry.LAVA), - Arrays.asList(NormalizedSimpleStack.getFor(Blocks.obsidian))); + 1000, + NormalizedSimpleStack.getFor(FluidRegistry.LAVA), + Arrays.asList(NormalizedSimpleStack.getFor(Blocks.obsidian))); // Add Conversion in case MFR is not present and milk is not an actual fluid NormalizedSimpleStack fakeMilkFluid = NormalizedSimpleStack.createFake("fakeMilkFluid"); mapper.setValueBefore(fakeMilkFluid, 16L); mapper.addConversion( - 1, - NormalizedSimpleStack.getFor(Items.milk_bucket), - Arrays.asList(NormalizedSimpleStack.getFor(Items.bucket), fakeMilkFluid)); + 1, + NormalizedSimpleStack.getFor(Items.milk_bucket), + Arrays.asList(NormalizedSimpleStack.getFor(Items.bucket), fakeMilkFluid)); Fluid milkFluid = FluidRegistry.getFluid("milk"); if (milkFluid != null) { @@ -118,23 +118,25 @@ public void addMappings(IMappingCollector mapper, C for (Pair pair : melting) { emapper.addConversion( - pair.getValue().amount, - NormalizedSimpleStack.getFor(pair.getValue().getFluid()), - Arrays.asList(pair.getKey()), - fluidArithmetic); + pair.getValue().amount, + NormalizedSimpleStack.getFor( + pair.getValue() + .getFluid()), + Arrays.asList(pair.getKey()), + fluidArithmetic); } for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + .getRegisteredFluidContainerData()) { Fluid fluid = data.fluid.getFluid(); mapper.addConversion( + 1, + NormalizedSimpleStack.getFor(data.filledContainer), + ImmutableMap.of( + NormalizedSimpleStack.getFor(data.emptyContainer), 1, - NormalizedSimpleStack.getFor(data.filledContainer), - ImmutableMap.of( - NormalizedSimpleStack.getFor(data.emptyContainer), - 1, - NormalizedSimpleStack.getFor(fluid), - data.fluid.amount)); + NormalizedSimpleStack.getFor(fluid), + data.fluid.amount)); } } diff --git a/src/main/java/moze_intel/projecte/emc/mappers/IEMCMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/IEMCMapper.java index bf7325182..4c1a01746 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/IEMCMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/IEMCMapper.java @@ -1,9 +1,9 @@ package moze_intel.projecte.emc.mappers; -import moze_intel.projecte.emc.collector.IMappingCollector; - import net.minecraftforge.common.config.Configuration; +import moze_intel.projecte.emc.collector.IMappingCollector; + /** * Interface for Classes that want to make Contributions to the EMC Mapping. * diff --git a/src/main/java/moze_intel/projecte/emc/mappers/LazyMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/LazyMapper.java index 545857ee1..790624915 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/LazyMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/LazyMapper.java @@ -1,9 +1,5 @@ package moze_intel.projecte.emc.mappers; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.collector.IMappingCollector; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -11,6 +7,10 @@ import com.google.common.collect.ImmutableMap; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.collector.IMappingCollector; +import moze_intel.projecte.utils.ItemHelper; + public class LazyMapper implements IEMCMapper { IMappingCollector mapper; @@ -25,9 +25,9 @@ public void addMappings(IMappingCollector mapper, C addMapping(new ItemStack(Blocks.dirt), 1); addMapping(new ItemStack(Blocks.dirt, 1, 2), 2); mapper.addConversion( - 1, - NormalizedSimpleStack.getFor(Blocks.grass), - ImmutableMap.of(NormalizedSimpleStack.getFor(Blocks.dirt), 2)); + 1, + NormalizedSimpleStack.getFor(Blocks.grass), + ImmutableMap.of(NormalizedSimpleStack.getFor(Blocks.dirt), 2)); addMapping(new ItemStack(Blocks.mycelium), 2); addMapping(new ItemStack(Blocks.leaves), 1); addMapping(new ItemStack(Blocks.leaves2), 1); @@ -79,14 +79,14 @@ public void addMappings(IMappingCollector mapper, C addMapping(new ItemStack(Items.bone), 144); mapper.addConversion( - 1, - NormalizedSimpleStack.getFor(Blocks.mossy_cobblestone), - ImmutableMap.of(NormalizedSimpleStack.getFor(Blocks.cobblestone), 2)); + 1, + NormalizedSimpleStack.getFor(Blocks.mossy_cobblestone), + ImmutableMap.of(NormalizedSimpleStack.getFor(Blocks.cobblestone), 2)); // Mossy Stone Bricks mapper.addConversion( - 1, - NormalizedSimpleStack.getFor(new ItemStack(Blocks.stonebrick, 1, 1)), - ImmutableMap.of(NormalizedSimpleStack.getFor(Blocks.stonebrick), 2)); + 1, + NormalizedSimpleStack.getFor(new ItemStack(Blocks.stonebrick, 1, 1)), + ImmutableMap.of(NormalizedSimpleStack.getFor(Blocks.stonebrick), 2)); addMapping(new ItemStack(Blocks.stonebrick, 1, 2), 1); addMapping(new ItemStack(Blocks.stonebrick, 1, 3), 1); addMapping(new ItemStack(Items.saddle), 192); @@ -144,13 +144,13 @@ public void addMappings(IMappingCollector mapper, C addMapping(new ItemStack(Items.nether_star), 139264); mapper.addConversion( - 1, - NormalizedSimpleStack.getFor(Items.iron_horse_armor), - ImmutableMap.of(NormalizedSimpleStack.getFor(Items.iron_ingot), 8)); + 1, + NormalizedSimpleStack.getFor(Items.iron_horse_armor), + ImmutableMap.of(NormalizedSimpleStack.getFor(Items.iron_ingot), 8)); mapper.addConversion( - 1, - NormalizedSimpleStack.getFor(Items.golden_horse_armor), - ImmutableMap.of(NormalizedSimpleStack.getFor(Items.gold_ingot), 8)); + 1, + NormalizedSimpleStack.getFor(Items.golden_horse_armor), + ImmutableMap.of(NormalizedSimpleStack.getFor(Items.gold_ingot), 8)); addMapping(new ItemStack(Items.diamond_horse_armor), 40960); addMapping(new ItemStack(Blocks.tallgrass), 1); addMapping(new ItemStack(Blocks.tallgrass, 1, 1), 1); diff --git a/src/main/java/moze_intel/projecte/emc/mappers/OreDictionaryMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/OreDictionaryMapper.java index b2569edec..ead1a6269 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/OreDictionaryMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/OreDictionaryMapper.java @@ -2,16 +2,16 @@ import java.util.Set; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.collector.IMappingCollector; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.oredict.OreDictionary; import com.google.common.collect.Sets; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.collector.IMappingCollector; +import moze_intel.projecte.utils.ItemHelper; + public class OreDictionaryMapper extends LazyMapper { private static final Set BLACKLIST_EXCEPTIONS = Sets.newHashSet("dustPlastic"); @@ -20,10 +20,10 @@ public class OreDictionaryMapper extends LazyMapper { public void addMappings(IMappingCollector mapper, Configuration config) { this.mapper = mapper; if (config.getBoolean( - "blacklistOresAndDusts", - "", - true, - "Set EMC=0 for everything that has an OD Name that starts with `ore`, `dust` or `crushed` besides `dustPlastic`")) { + "blacklistOresAndDusts", + "", + true, + "Set EMC=0 for everything that has an OD Name that starts with `ore`, `dust` or `crushed` besides `dustPlastic`")) { // Black-list all ores/dusts for (String s : OreDictionary.getOreNames()) { if (s == null) { diff --git a/src/main/java/moze_intel/projecte/emc/mappers/SmeltingMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/SmeltingMapper.java index 141ee6303..9c2687338 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/SmeltingMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/SmeltingMapper.java @@ -2,19 +2,20 @@ import java.util.Map; -import moze_intel.projecte.emc.IngredientMap; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.collector.IMappingCollector; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.common.config.Configuration; +import moze_intel.projecte.emc.IngredientMap; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.collector.IMappingCollector; + public class SmeltingMapper implements IEMCMapper { @Override public void addMappings(IMappingCollector mapper, Configuration config) { - Map smelting = FurnaceRecipes.smelting().getSmeltingList(); + Map smelting = FurnaceRecipes.smelting() + .getSmeltingList(); for (Map.Entry entry : smelting.entrySet()) { ItemStack input = entry.getKey(); ItemStack output = entry.getValue(); @@ -27,10 +28,10 @@ public void addMappings(IMappingCollector mapper, C map.addIngredient(normInput, input.stackSize); mapper.addConversion(output.stackSize, normOutput, map.getMap()); if (config.getBoolean( - "doBackwardsMapping", - "", - false, - "If X has a value and is smelted from Y, Y will get a value too. This is an experimental thing and might result in Mappings you did not expect/want to happen.")) { + "doBackwardsMapping", + "", + false, + "If X has a value and is smelted from Y, Y will get a value too. This is an experimental thing and might result in Mappings you did not expect/want to happen.")) { map = new IngredientMap<>(); map.addIngredient(normOutput, output.stackSize); mapper.addConversion(input.stackSize, normInput, map.getMap()); diff --git a/src/main/java/moze_intel/projecte/emc/mappers/customConversions/CustomConversionMapper.java b/src/main/java/moze_intel/projecte/emc/mappers/customConversions/CustomConversionMapper.java index d0f34e8c3..992fcf227 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/customConversions/CustomConversionMapper.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/customConversions/CustomConversionMapper.java @@ -8,18 +8,6 @@ import java.io.Reader; import java.util.Map; -import moze_intel.projecte.PECore; -import moze_intel.projecte.emc.NormalizedSimpleStack; -import moze_intel.projecte.emc.collector.IMappingCollector; -import moze_intel.projecte.emc.mappers.IEMCMapper; -import moze_intel.projecte.emc.mappers.customConversions.json.ConversionGroup; -import moze_intel.projecte.emc.mappers.customConversions.json.CustomConversion; -import moze_intel.projecte.emc.mappers.customConversions.json.CustomConversionDeserializer; -import moze_intel.projecte.emc.mappers.customConversions.json.CustomConversionFile; -import moze_intel.projecte.emc.mappers.customConversions.json.FixedValues; -import moze_intel.projecte.emc.mappers.customConversions.json.FixedValuesDeserializer; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fluids.Fluid; @@ -33,6 +21,18 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import moze_intel.projecte.PECore; +import moze_intel.projecte.emc.NormalizedSimpleStack; +import moze_intel.projecte.emc.collector.IMappingCollector; +import moze_intel.projecte.emc.mappers.IEMCMapper; +import moze_intel.projecte.emc.mappers.customConversions.json.ConversionGroup; +import moze_intel.projecte.emc.mappers.customConversions.json.CustomConversion; +import moze_intel.projecte.emc.mappers.customConversions.json.CustomConversionDeserializer; +import moze_intel.projecte.emc.mappers.customConversions.json.CustomConversionFile; +import moze_intel.projecte.emc.mappers.customConversions.json.FixedValues; +import moze_intel.projecte.emc.mappers.customConversions.json.FixedValuesDeserializer; +import moze_intel.projecte.utils.PELogger; + public class CustomConversionMapper implements IEMCMapper { public static final ImmutableList defaultfilenames = ImmutableList.of("metals", "example", "ODdefaults"); @@ -57,20 +57,26 @@ public void addMappings(IMappingCollector mapper, C File customConversionFolder = getCustomConversionFolder(); if (customConversionFolder.isDirectory() || customConversionFolder.mkdir()) { if (config.getBoolean( - "writeDefaultFiles", - "", - true, - "Create the default files if they are not present, yet. Will not overwrite them, only create them when they are not present.")) { + "writeDefaultFiles", + "", + true, + "Create the default files if they are not present, yet. Will not overwrite them, only create them when they are not present.")) { tryToWriteDefaultFiles(); } for (File f : customConversionFolder.listFiles()) { if (f.isFile() && f.canRead()) { - if (f.getName().toLowerCase().endsWith(".json")) { + if (f.getName() + .toLowerCase() + .endsWith(".json")) { if (config.getBoolean( - f.getName().substring(0, f.getName().length() - 5), - "", - true, - String.format("Read file: %s?", f.getName()))) { + f.getName() + .substring( + 0, + f.getName() + .length() - 5), + "", + true, + String.format("Read file: %s?", f.getName()))) { try { addMappingsFromFile(new FileReader(f), mapper); PELogger.logInfo("Collected Mappings from " + f.getName()); @@ -96,15 +102,15 @@ public static void addMappingsFromFile(Reader json, IMappingCollector mapper) { + IMappingCollector mapper) { Map fakes = Maps.newHashMap(); // TODO implement buffered IMappingCollector to recover from failures for (Map.Entry entry : file.groups.entrySet()) { PELogger.logDebug( - String.format( - "Adding conversions from group '%s' with comment '%s'", - entry.getKey(), - entry.getValue().comment)); + String.format( + "Adding conversions from group '%s' with comment '%s'", + entry.getKey(), + entry.getValue().comment)); try { for (CustomConversion conversion : entry.getValue().conversions) { NormalizedSimpleStack output = getNSSfromJsonString(conversion.output, fakes); @@ -149,15 +155,15 @@ public static void addMappingsFromFile(CustomConversionFile file, String odName = ((NormalizedSimpleStack.NSSOreDictionary) out).od; for (ItemStack itemStack : OreDictionary.getOres(odName)) { mapper.setValueFromConversion( - conversion.count, - NormalizedSimpleStack.getFor(itemStack), - convertToNSSMap(conversion.ingredients, fakes)); + conversion.count, + NormalizedSimpleStack.getFor(itemStack), + convertToNSSMap(conversion.ingredients, fakes)); } } mapper.setValueFromConversion( - conversion.count, - out, - convertToNSSMap(conversion.ingredients, fakes)); + conversion.count, + out, + convertToNSSMap(conversion.ingredients, fakes)); } } } @@ -168,7 +174,7 @@ public static void addMappingsFromFile(CustomConversionFile file, } private static NormalizedSimpleStack getNSSfromJsonString(String s, Map fakes) - throws Exception { + throws Exception { if (s.startsWith("OD|")) { return NormalizedSimpleStack.forOreDictionary(s.substring(3)); } else if (s.startsWith("FAKE|")) { @@ -191,7 +197,7 @@ private static NormalizedSimpleStack getNSSfromJsonString(String s, Map Map convertToNSSMap(Map m, - Map fakes) throws Exception { + Map fakes) throws Exception { Map out = Maps.newHashMap(); for (Map.Entry e : m.entrySet()) { NormalizedSimpleStack nssItem = getNSSfromJsonString(e.getKey(), fakes); @@ -223,7 +229,7 @@ private static void writeDefaultFile(String filename) { try { if (f.createNewFile() && f.canWrite()) { InputStream stream = CustomConversionMapper.class.getClassLoader() - .getResourceAsStream("defaultCustomConversions/" + filename + ".json"); + .getResourceAsStream("defaultCustomConversions/" + filename + ".json"); OutputStream outputStream = new FileOutputStream(f); IOUtils.copy(stream, outputStream); stream.close(); diff --git a/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversion.java b/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversion.java index e9f0eb27a..0942a7e53 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversion.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversion.java @@ -2,10 +2,10 @@ import java.util.Map; -import moze_intel.projecte.emc.NormalizedSimpleStack; - import com.google.common.collect.Maps; +import moze_intel.projecte.emc.NormalizedSimpleStack; + public class CustomConversion { public int count = 1; @@ -14,13 +14,16 @@ public class CustomConversion { public transient boolean evalOD = false; public static CustomConversion getFor(int count, NormalizedSimpleStack output, - Map ingredients) { + Map ingredients) { CustomConversion conversion = new CustomConversion(); conversion.count = count; conversion.output = output.json(); conversion.ingredients = Maps.newHashMap(); for (Map.Entry entry : ingredients.entrySet()) { - conversion.ingredients.put(entry.getKey().json(), entry.getValue()); + conversion.ingredients.put( + entry.getKey() + .json(), + entry.getValue()); } return conversion; } diff --git a/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversionDeserializer.java b/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversionDeserializer.java index 5e338bfff..cb666ac6d 100644 --- a/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversionDeserializer.java +++ b/src/main/java/moze_intel/projecte/emc/mappers/customConversions/json/CustomConversionDeserializer.java @@ -17,7 +17,7 @@ public class CustomConversionDeserializer implements JsonDeserializer { @Override public FixedValues deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException { + throws JsonParseException { FixedValues fixed = new FixedValues(); JsonObject o = json.getAsJsonObject(); for (Map.Entry entry : o.entrySet()) { - if (entry.getKey().equals("before")) { - fixed.setValueBefore = parseSetValueMap(entry.getValue().getAsJsonObject()); - } else if (entry.getKey().equals("after")) { - fixed.setValueAfter = parseSetValueMap(entry.getValue().getAsJsonObject()); - } else if (entry.getKey().equals("conversion")) { - fixed.conversion = context.deserialize( - entry.getValue().getAsJsonArray(), - new TypeToken>() {}.getType()); - } else { - throw new JsonParseException( - String.format("Can not parse \"%s\":%s in fixedValues", entry.getKey(), entry.getValue())); - } + if (entry.getKey() + .equals("before")) { + fixed.setValueBefore = parseSetValueMap( + entry.getValue() + .getAsJsonObject()); + } else if (entry.getKey() + .equals("after")) { + fixed.setValueAfter = parseSetValueMap( + entry.getValue() + .getAsJsonObject()); + } else if (entry.getKey() + .equals("conversion")) { + fixed.conversion = context.deserialize( + entry.getValue() + .getAsJsonArray(), + new TypeToken>() {}.getType()); + } else { + throw new JsonParseException( + String.format("Can not parse \"%s\":%s in fixedValues", entry.getKey(), entry.getValue())); + } } return fixed; } @@ -47,12 +55,15 @@ Map parseSetValueMapFromObject(JsonObject o, String key) { Map parseSetValueMap(JsonObject o) { Map out = Maps.newHashMap(); for (Map.Entry entry : o.entrySet()) { - JsonPrimitive primitive = entry.getValue().getAsJsonPrimitive(); + JsonPrimitive primitive = entry.getValue() + .getAsJsonPrimitive(); if (primitive.isNumber()) { out.put(entry.getKey(), primitive.getAsLong()); continue; } else if (primitive.isString()) { - if (primitive.getAsString().toLowerCase().equals("free")) { + if (primitive.getAsString() + .toLowerCase() + .equals("free")) { out.put(entry.getKey(), Long.MIN_VALUE); // TODO Get Value for 'free' from arithmetic? continue; } diff --git a/src/main/java/moze_intel/projecte/emc/pregenerated/NSSJsonTypeAdapter.java b/src/main/java/moze_intel/projecte/emc/pregenerated/NSSJsonTypeAdapter.java index fbf23f459..bd519f1d0 100644 --- a/src/main/java/moze_intel/projecte/emc/pregenerated/NSSJsonTypeAdapter.java +++ b/src/main/java/moze_intel/projecte/emc/pregenerated/NSSJsonTypeAdapter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import moze_intel.projecte.emc.NormalizedSimpleStack; - import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import moze_intel.projecte.emc.NormalizedSimpleStack; + public class NSSJsonTypeAdapter extends TypeAdapter { @Override diff --git a/src/main/java/moze_intel/projecte/emc/pregenerated/PregeneratedEMC.java b/src/main/java/moze_intel/projecte/emc/pregenerated/PregeneratedEMC.java index ed536fda8..46b72c31b 100644 --- a/src/main/java/moze_intel/projecte/emc/pregenerated/PregeneratedEMC.java +++ b/src/main/java/moze_intel/projecte/emc/pregenerated/PregeneratedEMC.java @@ -4,17 +4,19 @@ import java.lang.reflect.Type; import java.util.Map; -import moze_intel.projecte.emc.NormalizedSimpleStack; - import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import moze_intel.projecte.emc.NormalizedSimpleStack; + public class PregeneratedEMC { static final Gson gson = new GsonBuilder() - .registerTypeAdapter(NormalizedSimpleStack.class, new NSSJsonTypeAdapter().nullSafe()) - .enableComplexMapKeySerialization().setPrettyPrinting().create(); + .registerTypeAdapter(NormalizedSimpleStack.class, new NSSJsonTypeAdapter().nullSafe()) + .enableComplexMapKeySerialization() + .setPrettyPrinting() + .create(); public static boolean tryRead(File f, Map map) { try { diff --git a/src/main/java/moze_intel/projecte/events/ConnectionHandler.java b/src/main/java/moze_intel/projecte/events/ConnectionHandler.java index 20e081d78..bb933d4eb 100644 --- a/src/main/java/moze_intel/projecte/events/ConnectionHandler.java +++ b/src/main/java/moze_intel/projecte/events/ConnectionHandler.java @@ -1,16 +1,15 @@ package moze_intel.projecte.events; -import moze_intel.projecte.handlers.PlayerChecks; -import moze_intel.projecte.handlers.PlayerTimers; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.CheckUpdatePKT; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import moze_intel.projecte.handlers.PlayerChecks; +import moze_intel.projecte.handlers.PlayerTimers; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.CheckUpdatePKT; +import moze_intel.projecte.utils.PELogger; public class ConnectionHandler { @@ -27,7 +26,7 @@ public void playerConnect(PlayerLoggedInEvent event) { public void playerDisconnect(PlayerEvent.PlayerLoggedOutEvent event) { PlayerTimers.removePlayer(event.player); PELogger.logInfo( - "Removing " + event.player.getCommandSenderName() + " from scheduled timers: Player disconnected."); + "Removing " + event.player.getCommandSenderName() + " from scheduled timers: Player disconnected."); PlayerChecks.removePlayerFromLists(((EntityPlayerMP) event.player)); } diff --git a/src/main/java/moze_intel/projecte/events/KeyPressEvent.java b/src/main/java/moze_intel/projecte/events/KeyPressEvent.java index cc089b4bb..71ac646ae 100644 --- a/src/main/java/moze_intel/projecte/events/KeyPressEvent.java +++ b/src/main/java/moze_intel/projecte/events/KeyPressEvent.java @@ -1,15 +1,14 @@ package moze_intel.projecte.events; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.KeyPressPKT; -import moze_intel.projecte.utils.ClientKeyHelper; - import net.minecraft.client.settings.KeyBinding; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.KeyPressPKT; +import moze_intel.projecte.utils.ClientKeyHelper; @SideOnly(Side.CLIENT) public class KeyPressEvent { diff --git a/src/main/java/moze_intel/projecte/events/PlayerEvents.java b/src/main/java/moze_intel/projecte/events/PlayerEvents.java index b682aec7f..418aba85c 100644 --- a/src/main/java/moze_intel/projecte/events/PlayerEvents.java +++ b/src/main/java/moze_intel/projecte/events/PlayerEvents.java @@ -1,19 +1,5 @@ package moze_intel.projecte.events; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.container.AlchBagContainer; -import moze_intel.projecte.gameObjs.items.AlchemicalBag; -import moze_intel.projecte.handlers.PlayerChecks; -import moze_intel.projecte.playerData.AlchBagProps; -import moze_intel.projecte.playerData.AlchemicalBags; -import moze_intel.projecte.playerData.Transmutation; -import moze_intel.projecte.playerData.TransmutationOffline; -import moze_intel.projecte.playerData.TransmutationProps; -import moze_intel.projecte.utils.ChatHelper; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; @@ -32,6 +18,19 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.container.AlchBagContainer; +import moze_intel.projecte.gameObjs.items.AlchemicalBag; +import moze_intel.projecte.handlers.PlayerChecks; +import moze_intel.projecte.playerData.AlchBagProps; +import moze_intel.projecte.playerData.AlchemicalBags; +import moze_intel.projecte.playerData.Transmutation; +import moze_intel.projecte.playerData.TransmutationOffline; +import moze_intel.projecte.playerData.TransmutationProps; +import moze_intel.projecte.utils.ChatHelper; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.PELogger; public class PlayerEvents { @@ -45,11 +44,15 @@ public void cloneEvent(PlayerEvent.Clone evt) { NBTTagCompound bag = new NBTTagCompound(); NBTTagCompound transmute = new NBTTagCompound(); - AlchBagProps.getDataFor(evt.original).saveNBTData(bag); // Cache old - TransmutationProps.getDataFor(evt.original).saveNBTData(transmute); + AlchBagProps.getDataFor(evt.original) + .saveNBTData(bag); // Cache old + TransmutationProps.getDataFor(evt.original) + .saveNBTData(transmute); - AlchBagProps.getDataFor(evt.entityPlayer).loadNBTData(bag); // Reapply on new - TransmutationProps.getDataFor(evt.entityPlayer).loadNBTData(transmute); + AlchBagProps.getDataFor(evt.entityPlayer) + .loadNBTData(bag); // Reapply on new + TransmutationProps.getDataFor(evt.entityPlayer) + .loadNBTData(transmute); PELogger.logDebug("Reapplied bag and knowledge on player respawning"); } @@ -76,17 +79,22 @@ public void onConstruct(EntityEvent.EntityConstructing evt) { @SubscribeEvent public void onHighAlchemistJoin(cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent evt) { - if (PECore.uuids.contains((evt.player.getUniqueID().toString()))) { + if (PECore.uuids.contains( + (evt.player.getUniqueID() + .toString()))) { IChatComponent prior = ChatHelper - .modifyColor(new ChatComponentTranslation("pe.server.high_alchemist"), EnumChatFormatting.BLUE); + .modifyColor(new ChatComponentTranslation("pe.server.high_alchemist"), EnumChatFormatting.BLUE); IChatComponent playername = ChatHelper.modifyColor( - new ChatComponentText(" " + evt.player.getCommandSenderName() + " "), - EnumChatFormatting.GOLD); + new ChatComponentText(" " + evt.player.getCommandSenderName() + " "), + EnumChatFormatting.GOLD); IChatComponent latter = ChatHelper - .modifyColor(new ChatComponentTranslation("pe.server.has_joined"), EnumChatFormatting.BLUE); - MinecraftServer.getServer().getConfigurationManager() - .sendChatMsg(prior.appendSibling(playername).appendSibling(latter)); // Sends to all everywhere, not - // just same world like before. + .modifyColor(new ChatComponentTranslation("pe.server.has_joined"), EnumChatFormatting.BLUE); + MinecraftServer.getServer() + .getConfigurationManager() + .sendChatMsg( + prior.appendSibling(playername) + .appendSibling(latter)); // Sends to all everywhere, not + // just same world like before. } } @@ -108,18 +116,18 @@ public void pickupItem(EntityItemPickupEvent event) { IInventory inv = ((AlchBagContainer) player.openContainer).inventory; if (ItemHelper.invContainsItem(inv, new ItemStack(ObjHandler.blackHole, 1, 1)) - || ItemHelper.invContainsItem(inv, new ItemStack(ObjHandler.voidRing, 1, 1)) - && ItemHelper.hasSpace(inv, event.item.getEntityItem())) { + || ItemHelper.invContainsItem(inv, new ItemStack(ObjHandler.voidRing, 1, 1)) + && ItemHelper.hasSpace(inv, event.item.getEntityItem())) { ItemStack remain = ItemHelper.pushStackInInv(inv, event.item.getEntityItem()); if (remain == null) { event.item.delayBeforeCanPickup = 10; event.item.setDead(); world.playSoundAtEntity( - player, - "random.pop", - 0.2F, - ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + player, + "random.pop", + 0.2F, + ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } else { event.item.setEntityItemStack(remain); } @@ -142,10 +150,10 @@ public void pickupItem(EntityItemPickupEvent event) { event.item.delayBeforeCanPickup = 10; event.item.setDead(); world.playSoundAtEntity( - player, - "random.pop", - 0.2F, - ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + player, + "random.pop", + 0.2F, + ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } else { event.item.setEntityItemStack(remain); } diff --git a/src/main/java/moze_intel/projecte/events/PlayerRender.java b/src/main/java/moze_intel/projecte/events/PlayerRender.java index 53478fc09..a82e4b5d3 100644 --- a/src/main/java/moze_intel/projecte/events/PlayerRender.java +++ b/src/main/java/moze_intel/projecte/events/PlayerRender.java @@ -1,7 +1,5 @@ package moze_intel.projecte.events; -import moze_intel.projecte.gameObjs.items.armor.GemFeet; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.util.ResourceLocation; @@ -13,6 +11,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.items.armor.GemFeet; @SideOnly(Side.CLIENT) public class PlayerRender { @@ -26,7 +25,8 @@ public class PlayerRender { @SubscribeEvent public void playerRender(RenderPlayerEvent.Specials.Pre evt) { - playeruuid = evt.entityPlayer.getUniqueID().toString(); + playeruuid = evt.entityPlayer.getUniqueID() + .toString(); if (playeruuid.equals(sinuuid) || playeruuid.equals(claruuid)) { GL11.glPushMatrix(); @@ -45,11 +45,11 @@ public void playerRender(RenderPlayerEvent.Specials.Pre evt) { if (playeruuid.equals(claruuid)) { GL11.glColor4f(0.49F, 0.97F, 1.0F, 1.0F); Minecraft.getMinecraft().renderEngine - .bindTexture(new ResourceLocation("projecte:textures/models/heartcircle.png")); + .bindTexture(new ResourceLocation("projecte:textures/models/heartcircle.png")); } else { GL11.glColor4f(0.0F, 1.0F, 0.0F, 1.0F); Minecraft.getMinecraft().renderEngine - .bindTexture(new ResourceLocation("projecte:textures/models/yuecircle.png")); + .bindTexture(new ResourceLocation("projecte:textures/models/yuecircle.png")); } yuemodel.renderAll(); @@ -60,7 +60,8 @@ public void playerRender(RenderPlayerEvent.Specials.Pre evt) { @SubscribeEvent public void onFOVUpdateEvent(FOVUpdateEvent evt) { - if (evt.entity.getCurrentArmor(0) != null && evt.entity.getCurrentArmor(0).getItem() instanceof GemFeet) { + if (evt.entity.getCurrentArmor(0) != null && evt.entity.getCurrentArmor(0) + .getItem() instanceof GemFeet) { evt.newfov = evt.fov - 0.4F; } } diff --git a/src/main/java/moze_intel/projecte/events/TickEvents.java b/src/main/java/moze_intel/projecte/events/TickEvents.java index 5f6de0098..1db28ed68 100644 --- a/src/main/java/moze_intel/projecte/events/TickEvents.java +++ b/src/main/java/moze_intel/projecte/events/TickEvents.java @@ -1,13 +1,12 @@ package moze_intel.projecte.events; -import moze_intel.projecte.handlers.PlayerChecks; -import moze_intel.projecte.handlers.PlayerTimers; - import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; +import moze_intel.projecte.handlers.PlayerChecks; +import moze_intel.projecte.handlers.PlayerTimers; public class TickEvents { diff --git a/src/main/java/moze_intel/projecte/events/ToolTipEvent.java b/src/main/java/moze_intel/projecte/events/ToolTipEvent.java index 1286ce722..7952fd3fe 100644 --- a/src/main/java/moze_intel/projecte/events/ToolTipEvent.java +++ b/src/main/java/moze_intel/projecte/events/ToolTipEvent.java @@ -2,14 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.gui.GUIPedestal; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; @@ -26,6 +18,13 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.gui.GUIPedestal; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.EMCHelper; @SideOnly(Side.CLIENT) public class ToolTipEvent { @@ -53,8 +52,8 @@ public void tTipEvent(ItemTooltipEvent event) { if (ProjectEConfig.showPedestalTooltipInGUI) { if (Minecraft.getMinecraft().currentScreen instanceof GUIPedestal) { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("pe.pedestal.on_pedestal") - + " "); + EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("pe.pedestal.on_pedestal") + + " "); List description = ((IPedestalItem) currentItem).getPedestalDescription(); if (description.isEmpty()) { event.toolTip.add(IPedestalItem.TOOLTIPDISABLED); @@ -64,8 +63,7 @@ public void tTipEvent(ItemTooltipEvent event) { } } else { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("pe.pedestal.on_pedestal") - + " "); + EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("pe.pedestal.on_pedestal") + " "); List description = ((IPedestalItem) currentItem).getPedestalDescription(); if (description.isEmpty()) { event.toolTip.add(IPedestalItem.TOOLTIPDISABLED); @@ -85,7 +83,9 @@ public void tTipEvent(ItemTooltipEvent event) { event.toolTip.add("OD: " + OreDictionary.getOreName(id)); } if (currentBlock instanceof BlockFluidBase) { - event.toolTip.add("Fluid: " + ((BlockFluidBase) currentBlock).getFluid().getName()); + event.toolTip.add( + "Fluid: " + ((BlockFluidBase) currentBlock).getFluid() + .getName()); } } @@ -94,10 +94,10 @@ public void tTipEvent(ItemTooltipEvent event) { long value = EMCHelper.getEmcValue(current); event.toolTip.add( - EnumChatFormatting.YELLOW + StatCollector.translateToLocal("pe.emc.emc_tooltip_prefix") - + " " - + EnumChatFormatting.WHITE - + String.format("%,d", value)); + EnumChatFormatting.YELLOW + StatCollector.translateToLocal("pe.emc.emc_tooltip_prefix") + + " " + + EnumChatFormatting.WHITE + + String.format("%,d", value)); if (current.stackSize > 1) { long total; @@ -105,18 +105,18 @@ public void tTipEvent(ItemTooltipEvent event) { total = LongMath.checkedMultiply(value, current.stackSize); if (total < 0 || total <= value) { event.toolTip.add( - EnumChatFormatting.YELLOW + I18n.format("pe.emc.stackemc_tooltip_prefix") - + " " - + EnumChatFormatting.OBFUSCATED - + I18n.format("pe.emc.too_much")); + EnumChatFormatting.YELLOW + I18n.format("pe.emc.stackemc_tooltip_prefix") + + " " + + EnumChatFormatting.OBFUSCATED + + I18n.format("pe.emc.too_much")); } else { event.toolTip.add( - EnumChatFormatting.YELLOW + I18n.format("pe.emc.stackemc_tooltip_prefix") - + " " - + EnumChatFormatting.WHITE - + Constants.EMC_FORMATTER.format(value * current.stackSize) - + EnumChatFormatting.BLUE - + EMCHelper.getEmcSellString(current, current.stackSize)); + EnumChatFormatting.YELLOW + I18n.format("pe.emc.stackemc_tooltip_prefix") + + " " + + EnumChatFormatting.WHITE + + Constants.EMC_FORMATTER.format(value * current.stackSize) + + EnumChatFormatting.BLUE + + EMCHelper.getEmcSellString(current, current.stackSize)); } } catch (ArithmeticException e) { // total = Long.MAX_VALUE; @@ -124,11 +124,10 @@ public void tTipEvent(ItemTooltipEvent event) { // if (total < 0 || total <= value || total > Constants.TILE_MAX_EMC) // { event.toolTip.add( - EnumChatFormatting.YELLOW - + StatCollector.translateToLocal("pe.emc.stackemc_tooltip_prefix") - + " " - + EnumChatFormatting.OBFUSCATED - + StatCollector.translateToLocal("pe.emc.too_much")); + EnumChatFormatting.YELLOW + StatCollector.translateToLocal("pe.emc.stackemc_tooltip_prefix") + + " " + + EnumChatFormatting.OBFUSCATED + + StatCollector.translateToLocal("pe.emc.too_much")); } /* * else { event.toolTip.add(EnumChatFormatting.YELLOW + * StatCollector.translateToLocal("pe.emc.stackemc_tooltip_prefix") + " " + @@ -148,47 +147,47 @@ public void tTipEvent(ItemTooltipEvent event) { if (currentBlock == ObjHandler.energyCollector) { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxgenrate_tooltip") + EnumChatFormatting.BLUE - + " %d " - + rate, - Constants.COLLECTOR_MK1_GEN)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxgenrate_tooltip") + EnumChatFormatting.BLUE + + " %d " + + rate, + Constants.COLLECTOR_MK1_GEN)); event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE - + " %d " - + unit, - Constants.COLLECTOR_MK1_MAX)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE + + " %d " + + unit, + Constants.COLLECTOR_MK1_MAX)); } if (currentBlock == ObjHandler.collectorMK2) { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxgenrate_tooltip") + EnumChatFormatting.BLUE - + " %d " - + rate, - Constants.COLLECTOR_MK2_GEN)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxgenrate_tooltip") + EnumChatFormatting.BLUE + + " %d " + + rate, + Constants.COLLECTOR_MK2_GEN)); event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE - + " %d " - + unit, - Constants.COLLECTOR_MK2_MAX)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE + + " %d " + + unit, + Constants.COLLECTOR_MK2_MAX)); } if (currentBlock == ObjHandler.collectorMK3) { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxgenrate_tooltip") + EnumChatFormatting.BLUE - + " %d " - + rate, - Constants.COLLECTOR_MK3_GEN)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxgenrate_tooltip") + EnumChatFormatting.BLUE + + " %d " + + rate, + Constants.COLLECTOR_MK3_GEN)); event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE - + " %d " - + unit, - Constants.COLLECTOR_MK3_MAX)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE + + " %d " + + unit, + Constants.COLLECTOR_MK3_MAX)); } /** @@ -196,47 +195,47 @@ public void tTipEvent(ItemTooltipEvent event) { */ if (currentBlock == ObjHandler.relay) { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxoutrate_tooltip") + EnumChatFormatting.BLUE - + " %d " - + rate, - Constants.RELAY_MK1_OUTPUT)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxoutrate_tooltip") + EnumChatFormatting.BLUE + + " %d " + + rate, + Constants.RELAY_MK1_OUTPUT)); event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE - + " %d " - + unit, - Constants.RELAY_MK1_MAX)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE + + " %d " + + unit, + Constants.RELAY_MK1_MAX)); } if (currentBlock == ObjHandler.relayMK2) { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxoutrate_tooltip") + EnumChatFormatting.BLUE - + " %d " - + rate, - Constants.RELAY_MK2_OUTPUT)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxoutrate_tooltip") + EnumChatFormatting.BLUE + + " %d " + + rate, + Constants.RELAY_MK2_OUTPUT)); event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE - + " %d " - + unit, - Constants.RELAY_MK2_MAX)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE + + " %d " + + unit, + Constants.RELAY_MK2_MAX)); } if (currentBlock == ObjHandler.relayMK3) { event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxoutrate_tooltip") + EnumChatFormatting.BLUE - + " %d " - + rate, - Constants.RELAY_MK3_OUTPUT)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxoutrate_tooltip") + EnumChatFormatting.BLUE + + " %d " + + rate, + Constants.RELAY_MK3_OUTPUT)); event.toolTip.add( - EnumChatFormatting.DARK_PURPLE + String.format( - StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE - + " %d " - + unit, - Constants.RELAY_MK3_MAX)); + EnumChatFormatting.DARK_PURPLE + String.format( + StatCollector.translateToLocal("pe.emc.maxstorage_tooltip") + EnumChatFormatting.BLUE + + " %d " + + unit, + Constants.RELAY_MK3_MAX)); } } @@ -246,11 +245,11 @@ public void tTipEvent(ItemTooltipEvent event) { if (current.stackTagCompound.getDouble("EMC") > 0) { event.toolTip.add( - EnumChatFormatting.YELLOW + String.format( - StatCollector.translateToLocal("pe.emc.storedemc_tooltip") + " " - + EnumChatFormatting.RESET - + "%,d", - (int) current.stackTagCompound.getDouble("EMC"))); + EnumChatFormatting.YELLOW + String.format( + StatCollector.translateToLocal("pe.emc.storedemc_tooltip") + " " + + EnumChatFormatting.RESET + + "%,d", + (int) current.stackTagCompound.getDouble("EMC"))); } } if (current.getItem() instanceof IItemEmc || current.stackTagCompound.hasKey("StoredEMC")) { @@ -262,17 +261,19 @@ public void tTipEvent(ItemTooltipEvent event) { } event.toolTip.add( - EnumChatFormatting.YELLOW + StatCollector.translateToLocal("pe.emc.storedemc_tooltip") - + " " - + EnumChatFormatting.RESET - + Constants.EMC_FORMATTER.format(value)); + EnumChatFormatting.YELLOW + StatCollector.translateToLocal("pe.emc.storedemc_tooltip") + + " " + + EnumChatFormatting.RESET + + Constants.EMC_FORMATTER.format(value)); } if (current.stackTagCompound.hasKey("StoredXP")) { - event.toolTip.add( - String.format( + event.toolTip + .add( + String + .format( EnumChatFormatting.DARK_GREEN + StatCollector.translateToLocal( - "pe.misc.storedxp_tooltip") + " " + EnumChatFormatting.GREEN + "%,d", + "pe.misc.storedxp_tooltip") + " " + EnumChatFormatting.GREEN + "%,d", current.stackTagCompound.getInteger("StoredXP"))); } } diff --git a/src/main/java/moze_intel/projecte/events/TransmutationRenderingEvent.java b/src/main/java/moze_intel/projecte/events/TransmutationRenderingEvent.java index 14218c178..43f726e2c 100644 --- a/src/main/java/moze_intel/projecte/events/TransmutationRenderingEvent.java +++ b/src/main/java/moze_intel/projecte/events/TransmutationRenderingEvent.java @@ -2,12 +2,6 @@ import java.util.List; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.items.ItemMode; -import moze_intel.projecte.utils.MetaBlock; -import moze_intel.projecte.utils.WorldTransmutations; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; @@ -31,6 +25,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.items.ItemMode; +import moze_intel.projecte.utils.MetaBlock; +import moze_intel.projecte.utils.WorldTransmutations; @SideOnly(Side.CLIENT) public class TransmutationRenderingEvent { @@ -46,7 +45,8 @@ public class TransmutationRenderingEvent { public void preDrawHud(RenderGameOverlayEvent.Pre event) { if (event.type == ElementType.CROSSHAIRS) { if (transmutationResult != null) { - RenderItem.getInstance().renderItemIntoGUI( + RenderItem.getInstance() + .renderItemIntoGUI( mc.fontRenderer, mc.getTextureManager(), transmutationResult.toItemStack(), @@ -118,9 +118,9 @@ public void onOverlay(DrawBlockHighlightEvent event) { } case 2: { String dir = Direction.directions[MathHelper - .floor_double((double) ((player.rotationYaw * 4F) / 360F) + 0.5D) & 3]; + .floor_double((double) ((player.rotationYaw * 4F) / 360F) + 0.5D) & 3]; int side = orientation.offsetX != 0 ? 0 - : orientation.offsetZ != 0 ? 1 : dir.equals("NORTH") || dir.equals("SOUTH") ? 0 : 1; + : orientation.offsetZ != 0 ? 1 : dir.equals("NORTH") || dir.equals("SOUTH") ? 0 : 1; if (side == 0) { for (int z = mop.blockZ - charge; z <= mop.blockZ + charge; z++) { @@ -215,7 +215,7 @@ private void drawAll() { private void addBlockToRenderList(World world, MetaBlock current, int x, int y, int z) { if (new MetaBlock(world, x, y, z).equals(current)) { AxisAlignedBB box = AxisAlignedBB - .getBoundingBox(x - 0.02f, y - 0.02f, z - 0.02f, x + 1.02f, y + 1.02f, z + 1.02f); + .getBoundingBox(x - 0.02f, y - 0.02f, z - 0.02f, x + 1.02f, y + 1.02f, z + 1.02f); box = box.offset(-playerX, -playerY, -playerZ); renderList.add(box); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/CreativeTab.java b/src/main/java/moze_intel/projecte/gameObjs/CreativeTab.java index ced3339d8..f4a4a6d9d 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/CreativeTab.java +++ b/src/main/java/moze_intel/projecte/gameObjs/CreativeTab.java @@ -1,12 +1,11 @@ package moze_intel.projecte.gameObjs; -import moze_intel.projecte.PECore; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; public class CreativeTab extends CreativeTabs { diff --git a/src/main/java/moze_intel/projecte/gameObjs/ObjHandler.java b/src/main/java/moze_intel/projecte/gameObjs/ObjHandler.java index 69175cbb3..624b89130 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/ObjHandler.java +++ b/src/main/java/moze_intel/projecte/gameObjs/ObjHandler.java @@ -3,6 +3,21 @@ import java.util.HashMap; import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.RecipeSorter.Category; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import moze_intel.projecte.PECore; import moze_intel.projecte.config.ProjectEConfig; import moze_intel.projecte.gameObjs.blocks.AlchemicalChest; @@ -120,22 +135,6 @@ import moze_intel.projecte.utils.Constants; import moze_intel.projecte.utils.EnumArmorType; -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - public class ObjHandler { public static final CreativeTabs cTab = new CreativeTab(); @@ -349,27 +348,25 @@ public static void register() { // Tile Entities GameRegistry.registerTileEntityWithAlternatives(AlchChestTile.class, "AlchChestTile", "Alchemical Chest Tile"); - GameRegistry.registerTileEntityWithAlternatives( - InterdictionTile.class, - "InterdictionTile", - "Interdiction Torch Tile"); + GameRegistry + .registerTileEntityWithAlternatives(InterdictionTile.class, "InterdictionTile", "Interdiction Torch Tile"); GameRegistry.registerTileEntityWithAlternatives(CondenserTile.class, "CondenserTile", "Condenser Tile"); GameRegistry - .registerTileEntityWithAlternatives(CondenserMK2Tile.class, "CondenserMK2Tile", "Condenser MK2 Tile"); + .registerTileEntityWithAlternatives(CondenserMK2Tile.class, "CondenserMK2Tile", "Condenser MK2 Tile"); GameRegistry.registerTileEntityWithAlternatives(RMFurnaceTile.class, "RMFurnaceTile", "RM Furnace Tile"); GameRegistry.registerTileEntityWithAlternatives(DMFurnaceTile.class, "DMFurnaceTile", "DM Furnace Tile"); GameRegistry.registerTileEntityWithAlternatives( - CollectorMK1Tile.class, - "CollectorMK1Tile", - "Energy Collector MK1 Tile"); + CollectorMK1Tile.class, + "CollectorMK1Tile", + "Energy Collector MK1 Tile"); GameRegistry.registerTileEntityWithAlternatives( - CollectorMK2Tile.class, - "CollectorMK2Tile", - "Energy Collector MK2 Tile"); + CollectorMK2Tile.class, + "CollectorMK2Tile", + "Energy Collector MK2 Tile"); GameRegistry.registerTileEntityWithAlternatives( - CollectorMK3Tile.class, - "CollectorMK3Tile", - "Energy Collector MK3 Tile"); + CollectorMK3Tile.class, + "CollectorMK3Tile", + "Energy Collector MK3 Tile"); GameRegistry.registerTileEntityWithAlternatives(RelayMK1Tile.class, "RelayMK1Tile", "AM Relay MK1 Tile"); GameRegistry.registerTileEntityWithAlternatives(RelayMK2Tile.class, "RelayMK2Tile", "AM Relay MK2 Tile"); GameRegistry.registerTileEntityWithAlternatives(RelayMK3Tile.class, "RelayMK3Tile", "AM Relay MK3 Tile"); @@ -377,40 +374,28 @@ public static void register() { // Entities EntityRegistry - .registerModEntity(EntityWaterProjectile.class, "WaterProjectile", 1, PECore.instance, 256, 10, true); + .registerModEntity(EntityWaterProjectile.class, "WaterProjectile", 1, PECore.instance, 256, 10, true); EntityRegistry - .registerModEntity(EntityLavaProjectile.class, "LavaProjectile", 2, PECore.instance, 256, 10, true); + .registerModEntity(EntityLavaProjectile.class, "LavaProjectile", 2, PECore.instance, 256, 10, true); EntityRegistry.registerModEntity(EntityLootBall.class, "LootBall", 3, PECore.instance, 64, 10, true); EntityRegistry.registerModEntity(EntityMobRandomizer.class, "MobRandomizer", 4, PECore.instance, 256, 10, true); EntityRegistry - .registerModEntity(EntityLensProjectile.class, "LensProjectile", 5, PECore.instance, 256, 10, true); - EntityRegistry.registerModEntity( - EntityNovaCatalystPrimed.class, - "NovaCatalystPrimed", - 6, - PECore.instance, - 256, - 10, - true); + .registerModEntity(EntityLensProjectile.class, "LensProjectile", 5, PECore.instance, 256, 10, true); + EntityRegistry + .registerModEntity(EntityNovaCatalystPrimed.class, "NovaCatalystPrimed", 6, PECore.instance, 256, 10, true); EntityRegistry.registerModEntity( - EntityNovaCataclysmPrimed.class, - "NovaCataclysmPrimed", - 7, - PECore.instance, - 256, - 10, - true); + EntityNovaCataclysmPrimed.class, + "NovaCataclysmPrimed", + 7, + PECore.instance, + 256, + 10, + true); EntityRegistry.registerModEntity(EntityHomingArrow.class, "HomingArrow", 8, PECore.instance, 256, 10, true); EntityRegistry - .registerModEntity(EntityFireProjectile.class, "FireProjectile", 9, PECore.instance, 256, 10, true); - EntityRegistry.registerModEntity( - EntitySWRGProjectile.class, - "LightningProjectile", - 10, - PECore.instance, - 256, - 10, - true); + .registerModEntity(EntityFireProjectile.class, "FireProjectile", 9, PECore.instance, 256, 10, true); + EntityRegistry + .registerModEntity(EntitySWRGProjectile.class, "LightningProjectile", 10, PECore.instance, 256, 10, true); } public static void addRecipes() { @@ -425,175 +410,161 @@ public static void addRecipes() { // Shaped Recipes // Philos Stone GameRegistry.addRecipe( - new ItemStack(philosStone), - "RGR", - "GDG", - "RGR", - 'R', - Items.redstone, - 'G', - Items.glowstone_dust, - 'D', - diamondReplacement); + new ItemStack(philosStone), + "RGR", + "GDG", + "RGR", + 'R', + Items.redstone, + 'G', + Items.glowstone_dust, + 'D', + diamondReplacement); GameRegistry.addRecipe( - new ItemStack(philosStone), - "GRG", - "RDR", - "GRG", - 'R', - Items.redstone, - 'G', - Items.glowstone_dust, - 'D', - diamondReplacement); + new ItemStack(philosStone), + "GRG", + "RDR", + "GRG", + 'R', + Items.redstone, + 'G', + Items.glowstone_dust, + 'D', + diamondReplacement); // Interdiction torch GameRegistry.addRecipe( - new ItemStack(confuseTorch, 2), - "RDR", - "DPD", - "GGG", - 'R', - Blocks.redstone_torch, - 'G', - Items.glowstone_dust, - 'D', - Items.diamond, - 'P', - philosStone); + new ItemStack(confuseTorch, 2), + "RDR", + "DPD", + "GGG", + 'R', + Blocks.redstone_torch, + 'G', + Items.glowstone_dust, + 'D', + Items.diamond, + 'P', + philosStone); // Repair Talisman GameRegistry.addRecipe( - new ItemStack(repairTalisman), - "LMH", - "SPS", - "HML", - 'P', - Items.paper, - 'S', - Items.string, - 'L', - new ItemStack(covalence, 1, 0), - 'M', - new ItemStack(covalence, 1, 1), - 'H', - new ItemStack(covalence, 1, 2)); + new ItemStack(repairTalisman), + "LMH", + "SPS", + "HML", + 'P', + Items.paper, + 'S', + Items.string, + 'L', + new ItemStack(covalence, 1, 0), + 'M', + new ItemStack(covalence, 1, 1), + 'H', + new ItemStack(covalence, 1, 2)); // Klein Star Ein GameRegistry.addRecipe( - new ItemStack(kleinStars, 1, 0), - "MMM", - "MDM", - "MMM", - 'M', - new ItemStack(fuels, 1, 1), - 'D', - Items.diamond); + new ItemStack(kleinStars, 1, 0), + "MMM", + "MDM", + "MMM", + 'M', + new ItemStack(fuels, 1, 1), + 'D', + Items.diamond); // Matter GameRegistry.addRecipe( - new ItemStack(matter, 1, 0), - "AAA", - "ADA", - "AAA", - 'D', - Blocks.diamond_block, - 'A', - new ItemStack(fuels, 1, 2)); - GameRegistry.addRecipe( - new ItemStack(matter, 1, 1), - "AAA", - "DDD", - "AAA", - 'D', - matter, - 'A', - new ItemStack(fuels, 1, 2)); - GameRegistry.addRecipe( - new ItemStack(matter, 1, 1), - "ADA", - "ADA", - "ADA", - 'D', - matter, - 'A', - new ItemStack(fuels, 1, 2)); + new ItemStack(matter, 1, 0), + "AAA", + "ADA", + "AAA", + 'D', + Blocks.diamond_block, + 'A', + new ItemStack(fuels, 1, 2)); + GameRegistry + .addRecipe(new ItemStack(matter, 1, 1), "AAA", "DDD", "AAA", 'D', matter, 'A', new ItemStack(fuels, 1, 2)); + GameRegistry + .addRecipe(new ItemStack(matter, 1, 1), "ADA", "ADA", "ADA", 'D', matter, 'A', new ItemStack(fuels, 1, 2)); // Alchemical Chest GameRegistry.addRecipe( - new ItemStack(alchChest), - "LMH", - "SDS", - "ICI", - 'D', - diamondReplacement, - 'L', - new ItemStack(covalence, 1, 0), - 'M', - new ItemStack(covalence, 1, 1), - 'H', - new ItemStack(covalence, 1, 2), - 'S', - Blocks.stone, - 'I', - Items.iron_ingot, - 'C', - Blocks.chest); + new ItemStack(alchChest), + "LMH", + "SDS", + "ICI", + 'D', + diamondReplacement, + 'L', + new ItemStack(covalence, 1, 0), + 'M', + new ItemStack(covalence, 1, 1), + 'H', + new ItemStack(covalence, 1, 2), + 'S', + Blocks.stone, + 'I', + Items.iron_ingot, + 'C', + Blocks.chest); // Alchemical Bags for (int i = 0; i < 16; i++) { GameRegistry.addRecipe( - new ItemStack(alchBag, 1, i), - "CCC", - "WAW", - "WWW", - 'C', - new ItemStack(covalence, 1, 2), - 'A', - alchChest, - 'W', - new ItemStack(Blocks.wool, 1, i)); + new ItemStack(alchBag, 1, i), + "CCC", + "WAW", + "WWW", + 'C', + new ItemStack(covalence, 1, 2), + 'A', + alchChest, + 'W', + new ItemStack(Blocks.wool, 1, i)); } // Condenser GameRegistry.addRecipe( - new ItemStack(condenser), - "ODO", - "DCD", - "ODO", - 'D', - Items.diamond, - 'O', - new ItemStack(Blocks.obsidian), - 'C', - new ItemStack(alchChest)); + new ItemStack(condenser), + "ODO", + "DCD", + "ODO", + 'D', + Items.diamond, + 'O', + new ItemStack(Blocks.obsidian), + 'C', + new ItemStack(alchChest)); // Condenser MK2 GameRegistry.addRecipe( - new ItemStack(condenserMk2), - "RDR", - "DCD", - "RDR", - 'D', - new ItemStack(matterBlock, 1, 0), - 'R', - new ItemStack(matterBlock, 1, 1), - 'C', - condenser); + new ItemStack(condenserMk2), + "RDR", + "DCD", + "RDR", + 'D', + new ItemStack(matterBlock, 1, 0), + 'R', + new ItemStack(matterBlock, 1, 1), + 'C', + condenser); // Transmutation Table GameRegistry.addRecipe( - new ItemStack(transmuteStone), - "OSO", - "SPS", - "OSO", - 'S', - Blocks.stone, - 'O', - Blocks.obsidian, - 'P', - philosStone); + new ItemStack(transmuteStone), + "OSO", + "SPS", + "OSO", + 'S', + Blocks.stone, + 'O', + Blocks.obsidian, + 'P', + philosStone); // Matter Blocks GameRegistry.addRecipe(new ItemStack(matterBlock, 1, 0), "DD", "DD", 'D', matter); @@ -601,96 +572,96 @@ public static void addRecipes() { // Matter Furnaces GameRegistry.addRecipe( - new ItemStack(dmFurnaceOff), - "DDD", - "DFD", - "DDD", - 'D', - new ItemStack(matterBlock, 1, 0), - 'F', - Blocks.furnace); + new ItemStack(dmFurnaceOff), + "DDD", + "DFD", + "DDD", + 'D', + new ItemStack(matterBlock, 1, 0), + 'F', + Blocks.furnace); GameRegistry.addRecipe( - new ItemStack(rmFurnaceOff), - "XRX", - "RFR", - 'R', - new ItemStack(matterBlock, 1, 1), - 'F', - dmFurnaceOff); + new ItemStack(rmFurnaceOff), + "XRX", + "RFR", + 'R', + new ItemStack(matterBlock, 1, 1), + 'F', + dmFurnaceOff); // DM Pedestal GameRegistry.addRecipe( - new ItemStack(dmPedestal), - "RDR", - "RDR", - "DDD", - 'R', - new ItemStack(matter, 1, 1), - 'D', - new ItemStack(matterBlock, 1, 0)); + new ItemStack(dmPedestal), + "RDR", + "RDR", + "DDD", + 'R', + new ItemStack(matter, 1, 1), + 'D', + new ItemStack(matterBlock, 1, 0)); // Collectors GameRegistry.addRecipe( - new ItemStack(energyCollector), - "GTG", - "GDG", - "GFG", - 'G', - Blocks.glowstone, - 'F', - Blocks.furnace, - 'D', - diamondBlockReplacement, - 'T', - Blocks.glass); + new ItemStack(energyCollector), + "GTG", + "GDG", + "GFG", + 'G', + Blocks.glowstone, + 'F', + Blocks.furnace, + 'D', + diamondBlockReplacement, + 'T', + Blocks.glass); GameRegistry.addRecipe( - new ItemStack(collectorMK2), - "GDG", - "GCG", - "GGG", - 'G', - Blocks.glowstone, - 'C', - energyCollector, - 'D', - matter); + new ItemStack(collectorMK2), + "GDG", + "GCG", + "GGG", + 'G', + Blocks.glowstone, + 'C', + energyCollector, + 'D', + matter); GameRegistry.addRecipe( - new ItemStack(collectorMK3), - "GRG", - "GCG", - "GGG", - 'G', - Blocks.glowstone, - 'C', - collectorMK2, - 'R', - new ItemStack(matter, 1, 1)); + new ItemStack(collectorMK3), + "GRG", + "GCG", + "GGG", + 'G', + Blocks.glowstone, + 'C', + collectorMK2, + 'R', + new ItemStack(matter, 1, 1)); // AM Relays GameRegistry.addRecipe( - new ItemStack(relay), - "OSO", - "ODO", - "OOO", - 'S', - Blocks.glass, - 'D', - Blocks.diamond_block, - 'O', - Blocks.obsidian); + new ItemStack(relay), + "OSO", + "ODO", + "OOO", + 'S', + Blocks.glass, + 'D', + Blocks.diamond_block, + 'O', + Blocks.obsidian); GameRegistry - .addRecipe(new ItemStack(relayMK2), "ODO", "OAO", "OOO", 'A', relay, 'D', matter, 'O', Blocks.obsidian); + .addRecipe(new ItemStack(relayMK2), "ODO", "OAO", "OOO", 'A', relay, 'D', matter, 'O', Blocks.obsidian); GameRegistry.addRecipe( - new ItemStack(relayMK3), - "ORO", - "OAO", - "OOO", - 'A', - relayMK2, - 'R', - new ItemStack(matter, 1, 1), - 'O', - Blocks.obsidian); + new ItemStack(relayMK3), + "ORO", + "OAO", + "OOO", + 'A', + relayMK2, + 'R', + new ItemStack(matter, 1, 1), + 'O', + Blocks.obsidian); // DM Tools GameRegistry.addRecipe(new ItemStack(dmPick), "MMM", "XDX", "XDX", 'D', Items.diamond, 'M', matter); @@ -703,91 +674,91 @@ public static void addRecipes() { // RM Tools GameRegistry.addRecipe( - new ItemStack(rmPick), - "RRR", - "XPX", - "XMX", - 'R', - new ItemStack(matter, 1, 1), - 'P', - dmPick, - 'M', - matter); + new ItemStack(rmPick), + "RRR", + "XPX", + "XMX", + 'R', + new ItemStack(matter, 1, 1), + 'P', + dmPick, + 'M', + matter); GameRegistry.addRecipe( - new ItemStack(rmAxe), - "RRX", - "RAX", - "XMX", - 'R', - new ItemStack(matter, 1, 1), - 'A', - dmAxe, - 'M', - matter); + new ItemStack(rmAxe), + "RRX", + "RAX", + "XMX", + 'R', + new ItemStack(matter, 1, 1), + 'A', + dmAxe, + 'M', + matter); GameRegistry.addRecipe( - new ItemStack(rmShovel), - "XRX", - "XSX", - "XMX", - 'R', - new ItemStack(matter, 1, 1), - 'S', - dmShovel, - 'M', - matter); + new ItemStack(rmShovel), + "XRX", + "XSX", + "XMX", + 'R', + new ItemStack(matter, 1, 1), + 'S', + dmShovel, + 'M', + matter); GameRegistry - .addRecipe(new ItemStack(rmSword), "XRX", "XRX", "XSX", 'R', new ItemStack(matter, 1, 1), 'S', dmSword); + .addRecipe(new ItemStack(rmSword), "XRX", "XRX", "XSX", 'R', new ItemStack(matter, 1, 1), 'S', dmSword); GameRegistry.addRecipe( - new ItemStack(rmHoe), - "RRX", - "XHX", - "XMX", - 'R', - new ItemStack(matter, 1, 1), - 'H', - dmHoe, - 'M', - matter); + new ItemStack(rmHoe), + "RRX", + "XHX", + "XMX", + 'R', + new ItemStack(matter, 1, 1), + 'H', + dmHoe, + 'M', + matter); GameRegistry.addRecipe(new ItemStack(rmShears), "XR", "SX", 'R', new ItemStack(matter, 1, 1), 'S', dmShears); GameRegistry.addRecipe( - new ItemStack(rmHammer), - "RMR", - "XHX", - "XMX", - 'R', - new ItemStack(matter, 1, 1), - 'H', - dmHammer, - 'M', - matter); + new ItemStack(rmHammer), + "RMR", + "XHX", + "XMX", + 'R', + new ItemStack(matter, 1, 1), + 'H', + dmHammer, + 'M', + matter); GameRegistry.addRecipe( - new ItemStack(rmKatar), - "123", - "4RR", - "RRR", - '1', - rmShears, - '2', - rmAxe, - '3', - rmSword, - '4', - rmHoe, - 'R', - new ItemStack(matter, 1, 1)); + new ItemStack(rmKatar), + "123", + "4RR", + "RRR", + '1', + rmShears, + '2', + rmAxe, + '3', + rmSword, + '4', + rmHoe, + 'R', + new ItemStack(matter, 1, 1)); GameRegistry.addRecipe( - new ItemStack(rmStar), - "123", - "RRR", - "RRR", - '1', - rmHammer, - '2', - rmPick, - '3', - rmShovel, - 'R', - new ItemStack(matter, 1, 1)); + new ItemStack(rmStar), + "123", + "RRR", + "RRR", + '1', + rmHammer, + '2', + rmPick, + '3', + rmShovel, + 'R', + new ItemStack(matter, 1, 1)); // Armor GameRegistry.addRecipe(new ItemStack(dmHelmet), "MMM", "MXM", 'M', matter); @@ -797,231 +768,204 @@ public static void addRecipes() { GameRegistry.addRecipe(new ItemStack(rmHelmet), "MMM", "MDM", 'M', new ItemStack(matter, 1, 1), 'D', dmHelmet); GameRegistry - .addRecipe(new ItemStack(rmChest), "MDM", "MMM", "MMM", 'M', new ItemStack(matter, 1, 1), 'D', dmChest); + .addRecipe(new ItemStack(rmChest), "MDM", "MMM", "MMM", 'M', new ItemStack(matter, 1, 1), 'D', dmChest); GameRegistry - .addRecipe(new ItemStack(rmLegs), "MMM", "MDM", "MXM", 'M', new ItemStack(matter, 1, 1), 'D', dmLegs); + .addRecipe(new ItemStack(rmLegs), "MMM", "MDM", "MXM", 'M', new ItemStack(matter, 1, 1), 'D', dmLegs); GameRegistry.addRecipe(new ItemStack(rmFeet), "MDM", "MXM", 'M', new ItemStack(matter, 1, 1), 'D', dmFeet); // Rings GameRegistry - .addRecipe(new ItemStack(ironBand), "III", "ILI", "III", 'I', Items.iron_ingot, 'L', Items.lava_bucket); + .addRecipe(new ItemStack(ironBand), "III", "ILI", "III", 'I', Items.iron_ingot, 'L', Items.lava_bucket); GameRegistry.addRecipe(new ItemStack(ironBand), "III", "ILI", "III", 'I', Items.iron_ingot, 'L', volcanite); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(harvestGod), - "SFS", - "DID", - "SFS", - 'I', - ironBand, - 'S', - "treeSapling", - 'F', - Blocks.red_flower, - 'F', - Blocks.red_flower, - 'D', - matter)); - GameRegistry - .addRecipe(new ItemStack(swrg), "DFD", "FIF", "DFD", 'I', ironBand, 'F', Items.feather, 'D', matter); - GameRegistry.addRecipe( - new ItemStack(ignition), - "FMF", + new ShapedOreRecipe( + new ItemStack(harvestGod), + "SFS", "DID", - "FMF", + "SFS", 'I', ironBand, + 'S', + "treeSapling", 'F', - new ItemStack(Items.flint_and_steel, 1, OreDictionary.WILDCARD_VALUE), + Blocks.red_flower, + 'F', + Blocks.red_flower, 'D', - matter, - 'M', - new ItemStack(fuels, 1, 1)); + matter)); + GameRegistry + .addRecipe(new ItemStack(swrg), "DFD", "FIF", "DFD", 'I', ironBand, 'F', Items.feather, 'D', matter); GameRegistry.addRecipe( - new ItemStack(bodyStone), - "SSS", - "RLR", - "SSS", - 'R', - new ItemStack(matter, 1, 1), - 'S', - Items.sugar, - 'L', - new ItemStack(Items.dye, 1, 4)); + new ItemStack(ignition), + "FMF", + "DID", + "FMF", + 'I', + ironBand, + 'F', + new ItemStack(Items.flint_and_steel, 1, OreDictionary.WILDCARD_VALUE), + 'D', + matter, + 'M', + new ItemStack(fuels, 1, 1)); GameRegistry.addRecipe( - new ItemStack(soulStone), - "GGG", - "RLR", - "GGG", - 'R', - new ItemStack(matter, 1, 1), - 'G', - Items.glowstone_dust, - 'L', - new ItemStack(Items.dye, 1, 4)); + new ItemStack(bodyStone), + "SSS", + "RLR", + "SSS", + 'R', + new ItemStack(matter, 1, 1), + 'S', + Items.sugar, + 'L', + new ItemStack(Items.dye, 1, 4)); GameRegistry.addRecipe( - new ItemStack(mindStone), - "BBB", - "RLR", - "BBB", - 'R', - new ItemStack(matter, 1, 1), - 'B', - Items.book, - 'L', - new ItemStack(Items.dye, 1, 4)); + new ItemStack(soulStone), + "GGG", + "RLR", + "GGG", + 'R', + new ItemStack(matter, 1, 1), + 'G', + Items.glowstone_dust, + 'L', + new ItemStack(Items.dye, 1, 4)); GameRegistry.addRecipe( - new ItemStack(blackHole), - "SSS", - "DID", - "SSS", - 'I', - ironBand, - 'S', - Items.string, - 'D', - matter); + new ItemStack(mindStone), + "BBB", + "RLR", + "BBB", + 'R', + new ItemStack(matter, 1, 1), + 'B', + Items.book, + 'L', + new ItemStack(Items.dye, 1, 4)); + GameRegistry + .addRecipe(new ItemStack(blackHole), "SSS", "DID", "SSS", 'I', ironBand, 'S', Items.string, 'D', matter); GameRegistry.addRecipe(new ItemStack(everTide), "WWW", "DDD", "WWW", 'W', Items.water_bucket, 'D', matter); GameRegistry.addRecipe(new ItemStack(volcanite), "LLL", "DDD", "LLL", 'L', Items.lava_bucket, 'D', matter); GameRegistry.addRecipe( - new ItemStack(eternalDensity), - "DOD", - "MDM", - "DOD", - 'D', - Items.diamond, - 'O', - Blocks.obsidian, - 'M', - matter); + new ItemStack(eternalDensity), + "DOD", + "MDM", + "DOD", + 'D', + Items.diamond, + 'O', + Blocks.obsidian, + 'M', + matter); GameRegistry.addRecipe( - new ItemStack(zero), - "SBS", - "MIM", - "SBS", - 'S', - Blocks.snow, - 'B', - Items.snowball, - 'M', - matter, - 'I', - ironBand); + new ItemStack(zero), + "SBS", + "MIM", + "SBS", + 'S', + Blocks.snow, + 'B', + Items.snowball, + 'M', + matter, + 'I', + ironBand); GameRegistry.addShapelessRecipe( - new ItemStack(voidRing), - blackHole, - eternalDensity, - new ItemStack(matter, 1, 1), - new ItemStack(matter, 1, 1)); + new ItemStack(voidRing), + blackHole, + eternalDensity, + new ItemStack(matter, 1, 1), + new ItemStack(matter, 1, 1)); GameRegistry.addRecipe( - new ItemStack(arcana), - "ZIH", - "SMM", - "MMM", - 'Z', - zero, - 'I', - ignition, - 'H', - harvestGod, - 'S', - swrg, - 'M', - new ItemStack(matter, 1, 1)); + new ItemStack(arcana), + "ZIH", + "SMM", + "MMM", + 'Z', + zero, + 'I', + ignition, + 'H', + harvestGod, + 'S', + swrg, + 'M', + new ItemStack(matter, 1, 1)); GameRegistry.addRecipe( - new ItemStack(angelSmite), - "BFB", - "MIM", - "BFB", - 'B', - Items.bow, - 'F', - Items.feather, - 'M', - matter, - 'I', - ironBand); + new ItemStack(angelSmite), + "BFB", + "MIM", + "BFB", + 'B', + Items.bow, + 'F', + Items.feather, + 'M', + matter, + 'I', + ironBand); // Watch of flowing time GameRegistry.addRecipe( - new ItemStack(timeWatch), - "DOD", - "GCG", - "DOD", - 'D', - matter, - 'O', - Blocks.obsidian, - 'G', - Blocks.glowstone, - 'C', - Items.clock); + new ItemStack(timeWatch), + "DOD", + "GCG", + "DOD", + 'D', + matter, + 'O', + Blocks.obsidian, + 'G', + Blocks.glowstone, + 'C', + Items.clock); GameRegistry.addRecipe( - new ItemStack(timeWatch), - "DGD", - "OCO", - "DGD", - 'D', - matter, - 'O', - Blocks.obsidian, - 'G', - Blocks.glowstone, - 'C', - Items.clock); + new ItemStack(timeWatch), + "DGD", + "OCO", + "DGD", + 'D', + matter, + 'O', + Blocks.obsidian, + 'G', + Blocks.glowstone, + 'C', + Items.clock); // Divining rods GameRegistry.addRecipe(new ItemStack(dRod1), "DDD", "DSD", "DDD", 'D', covalence, 'S', Items.stick); GameRegistry - .addRecipe(new ItemStack(dRod2), "DDD", "DSD", "DDD", 'D', new ItemStack(covalence, 1, 1), 'S', dRod1); + .addRecipe(new ItemStack(dRod2), "DDD", "DSD", "DDD", 'D', new ItemStack(covalence, 1, 1), 'S', dRod1); GameRegistry - .addRecipe(new ItemStack(dRod3), "DDD", "DSD", "DDD", 'D', new ItemStack(covalence, 1, 2), 'S', dRod2); + .addRecipe(new ItemStack(dRod3), "DDD", "DSD", "DDD", 'D', new ItemStack(covalence, 1, 2), 'S', dRod2); // Explosive items GameRegistry.addRecipe( - new ItemStack(dCatalyst), - "NMN", - "MFM", - "NMN", - 'N', - novaCatalyst, - 'M', - new ItemStack(fuels, 1, 1), - 'F', - new ItemStack(Items.flint_and_steel, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe( - new ItemStack(hyperLens), - "DDD", - "MNM", - "DDD", - 'N', - novaCatalyst, - 'M', - matter, - 'D', - Items.diamond); - GameRegistry.addRecipe( - new ItemStack(cataliticLens), - "MMM", - "HMD", - "MMM", - 'M', - matter, - 'H', - hyperLens, - 'D', - dCatalyst); + new ItemStack(dCatalyst), + "NMN", + "MFM", + "NMN", + 'N', + novaCatalyst, + 'M', + new ItemStack(fuels, 1, 1), + 'F', + new ItemStack(Items.flint_and_steel, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addRecipe( - new ItemStack(cataliticLens), - "MMM", - "DMH", - "MMM", - 'M', - matter, - 'H', - hyperLens, - 'D', - dCatalyst); + new ItemStack(hyperLens), + "DDD", + "MNM", + "DDD", + 'N', + novaCatalyst, + 'M', + matter, + 'D', + Items.diamond); + GameRegistry + .addRecipe(new ItemStack(cataliticLens), "MMM", "HMD", "MMM", 'M', matter, 'H', hyperLens, 'D', dCatalyst); + GameRegistry + .addRecipe(new ItemStack(cataliticLens), "MMM", "DMH", "MMM", 'M', matter, 'H', hyperLens, 'D', dCatalyst); // Fuel Blocks GameRegistry.addRecipe(new ItemStack(fuelBlock, 1, 0), "FFF", "FFF", "FFF", 'F', fuels); @@ -1031,20 +975,20 @@ public static void addRecipes() { // Tome if (ProjectEConfig.craftableTome) { GameRegistry.addRecipe( - new ItemStack(tome), - "HML", - "KBK", - "LMH", - 'L', - new ItemStack(covalence, 1, 0), - 'M', - new ItemStack(covalence, 1, 1), - 'H', - new ItemStack(covalence, 1, 2), - 'B', - Items.book, - 'K', - new ItemStack(kleinStars, 1, 5)); + new ItemStack(tome), + "HML", + "KBK", + "LMH", + 'L', + new ItemStack(covalence, 1, 0), + 'M', + new ItemStack(covalence, 1, 1), + 'H', + new ItemStack(covalence, 1, 2), + 'B', + Items.book, + 'K', + new ItemStack(kleinStars, 1, 5)); } // Manual @@ -1054,100 +998,100 @@ public static void addRecipes() { // TransmutationTablet GameRegistry.addRecipe( - new ItemStack(transmutationTablet), - "DSD", - "STS", - "DSD", - 'D', - new ItemStack(matterBlock, 1, 0), - 'S', - Blocks.stone, - 'T', - transmuteStone); + new ItemStack(transmutationTablet), + "DSD", + "STS", + "DSD", + 'D', + new ItemStack(matterBlock, 1, 0), + 'S', + Blocks.stone, + 'T', + transmuteStone); // Mercurial Eye GameRegistry.addRecipe( - new ItemStack(mercEye), - "OBO", - "BRB", - "BDB", - 'O', - Blocks.obsidian, - 'B', - Blocks.brick_block, - 'R', - new ItemStack(matter, 1, 1), - 'D', - Items.diamond); + new ItemStack(mercEye), + "OBO", + "BRB", + "BDB", + 'O', + Blocks.obsidian, + 'B', + Blocks.brick_block, + 'R', + new ItemStack(matter, 1, 1), + 'D', + Items.diamond); // Shapeless Recipes // Philos Stone exchanges GameRegistry.addShapelessRecipe( - new ItemStack(Items.ender_pearl), - philosStone, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot); + new ItemStack(Items.ender_pearl), + philosStone, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot); GameRegistry.addShapelessRecipe(new ItemStack(Items.iron_ingot, 8), philosStone, Items.gold_ingot); GameRegistry.addShapelessRecipe( - new ItemStack(Items.gold_ingot), - philosStone, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot, - Items.iron_ingot); + new ItemStack(Items.gold_ingot), + philosStone, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot, + Items.iron_ingot); GameRegistry.addShapelessRecipe( - new ItemStack(Items.diamond), - philosStone, - Items.gold_ingot, - Items.gold_ingot, - Items.gold_ingot, - Items.gold_ingot); + new ItemStack(Items.diamond), + philosStone, + Items.gold_ingot, + Items.gold_ingot, + Items.gold_ingot, + Items.gold_ingot); GameRegistry.addShapelessRecipe(new ItemStack(Items.gold_ingot, 4), philosStone, Items.diamond); GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald), philosStone, Items.diamond, Items.diamond); GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 2), philosStone, Items.emerald); GameRegistry.addShapelessRecipe( - new ItemStack(fuels, 1, 0), - philosStone, - Items.coal, - Items.coal, - Items.coal, - Items.coal); + new ItemStack(fuels, 1, 0), + philosStone, + Items.coal, + Items.coal, + Items.coal, + Items.coal); GameRegistry.addShapelessRecipe(new ItemStack(Items.coal, 4), philosStone, new ItemStack(fuels, 1, 0)); GameRegistry.addShapelessRecipe( - new ItemStack(fuels, 1, 1), - philosStone, - new ItemStack(fuels, 1, 0), - new ItemStack(fuels, 1, 0), - new ItemStack(fuels, 1, 0), - new ItemStack(fuels, 1, 0)); + new ItemStack(fuels, 1, 1), + philosStone, + new ItemStack(fuels, 1, 0), + new ItemStack(fuels, 1, 0), + new ItemStack(fuels, 1, 0), + new ItemStack(fuels, 1, 0)); GameRegistry.addShapelessRecipe(new ItemStack(fuels, 4, 0), philosStone, new ItemStack(fuels, 1, 1)); GameRegistry.addShapelessRecipe( - new ItemStack(fuels, 1, 2), - philosStone, - new ItemStack(fuels, 1, 1), - new ItemStack(fuels, 1, 1), - new ItemStack(fuels, 1, 1), - new ItemStack(fuels, 1, 1)); + new ItemStack(fuels, 1, 2), + philosStone, + new ItemStack(fuels, 1, 1), + new ItemStack(fuels, 1, 1), + new ItemStack(fuels, 1, 1), + new ItemStack(fuels, 1, 1)); GameRegistry.addShapelessRecipe(new ItemStack(fuels, 4, 1), philosStone, new ItemStack(fuels, 1, 2)); // Covalence dust GameRegistry.addShapelessRecipe( - new ItemStack(covalence, 40, 0), - Blocks.cobblestone, - Blocks.cobblestone, - Blocks.cobblestone, - Blocks.cobblestone, - Blocks.cobblestone, - Blocks.cobblestone, - Blocks.cobblestone, - Blocks.cobblestone, - new ItemStack(Items.coal, 1, 1)); + new ItemStack(covalence, 40, 0), + Blocks.cobblestone, + Blocks.cobblestone, + Blocks.cobblestone, + Blocks.cobblestone, + Blocks.cobblestone, + Blocks.cobblestone, + Blocks.cobblestone, + Blocks.cobblestone, + new ItemStack(Items.coal, 1, 1)); GameRegistry.addShapelessRecipe(new ItemStack(covalence, 40, 1), Items.iron_ingot, Items.redstone); GameRegistry.addShapelessRecipe(new ItemStack(covalence, 40, 2), Items.diamond, Items.coal); @@ -1163,29 +1107,25 @@ public static void addRecipes() { GameRegistry.addShapelessRecipe(new ItemStack(novaCataclysm, 2), novaCatalyst, new ItemStack(fuels, 1, 2)); GameRegistry.addShapelessRecipe(new ItemStack(lifeStone), bodyStone, soulStone); GameRegistry.addShapelessRecipe( - new ItemStack(Blocks.ice), - new ItemStack(zero, 1, OreDictionary.WILDCARD_VALUE), - Items.water_bucket); + new ItemStack(Blocks.ice), + new ItemStack(zero, 1, OreDictionary.WILDCARD_VALUE), + Items.water_bucket); GameRegistry.addShapelessRecipe(new ItemStack(Items.lava_bucket), volcanite, Items.bucket, Items.redstone); GameRegistry.addShapelessRecipe( - new ItemStack(gemHelmet), - rmHelmet, - new ItemStack(kleinStars, 1, 5), - everTide, - soulStone); - GameRegistry.addShapelessRecipe( - new ItemStack(gemChest), - rmChest, - new ItemStack(kleinStars, 1, 5), - volcanite, - bodyStone); + new ItemStack(gemHelmet), + rmHelmet, + new ItemStack(kleinStars, 1, 5), + everTide, + soulStone); GameRegistry.addShapelessRecipe( - new ItemStack(gemLegs), - rmLegs, - new ItemStack(kleinStars, 1, 5), - blackHole, - timeWatch); + new ItemStack(gemChest), + rmChest, + new ItemStack(kleinStars, 1, 5), + volcanite, + bodyStone); + GameRegistry + .addShapelessRecipe(new ItemStack(gemLegs), rmLegs, new ItemStack(kleinStars, 1, 5), blackHole, timeWatch); GameRegistry.addShapelessRecipe(new ItemStack(gemFeet), rmFeet, new ItemStack(kleinStars, 1, 5), swrg, swrg); GameRegistry.addShapelessRecipe(new ItemStack(matter, 4, 0), matterBlock); @@ -1209,32 +1149,29 @@ public static void addRecipes() { // Custom Recipe managment for (int i = 1; i <= 15; i++) { GameRegistry.addRecipe( - new RecipeAlchemyBag( - new ItemStack(alchBag, 1, 15 - i), - new ItemStack(alchBag, 1, 0), - new ItemStack(Items.dye, 1, i))); + new RecipeAlchemyBag( + new ItemStack(alchBag, 1, 15 - i), + new ItemStack(alchBag, 1, 0), + new ItemStack(Items.dye, 1, i))); GameRegistry.addRecipe( - new RecipeAlchemyBag( - new ItemStack(alchBag, 1, 0), - new ItemStack(alchBag, 1, i), - new ItemStack(Items.dye, 1, 15))); + new RecipeAlchemyBag( + new ItemStack(alchBag, 1, 0), + new ItemStack(alchBag, 1, i), + new ItemStack(Items.dye, 1, 15))); } GameRegistry.addRecipe(new RecipesCovalenceRepair()); + RecipeSorter + .register("Alchemical Bags Recipes", RecipeAlchemyBag.class, Category.SHAPELESS, "before:minecraft:shaped"); RecipeSorter.register( - "Alchemical Bags Recipes", - RecipeAlchemyBag.class, - Category.SHAPELESS, - "before:minecraft:shaped"); - RecipeSorter.register( - "Covalence Repair Recipes", - RecipesCovalenceRepair.class, - Category.SHAPELESS, - "before:minecraft:shaped"); + "Covalence Repair Recipes", + RecipesCovalenceRepair.class, + Category.SHAPELESS, + "before:minecraft:shaped"); RecipeSorter.register( - "", - RecipeShapedKleinStar.class, - Category.SHAPED, - "after:minecraft:shaped before:minecraft:shapeless"); + "", + RecipeShapedKleinStar.class, + Category.SHAPED, + "after:minecraft:shaped before:minecraft:shapeless"); RecipeSorter.register("", RecipeShapelessHidden.class, Category.SHAPELESS, "before:minecraft:shaped"); // Fuel Values @@ -1247,34 +1184,35 @@ public static void addRecipes() { public static void registerPhiloStoneSmelting() { for (Entry entry : (((HashMap) FurnaceRecipes.smelting() - .getSmeltingList()).entrySet())) { + .getSmeltingList()).entrySet())) { if (entry.getKey() == null || entry.getValue() == null) { continue; } ItemStack input = entry.getKey(); - ItemStack output = entry.getValue().copy(); + ItemStack output = entry.getValue() + .copy(); output.stackSize *= 7; GameRegistry.addRecipe( - new RecipeShapelessHidden( - output, - philosStone, - input, - input, - input, - input, - input, - input, - input, - new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE))); + new RecipeShapelessHidden( + output, + philosStone, + input, + input, + input, + input, + input, + input, + input, + new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE))); } RecipeSorter.register( - "Philosopher's Smelting Recipes", - RecipeShapelessHidden.class, - Category.SHAPELESS, - "before:minecraft:shaped"); + "Philosopher's Smelting Recipes", + RecipeShapelessHidden.class, + Category.SHAPELESS, + "before:minecraft:shaped"); } public static class FuelHandler implements IFuelHandler { diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/AlchemicalChest.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/AlchemicalChest.java index dc42774c3..769a0de70 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/AlchemicalChest.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/AlchemicalChest.java @@ -2,12 +2,6 @@ import java.util.Random; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.AlchChestTile; -import moze_intel.projecte.utils.ComparatorHelper; -import moze_intel.projecte.utils.Constants; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +11,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.AlchChestTile; +import moze_intel.projecte.utils.ComparatorHelper; +import moze_intel.projecte.utils.Constants; public class AlchemicalChest extends BlockDirection { @@ -50,7 +49,7 @@ public int getRenderType() { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) { player.openGui(PECore.instance, Constants.ALCH_CHEST_GUI, world, x, y, z); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/BlockDirection.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/BlockDirection.java index 084d4c11b..811c762bc 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/BlockDirection.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/BlockDirection.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.blocks; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.TileEmc; -import moze_intel.projecte.gameObjs.tiles.TileEmcDirection; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -15,6 +10,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.TileEmc; +import moze_intel.projecte.gameObjs.tiles.TileEmcDirection; +import moze_intel.projecte.utils.WorldHelper; + public abstract class BlockDirection extends Block { public BlockDirection(Material material) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/Collector.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/Collector.java index 11afeaa44..21f690a5f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/Collector.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/Collector.java @@ -1,13 +1,5 @@ package moze_intel.projecte.gameObjs.blocks; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; -import moze_intel.projecte.gameObjs.tiles.CollectorMK2Tile; -import moze_intel.projecte.gameObjs.tiles.CollectorMK3Tile; -import moze_intel.projecte.gameObjs.tiles.TileEmc; -import moze_intel.projecte.utils.ComparatorHelper; -import moze_intel.projecte.utils.Constants; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -21,6 +13,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; +import moze_intel.projecte.gameObjs.tiles.CollectorMK2Tile; +import moze_intel.projecte.gameObjs.tiles.CollectorMK3Tile; +import moze_intel.projecte.gameObjs.tiles.TileEmc; +import moze_intel.projecte.utils.ComparatorHelper; +import moze_intel.projecte.utils.Constants; public class Collector extends BlockDirection { @@ -40,7 +39,7 @@ public Collector(int tier) { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) switch (tier) { case 1: player.openGui(PECore.instance, Constants.COLLECTOR1_GUI, world, x, y, z); diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/Condenser.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/Condenser.java index 031ea5e37..316fad8a7 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/Condenser.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/Condenser.java @@ -2,13 +2,6 @@ import java.util.Random; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.CondenserTile; -import moze_intel.projecte.utils.ComparatorHelper; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +13,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.CondenserTile; +import moze_intel.projecte.utils.ComparatorHelper; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.WorldHelper; public class Condenser extends AlchemicalChest { @@ -50,7 +49,7 @@ public TileEntity createTileEntity(World world, int meta) { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) { player.openGui(PECore.instance, Constants.CONDENSER_GUI, world, x, y, z); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/CondenserMK2.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/CondenserMK2.java index 7b8fddc1d..8b4412fca 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/CondenserMK2.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/CondenserMK2.java @@ -2,11 +2,6 @@ import java.util.Random; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; -import moze_intel.projecte.utils.Constants; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,6 +10,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; +import moze_intel.projecte.utils.Constants; public class CondenserMK2 extends Condenser { @@ -45,7 +44,7 @@ public TileEntity createTileEntity(World world, int meta) { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) { player.openGui(PECore.instance, Constants.CONDENSER_MK2_GUI, world, x, y, z); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/FuelBlock.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/FuelBlock.java index 7ba941d18..ea53047d6 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/FuelBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/FuelBlock.java @@ -2,8 +2,6 @@ import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,6 +13,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; public class FuelBlock extends Block { diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/InterdictionTorch.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/InterdictionTorch.java index 65940e837..4ec292374 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/InterdictionTorch.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/InterdictionTorch.java @@ -2,9 +2,6 @@ import java.util.Random; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.InterdictionTile; - import net.minecraft.block.BlockTorch; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; @@ -12,6 +9,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.InterdictionTile; public class InterdictionTorch extends BlockTorch { diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterBlock.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterBlock.java index 9ebe2204b..6e51f97f3 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterBlock.java @@ -2,8 +2,6 @@ import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,6 +14,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; public class MatterBlock extends Block { @@ -50,7 +49,7 @@ public boolean canHarvestBlock(EntityPlayer player, int meta) { return stack.getItem() == ObjHandler.rmPick || stack.getItem() == ObjHandler.rmStar; } else { return stack.getItem() == ObjHandler.rmPick || stack.getItem() == ObjHandler.dmPick - || stack.getItem() == ObjHandler.rmStar; + || stack.getItem() == ObjHandler.rmStar; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterFurnace.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterFurnace.java index 4f22a6423..0a64c5cda 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterFurnace.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/MatterFurnace.java @@ -2,15 +2,6 @@ import java.util.Random; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.DMFurnaceTile; -import moze_intel.projecte.gameObjs.tiles.RMFurnaceTile; -import moze_intel.projecte.gameObjs.tiles.TileEmc; -import moze_intel.projecte.utils.ComparatorHelper; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +16,14 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.DMFurnaceTile; +import moze_intel.projecte.gameObjs.tiles.RMFurnaceTile; +import moze_intel.projecte.gameObjs.tiles.TileEmc; +import moze_intel.projecte.utils.ComparatorHelper; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.WorldHelper; public class MatterFurnace extends BlockDirection { @@ -58,12 +57,12 @@ public float getBlockHardness(World world, int x, int y, int z) { @Override public Item getItemDropped(int no, Random rand, int clue) { return isHighTier ? Item.getItemFromBlock(ObjHandler.rmFurnaceOff) - : Item.getItemFromBlock(ObjHandler.dmFurnaceOff); + : Item.getItemFromBlock(ObjHandler.dmFurnaceOff); } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) { if (isHighTier) { player.openGui(PECore.instance, Constants.RM_FURNACE_GUI, world, x, y, z); @@ -166,7 +165,7 @@ public void randomDisplayTick(World world, int x, int y, int z, Random rand) { public void registerBlockIcons(IIconRegister register) { this.blockIcon = register.registerIcon("projecte:" + textureName); front = register - .registerIcon("projecte:matter_furnace/" + (isActive ? (textureName + "_on") : (textureName + "_off"))); + .registerIcon("projecte:matter_furnace/" + (isActive ? (textureName + "_on") : (textureName + "_off"))); } @SideOnly(Side.CLIENT) @@ -181,7 +180,7 @@ public IIcon getIcon(int side, int meta) { @SideOnly(Side.CLIENT) public Item getItem(World world, int x, int y, int z) { return isHighTier ? Item.getItemFromBlock(ObjHandler.rmFurnaceOff) - : Item.getItemFromBlock(ObjHandler.dmFurnaceOff); + : Item.getItemFromBlock(ObjHandler.dmFurnaceOff); } @Override diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCataclysm.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCataclysm.java index 79112161f..44f89853c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCataclysm.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCataclysm.java @@ -1,14 +1,13 @@ package moze_intel.projecte.gameObjs.blocks; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.entity.EntityNovaCataclysmPrimed; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.entity.EntityNovaCataclysmPrimed; public class NovaCataclysm extends NovaCatalyst { @@ -28,11 +27,11 @@ public void func_150114_a(World world, int x, int y, int z, int par5, EntityLivi } EntityNovaCataclysmPrimed ent = new EntityNovaCataclysmPrimed( - world, - (double) ((float) x + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), - entity); + world, + (double) ((float) x + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), + entity); world.spawnEntityInWorld(ent); world.playSoundAtEntity(ent, "game.tnt.primed", 1.0F, 1.0F); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCatalyst.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCatalyst.java index b6a287c72..cd0b22411 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCatalyst.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/NovaCatalyst.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.blocks; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.entity.EntityNovaCatalystPrimed; - import net.minecraft.block.BlockTNT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -12,6 +9,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.entity.EntityNovaCatalystPrimed; public class NovaCatalyst extends BlockTNT { @@ -36,11 +35,11 @@ public void func_150114_a(World world, int x, int y, int z, int par5, EntityLivi } EntityNovaCatalystPrimed ent = new EntityNovaCatalystPrimed( - world, - (double) ((float) x + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), - entity); + world, + (double) ((float) x + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), + entity); world.spawnEntityInWorld(ent); world.playSoundAtEntity(ent, "game.tnt.primed", 1.0F, 1.0F); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/Pedestal.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/Pedestal.java index 137ec896b..27daa4f65 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/Pedestal.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/Pedestal.java @@ -1,16 +1,5 @@ package moze_intel.projecte.gameObjs.blocks; -import moze_intel.projecte.PECore; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.gameObjs.tiles.TileEmc; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.SyncPedestalPKT; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.PELogger; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -21,6 +10,16 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.NetworkRegistry; +import moze_intel.projecte.PECore; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.gameObjs.tiles.TileEmc; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.SyncPedestalPKT; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.PELogger; +import moze_intel.projecte.utils.WorldHelper; public class Pedestal extends Block { @@ -36,27 +35,34 @@ public Pedestal() { public void breakBlock(World world, int x, int y, int z, Block block, int meta) { DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z)); if (tile.getItemStack() != null) { - WorldHelper.spawnEntityItem(world, tile.getItemStack().copy(), x, y, z); + WorldHelper.spawnEntityItem( + world, + tile.getItemStack() + .copy(), + x, + y, + z); } tile.invalidate(); super.breakBlock(world, x, y, z, block, meta); } public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) { DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z)); if (player.isSneaking()) { player.openGui(PECore.instance, Constants.PEDESTAL_GUI, world, x, y, z); } else { - if (tile.getItemStack() != null && tile.getItemStack().getItem() instanceof IPedestalItem) { + if (tile.getItemStack() != null && tile.getItemStack() + .getItem() instanceof IPedestalItem) { tile.setActive(!tile.getActive()); } PELogger.logDebug("Pedestal: " + (tile.getActive() ? "ON" : "OFF")); } PacketHandler.sendToAllAround( - new SyncPedestalPKT(tile), - new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32)); + new SyncPedestalPKT(tile), + new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32)); } return true; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/Relay.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/Relay.java index 1f4c674b3..d6184481a 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/Relay.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/Relay.java @@ -1,13 +1,5 @@ package moze_intel.projecte.gameObjs.blocks; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; -import moze_intel.projecte.gameObjs.tiles.RelayMK2Tile; -import moze_intel.projecte.gameObjs.tiles.RelayMK3Tile; -import moze_intel.projecte.gameObjs.tiles.TileEmc; -import moze_intel.projecte.utils.ComparatorHelper; -import moze_intel.projecte.utils.Constants; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -19,6 +11,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; +import moze_intel.projecte.gameObjs.tiles.RelayMK2Tile; +import moze_intel.projecte.gameObjs.tiles.RelayMK3Tile; +import moze_intel.projecte.gameObjs.tiles.TileEmc; +import moze_intel.projecte.utils.ComparatorHelper; +import moze_intel.projecte.utils.Constants; public class Relay extends BlockDirection { @@ -38,7 +37,7 @@ public Relay(int tier) { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) { switch (tier) { case 1: diff --git a/src/main/java/moze_intel/projecte/gameObjs/blocks/TransmutationStone.java b/src/main/java/moze_intel/projecte/gameObjs/blocks/TransmutationStone.java index adbed1632..56b4c2723 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/blocks/TransmutationStone.java +++ b/src/main/java/moze_intel/projecte/gameObjs/blocks/TransmutationStone.java @@ -2,11 +2,6 @@ import java.util.Random; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.TileEmc; -import moze_intel.projecte.utils.Constants; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,6 +15,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.TileEmc; +import moze_intel.projecte.utils.Constants; public class TransmutationStone extends Block { @@ -41,7 +40,7 @@ public Item getItemDropped(int par1, Random random, int par2) { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (!world.isRemote) { player.openGui(PECore.instance, Constants.TRANSMUTATION_GUI, world, x, y, z); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/AlchBagInventory.java b/src/main/java/moze_intel/projecte/gameObjs/container/AlchBagInventory.java index a7c0ebfa8..6d4f76794 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/AlchBagInventory.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/AlchBagInventory.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.playerData.AlchemicalBags; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import moze_intel.projecte.playerData.AlchemicalBags; + public class AlchBagInventory implements IInventory { private final ItemStack invItem; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/AlchChestContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/AlchChestContainer.java index 55da57986..dcedbdb2d 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/AlchChestContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/AlchChestContainer.java @@ -1,7 +1,5 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.tiles.AlchChestTile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -9,6 +7,7 @@ import net.minecraft.item.ItemStack; import invtweaks.api.container.ChestContainer; +import moze_intel.projecte.gameObjs.tiles.AlchChestTile; @ChestContainer(isLargeChest = true, rowSize = 13) public class AlchChestContainer extends Container { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK1Container.java b/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK1Container.java index 2c49cb1c9..3eae1c1fb 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK1Container.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK1Container.java @@ -2,11 +2,6 @@ import javax.annotation.Nonnull; -import moze_intel.projecte.emc.FuelMapper; -import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorInv; -import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorLock; -import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; @@ -15,6 +10,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.emc.FuelMapper; +import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorInv; +import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorLock; +import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; public class CollectorMK1Container extends LongContainer { @@ -129,7 +128,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { } } else if (slotIndex >= 11 && slotIndex <= 46) { if (!FuelMapper.isStackFuel(stack) || FuelMapper.isStackMaxFuel(stack) - || !this.mergeItemStack(stack, 1, 8, false)) { + || !this.mergeItemStack(stack, 1, 8, false)) { return null; } } else { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK2Container.java b/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK2Container.java index 2e646c73d..5fa759fa5 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK2Container.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK2Container.java @@ -2,11 +2,6 @@ import javax.annotation.Nonnull; -import moze_intel.projecte.emc.FuelMapper; -import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorInv; -import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorLock; -import moze_intel.projecte.gameObjs.tiles.CollectorMK2Tile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; @@ -15,6 +10,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.emc.FuelMapper; +import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorInv; +import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorLock; +import moze_intel.projecte.gameObjs.tiles.CollectorMK2Tile; public class CollectorMK2Container extends LongContainer { @@ -127,7 +126,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { } } else if (slotIndex >= 15 && slotIndex <= 50) { if (!FuelMapper.isStackFuel(stack) || FuelMapper.isStackMaxFuel(stack) - || !this.mergeItemStack(stack, 1, 12, false)) { + || !this.mergeItemStack(stack, 1, 12, false)) { return null; } } else { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK3Container.java b/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK3Container.java index 4827eb2f8..8895af408 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK3Container.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/CollectorMK3Container.java @@ -2,11 +2,6 @@ import javax.annotation.Nonnull; -import moze_intel.projecte.emc.FuelMapper; -import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorInv; -import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorLock; -import moze_intel.projecte.gameObjs.tiles.CollectorMK3Tile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; @@ -15,6 +10,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.emc.FuelMapper; +import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorInv; +import moze_intel.projecte.gameObjs.container.slots.collector.SlotCollectorLock; +import moze_intel.projecte.gameObjs.tiles.CollectorMK3Tile; public class CollectorMK3Container extends LongContainer { @@ -127,7 +126,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { } } else if (slotIndex >= 19 && slotIndex <= 54) { if (!FuelMapper.isStackFuel(stack) || FuelMapper.isStackMaxFuel(stack) - || !this.mergeItemStack(stack, 1, 16, false)) { + || !this.mergeItemStack(stack, 1, 16, false)) { return null; } } else { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/CondenserContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/CondenserContainer.java index 0eec20a5b..30919b82f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/CondenserContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/CondenserContainer.java @@ -1,15 +1,15 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserInput; -import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserLock; -import moze_intel.projecte.gameObjs.tiles.CondenserTile; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserInput; +import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserLock; +import moze_intel.projecte.gameObjs.tiles.CondenserTile; +import moze_intel.projecte.utils.EMCHelper; + public class CondenserContainer extends LongContainer { public CondenserTile tile; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/CondenserMK2Container.java b/src/main/java/moze_intel/projecte/gameObjs/container/CondenserMK2Container.java index 9f39c67a8..428870c42 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/CondenserMK2Container.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/CondenserMK2Container.java @@ -1,17 +1,17 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserInput; -import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserMK2Lock; -import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserMK2Output; -import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserInput; +import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserMK2Lock; +import moze_intel.projecte.gameObjs.container.slots.condenser.SlotCondenserMK2Output; +import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; +import moze_intel.projecte.utils.EMCHelper; + public class CondenserMK2Container extends Container { public CondenserMK2Tile tile; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/DMFurnaceContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/DMFurnaceContainer.java index 162020b75..3a0a8344b 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/DMFurnaceContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/DMFurnaceContainer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.gameObjs.tiles.DMFurnaceTile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -14,6 +11,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.gameObjs.tiles.DMFurnaceTile; public class DMFurnaceContainer extends Container { @@ -113,13 +112,14 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { if (!this.mergeItemStack(stack, 0, 1, false)) { return null; } - } else if (FurnaceRecipes.smelting().getSmeltingResult(newStack) != null) { - if (!this.mergeItemStack(stack, 1, 10, false)) { + } else if (FurnaceRecipes.smelting() + .getSmeltingResult(newStack) != null) { + if (!this.mergeItemStack(stack, 1, 10, false)) { + return null; + } + } else { return null; } - } else { - return null; - } } if (stack.stackSize == 0) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/EternalDensityContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/EternalDensityContainer.java index aa727f628..c3b55e019 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/EternalDensityContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/EternalDensityContainer.java @@ -1,14 +1,14 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.container.inventory.EternalDensityInventory; -import moze_intel.projecte.gameObjs.container.slots.SlotGhost; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.inventory.EternalDensityInventory; +import moze_intel.projecte.gameObjs.container.slots.SlotGhost; + public class EternalDensityContainer extends Container { private EternalDensityInventory inventory; @@ -36,7 +36,8 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { if (slotIndex > 8) { int index = inventory.findFirstEmptySlot(); if (index != -1) { - ItemStack toSet = slot.getStack().copy(); + ItemStack toSet = slot.getStack() + .copy(); toSet.stackSize = 1; inventory.setInventorySlotContents(index, toSet); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/MercurialEyeContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/MercurialEyeContainer.java index dc2ed97f9..8b9ce34d3 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/MercurialEyeContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/MercurialEyeContainer.java @@ -1,15 +1,15 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.container.inventory.MercurialEyeInventory; -import moze_intel.projecte.gameObjs.container.slots.mercurial.SlotMercurialKlein; -import moze_intel.projecte.gameObjs.container.slots.mercurial.SlotMercurialTarget; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.inventory.MercurialEyeInventory; +import moze_intel.projecte.gameObjs.container.slots.mercurial.SlotMercurialKlein; +import moze_intel.projecte.gameObjs.container.slots.mercurial.SlotMercurialTarget; + public class MercurialEyeContainer extends Container { private MercurialEyeInventory inventory; @@ -63,14 +63,14 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { } else // Moving from player inventory { if (((Slot) inventorySlots.get(0)).isItemValid(stack) - && ((Slot) inventorySlots.get(0)).getStack() == null) { // Is a valid klein star and the slot is - // empty? + && ((Slot) inventorySlots.get(0)).getStack() == null) { // Is a valid klein star and the slot is + // empty? ((Slot) inventorySlots.get(0)).putStack(stack.splitStack(1)); } else if (((Slot) inventorySlots.get(1)).isItemValid(stack) - && ((Slot) inventorySlots.get(1)).getStack() == null) { // Is a valid target block and the slot is - // empty? - ((Slot) inventorySlots.get(1)).putStack(stack.splitStack(1)); - } else // Is neither, ignore + && ((Slot) inventorySlots.get(1)).getStack() == null) { // Is a valid target block and the slot is + // empty? + ((Slot) inventorySlots.get(1)).putStack(stack.splitStack(1)); + } else // Is neither, ignore { return null; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/PedestalContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/PedestalContainer.java index 7212ca5ba..e3cc641b1 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/PedestalContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/PedestalContainer.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; + public class PedestalContainer extends Container { private final DMPedestalTile tile; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/PhilosStoneContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/PhilosStoneContainer.java index e9c9302a4..9342c59e5 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/PhilosStoneContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/PhilosStoneContainer.java @@ -40,8 +40,10 @@ public PhilosStoneContainer(InventoryPlayer invPlayer) { @Override public void onCraftMatrixChanged(IInventory inv) { - craftResult - .setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj)); + craftResult.setInventorySlotContents( + 0, + CraftingManager.getInstance() + .findMatchingRecipe(craftMatrix, worldObj)); } @Override diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/RMFurnaceContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/RMFurnaceContainer.java index cb861e194..d10403323 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/RMFurnaceContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/RMFurnaceContainer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.gameObjs.tiles.RMFurnaceTile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -14,6 +11,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.gameObjs.tiles.RMFurnaceTile; public class RMFurnaceContainer extends Container { @@ -113,13 +112,14 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { if (!this.mergeItemStack(stack, 0, 1, false)) { return null; } - } else if (FurnaceRecipes.smelting().getSmeltingResult(newStack) != null) { - if (!this.mergeItemStack(stack, 1, 14, false)) { + } else if (FurnaceRecipes.smelting() + .getSmeltingResult(newStack) != null) { + if (!this.mergeItemStack(stack, 1, 14, false)) { + return null; + } + } else { return null; } - } else { - return null; - } } if (stack.stackSize == 0) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK1Container.java b/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK1Container.java index 40c5f7b78..218c3d1ea 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK1Container.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK1Container.java @@ -1,15 +1,15 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayInput; -import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayKlein; -import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayInput; +import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayKlein; +import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; + public class RelayMK1Container extends Container { private RelayMK1Tile tile; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK2Container.java b/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK2Container.java index 46ff71d56..9449766a2 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK2Container.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK2Container.java @@ -1,15 +1,15 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayInput; -import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayKlein; -import moze_intel.projecte.gameObjs.tiles.RelayMK2Tile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayInput; +import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayKlein; +import moze_intel.projecte.gameObjs.tiles.RelayMK2Tile; + public class RelayMK2Container extends Container { private RelayMK2Tile tile; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK3Container.java b/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK3Container.java index dc763c065..7da53b6d7 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK3Container.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/RelayMK3Container.java @@ -1,15 +1,15 @@ package moze_intel.projecte.gameObjs.container; -import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayInput; -import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayKlein; -import moze_intel.projecte.gameObjs.tiles.RelayMK3Tile; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayInput; +import moze_intel.projecte.gameObjs.container.slots.relay.SlotRelayKlein; +import moze_intel.projecte.gameObjs.tiles.RelayMK3Tile; + public class RelayMK3Container extends Container { private RelayMK3Tile tile; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/TransmutationContainer.java b/src/main/java/moze_intel/projecte/gameObjs/container/TransmutationContainer.java index 06c6daf97..445c27e37 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/TransmutationContainer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/TransmutationContainer.java @@ -1,5 +1,11 @@ package moze_intel.projecte.gameObjs.container; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import moze_intel.projecte.gameObjs.ObjHandler; import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; import moze_intel.projecte.gameObjs.container.slots.transmutation.SlotConsume; @@ -12,12 +18,6 @@ import moze_intel.projecte.utils.EMCHelper; import moze_intel.projecte.utils.ItemHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - public class TransmutationContainer extends Container { public TransmutationInventory transmutationInventory; @@ -90,7 +90,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { int stackSize = 0; while (transmutationInventory.emc >= emc && stackSize < newStack.getMaxStackSize() - && ItemHelper.hasSpace(player.inventory.mainInventory, newStack)) { + && ItemHelper.hasSpace(player.inventory.mainInventory, newStack)) { transmutationInventory.removeEmc(emc); ItemHelper.pushStackInInv(player.inventory, ItemHelper.getNormalizedStack(newStack)); stackSize++; @@ -141,7 +141,8 @@ private boolean isNeiScrollWheel() { // NEI IN STACKTRACE] Class[] stacktrace = accessibleManager.getStackClasses(); return stacktrace.length >= stacktraceDepth && stacktrace[stacktraceDepth] != null - && stacktrace[stacktraceDepth].getName().equals("codechicken.nei.FastTransferManager"); + && stacktrace[stacktraceDepth].getName() + .equals("codechicken.nei.FastTransferManager"); } @Override @@ -151,8 +152,8 @@ public ItemStack slotClick(int slot, int button, int flag, EntityPlayer player) PacketHandler.sendToServer(new SearchUpdatePKT(slot, getSlot(slot).getStack())); } if (slot >= 0 && getSlot(slot) != null) { - if (getSlot(slot).getStack() != null && getSlot(slot).getStack().getItem() == ObjHandler.transmutationTablet - && getSlot(slot).getStack() == player.getHeldItem()) { + if (getSlot(slot).getStack() != null && getSlot(slot).getStack() + .getItem() == ObjHandler.transmutationTablet && getSlot(slot).getStack() == player.getHeldItem()) { return null; } } @@ -163,10 +164,9 @@ && getSlot(slot).getStack() == player.getHeldItem()) { @Override public boolean canDragIntoSlot(Slot slot) { if (slot instanceof SlotConsume || slot instanceof SlotUnlearn - || slot instanceof SlotInput - || slot instanceof SlotLock - || slot instanceof SlotOutput) - return false; + || slot instanceof SlotInput + || slot instanceof SlotLock + || slot instanceof SlotOutput) return false; return true; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/inventory/EternalDensityInventory.java b/src/main/java/moze_intel/projecte/gameObjs/container/inventory/EternalDensityInventory.java index 643ef4e62..934c4bf00 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/inventory/EternalDensityInventory.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/inventory/EternalDensityInventory.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.container.inventory; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.UpdateGemModePKT; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -10,6 +7,9 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants.NBT; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.UpdateGemModePKT; + public class EternalDensityInventory implements IInventory { private ItemStack inventory[]; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/inventory/TransmutationInventory.java b/src/main/java/moze_intel/projecte/gameObjs/container/inventory/TransmutationInventory.java index 94fe127b8..141fdf518 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/inventory/TransmutationInventory.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/inventory/TransmutationInventory.java @@ -5,6 +5,13 @@ import java.util.Iterator; import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import com.google.common.collect.Lists; + import moze_intel.projecte.emc.FuelMapper; import moze_intel.projecte.gameObjs.ObjHandler; import moze_intel.projecte.playerData.Transmutation; @@ -15,13 +22,6 @@ import moze_intel.projecte.utils.ItemSearchHelper; import moze_intel.projecte.utils.NBTWhitelist; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import com.google.common.collect.Lists; - public class TransmutationInventory implements IInventory { public double emc; @@ -228,7 +228,7 @@ public void updateOutputs(boolean async) { public void writeIntoOutputSlot(int slot, ItemStack item) { if (EMCHelper.doesItemHaveEmc(item) && EMCHelper.getEmcValue(item) <= this.emc - && Transmutation.hasKnowledgeForStack(item, player)) { + && Transmutation.hasKnowledgeForStack(item, player)) { inventory[slot] = item; } else { inventory[slot] = null; @@ -236,7 +236,8 @@ public void writeIntoOutputSlot(int slot, ItemStack item) { } public List getOutputSlots() { - return Arrays.asList(inventory).subList(10, 26); + return Arrays.asList(inventory) + .subList(10, 26); } @Override diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/SlotGhost.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/SlotGhost.java index e79b9755f..fabe10fbd 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/SlotGhost.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/SlotGhost.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.container.slots; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; + public class SlotGhost extends Slot { public SlotGhost(IInventory inv, int slotIndex, int xPos, int yPost) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorInv.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorInv.java index 276f1cd25..076858acf 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorInv.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorInv.java @@ -1,12 +1,12 @@ package moze_intel.projecte.gameObjs.container.slots.collector; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.emc.FuelMapper; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.emc.FuelMapper; + public class SlotCollectorInv extends Slot { public SlotCollectorInv(IInventory inventory, int slotIndex, int xPos, int yPos) { @@ -20,6 +20,6 @@ public boolean isItemValid(ItemStack stack) { } return stack.getItem() instanceof IItemEmc - || (FuelMapper.isStackFuel(stack) && !FuelMapper.isStackMaxFuel(stack)); + || (FuelMapper.isStackFuel(stack) && !FuelMapper.isStackMaxFuel(stack)); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorLock.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorLock.java index db1f6ede7..6fa13c467 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorLock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/collector/SlotCollectorLock.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.container.slots.collector; -import moze_intel.projecte.emc.FuelMapper; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.emc.FuelMapper; + public class SlotCollectorLock extends Slot { public SlotCollectorLock(IInventory inventory, int slotIndex, int xPos, int yPos) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserInput.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserInput.java index d0148c40f..b8d956c3c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserInput.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserInput.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.container.slots.condenser; -import moze_intel.projecte.gameObjs.tiles.CondenserTile; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.tiles.CondenserTile; +import moze_intel.projecte.utils.EMCHelper; + public class SlotCondenserInput extends Slot { public SlotCondenserInput(CondenserTile inventory, int slotIndex, int xPos, int yPos) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserLock.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserLock.java index d3a339d5f..6ec66bf89 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserLock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserLock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.container.slots.condenser; -import moze_intel.projecte.gameObjs.container.CondenserContainer; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.CondenserContainer; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; + public class SlotCondenserLock extends Slot { private CondenserContainer container; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Lock.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Lock.java index c2031791b..2f622a337 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Lock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Lock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.container.slots.condenser; -import moze_intel.projecte.gameObjs.container.CondenserMK2Container; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.CondenserMK2Container; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; + public class SlotCondenserMK2Lock extends Slot { private CondenserMK2Container container; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Output.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Output.java index 5d5a97ec3..de9574f7a 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Output.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/condenser/SlotCondenserMK2Output.java @@ -1,10 +1,10 @@ package moze_intel.projecte.gameObjs.container.slots.condenser; -import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; - import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; + public class SlotCondenserMK2Output extends Slot { public SlotCondenserMK2Output(CondenserMK2Tile inventory, int slotIndex, int xPos, int yPos) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialKlein.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialKlein.java index 64d317014..ef67e9b7f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialKlein.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialKlein.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.container.slots.mercurial; -import moze_intel.projecte.gameObjs.items.KleinStar; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.items.KleinStar; + public class SlotMercurialKlein extends Slot { public SlotMercurialKlein(IInventory par1iInventory, int par2, int par3, int par4) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialTarget.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialTarget.java index d6ff5e705..da4e0dbc1 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialTarget.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/mercurial/SlotMercurialTarget.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.container.slots.mercurial; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.utils.EMCHelper; + public class SlotMercurialTarget extends Slot { public SlotMercurialTarget(IInventory par1iInventory, int par2, int par3, int par4) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayInput.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayInput.java index d053e8f00..cdaef204f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayInput.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayInput.java @@ -1,12 +1,12 @@ package moze_intel.projecte.gameObjs.container.slots.relay; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.utils.EMCHelper; + public class SlotRelayInput extends Slot { public SlotRelayInput(IInventory inventory, int slotIndex, int xPos, int yPos) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayKlein.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayKlein.java index f70083907..98c8fde33 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayKlein.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/relay/SlotRelayKlein.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.container.slots.relay; -import moze_intel.projecte.api.item.IItemEmc; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.api.item.IItemEmc; + public class SlotRelayKlein extends Slot { public SlotRelayKlein(IInventory inventory, int slotIndex, int xPos, int yPos) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotConsume.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotConsume.java index 26fd5df07..08f4e7572 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotConsume.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotConsume.java @@ -1,12 +1,12 @@ package moze_intel.projecte.gameObjs.container.slots.transmutation; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import moze_intel.projecte.gameObjs.ObjHandler; import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; import moze_intel.projecte.utils.EMCHelper; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - public class SlotConsume extends Slot { private TransmutationInventory inv; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotInput.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotInput.java index 043911251..3a6b445f0 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotInput.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotInput.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.container.slots.transmutation; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import moze_intel.projecte.api.item.IItemEmc; import moze_intel.projecte.gameObjs.ObjHandler; import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; import moze_intel.projecte.utils.EMCHelper; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - public class SlotInput extends Slot { private TransmutationInventory inv; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotLock.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotLock.java index 6aa4220ba..dfe426199 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotLock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotLock.java @@ -1,15 +1,15 @@ package moze_intel.projecte.gameObjs.container.slots.transmutation; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import moze_intel.projecte.api.item.IItemEmc; import moze_intel.projecte.gameObjs.ObjHandler; import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; import moze_intel.projecte.utils.Constants; import moze_intel.projecte.utils.EMCHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - public class SlotLock extends Slot { private TransmutationInventory inv; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotOutput.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotOutput.java index e8e8c1d4d..5476c6c58 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotOutput.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotOutput.java @@ -1,12 +1,12 @@ package moze_intel.projecte.gameObjs.container.slots.transmutation; -import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; +import moze_intel.projecte.utils.EMCHelper; + public class SlotOutput extends Slot { private TransmutationInventory inv; diff --git a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotUnlearn.java b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotUnlearn.java index 77a56a936..f6037e050 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotUnlearn.java +++ b/src/main/java/moze_intel/projecte/gameObjs/container/slots/transmutation/SlotUnlearn.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.container.slots.transmutation; -import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; +import moze_intel.projecte.utils.EMCHelper; + public class SlotUnlearn extends Slot { private TransmutationInventory inv; diff --git a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeAlchemyBag.java b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeAlchemyBag.java index d6d41ce9d..12a5646cd 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeAlchemyBag.java +++ b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeAlchemyBag.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.customRecipes; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import moze_intel.projecte.gameObjs.ObjHandler; + public class RecipeAlchemyBag implements IRecipe { private ItemStack output; diff --git a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapedKleinStar.java b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapedKleinStar.java index 94c5c6842..be0f9a1d8 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapedKleinStar.java +++ b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapedKleinStar.java @@ -1,14 +1,14 @@ package moze_intel.projecte.gameObjs.customRecipes; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.items.KleinStar; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.items.KleinStar; + public class RecipeShapedKleinStar implements IRecipe { /** @@ -115,7 +115,8 @@ private boolean checkMatch(InventoryCrafting p_77573_1_, int p_77573_2_, int p_7 * Returns an Item that is the result of this recipe */ public ItemStack getCraftingResult(InventoryCrafting p_77572_1_) { - ItemStack itemstack = this.getRecipeOutput().copy(); + ItemStack itemstack = this.getRecipeOutput() + .copy(); if (this.field_92101_f) { for (int i = 0; i < p_77572_1_.getSizeInventory(); ++i) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapelessHidden.java b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapelessHidden.java index 594bc648f..18e059d27 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapelessHidden.java +++ b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipeShapelessHidden.java @@ -6,9 +6,6 @@ import java.util.Map; import java.util.Map.Entry; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.items.KleinStar; - import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -19,6 +16,9 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.items.KleinStar; + // This is literally just ShapelessOreRecipe, unchanged. NEI doesn't auto-pick up shapeless recipes registered this way, // thus hiding those recipes from the Shapeless Recipes list. public class RecipeShapelessHidden implements IRecipe { diff --git a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipesCovalenceRepair.java b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipesCovalenceRepair.java index ac6f61ee8..39492d0fe 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipesCovalenceRepair.java +++ b/src/main/java/moze_intel/projecte/gameObjs/customRecipes/RecipesCovalenceRepair.java @@ -1,7 +1,5 @@ package moze_intel.projecte.gameObjs.customRecipes; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; @@ -19,6 +17,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import moze_intel.projecte.gameObjs.ObjHandler; + public class RecipesCovalenceRepair implements IRecipe { private ItemStack output; @@ -77,8 +77,8 @@ public boolean matches(InventoryCrafting inv, World world) { private boolean correctDustCount(int dustCounter, Item toRepair) { if (toRepair instanceof ItemSpade || toRepair instanceof ItemShears - || toRepair instanceof ItemFlintAndSteel - || toRepair instanceof ItemFishingRod) { + || toRepair instanceof ItemFlintAndSteel + || toRepair instanceof ItemFishingRod) { return dustCounter == 1; } @@ -122,14 +122,14 @@ private boolean isItemRepairable(ItemStack stack) { Item item = stack.getItem(); if (item instanceof ItemShears || item instanceof ItemFlintAndSteel - || item instanceof ItemFishingRod - || item instanceof ItemBow) { + || item instanceof ItemFishingRod + || item instanceof ItemBow) { return true; } return (item instanceof ItemTool || item instanceof ItemSword - || item instanceof ItemHoe - || item instanceof ItemArmor); + || item instanceof ItemHoe + || item instanceof ItemArmor); } private int getDustType(ItemStack stack) { @@ -152,7 +152,8 @@ private int getDustType(ItemStack stack) { } else if (item instanceof ItemHoe) { name = ((ItemHoe) item).getToolMaterialName(); } else if (item instanceof ItemArmor) { - name = ((ItemArmor) item).getArmorMaterial().toString(); + name = ((ItemArmor) item).getArmorMaterial() + .toString(); } if (name.equals("WOOD") || name.equals("STONE") || name.equals("CLOTH")) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityFireProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityFireProjectile.java index 28134ab50..99019458a 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityFireProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityFireProjectile.java @@ -1,7 +1,5 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -9,6 +7,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import moze_intel.projecte.utils.PlayerHelper; + public class EntityFireProjectile extends PEProjectile { public EntityFireProjectile(World world) { @@ -41,7 +41,7 @@ protected void apply(MovingObjectPosition mop) { PlayerHelper.checkedPlaceBlock(((EntityPlayerMP) getThrower()), x1, y1, z1, Blocks.fire, 0); } else if (worldObj.getBlock(x1, y1, z1) == Blocks.sand) { PlayerHelper - .checkedReplaceBlock(((EntityPlayerMP) getThrower()), x1, y1, z1, Blocks.glass, 0); + .checkedReplaceBlock(((EntityPlayerMP) getThrower()), x1, y1, z1, Blocks.glass, 0); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityHomingArrow.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityHomingArrow.java index d071620fc..7eb3f8432 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityHomingArrow.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityHomingArrow.java @@ -8,14 +8,14 @@ import javax.vecmath.Matrix4d; import javax.vecmath.Vector3d; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.world.World; +import moze_intel.projecte.utils.WorldHelper; + public class EntityHomingArrow extends EntityArrow { private static final int DW_TARGET_ID = 31; @@ -58,21 +58,21 @@ public void onUpdate() { if (ticksExisted > 3 && hasTarget() && !WorldHelper.isArrowInGround(this)) { this.worldObj.spawnParticle( - "flame", - this.posX + this.motionX / 4.0D, - this.posY + this.motionY / 4.0D, - this.posZ + this.motionZ / 4.0D, - -this.motionX / 2, - -this.motionY / 2 + 0.2D, - -this.motionZ / 2); + "flame", + this.posX + this.motionX / 4.0D, + this.posY + this.motionY / 4.0D, + this.posZ + this.motionZ / 4.0D, + -this.motionX / 2, + -this.motionY / 2 + 0.2D, + -this.motionZ / 2); this.worldObj.spawnParticle( - "flame", - this.posX + this.motionX / 4.0D, - this.posY + this.motionY / 4.0D, - this.posZ + this.motionZ / 4.0D, - -this.motionX / 2, - -this.motionY / 2 + 0.2D, - -this.motionZ / 2); + "flame", + this.posX + this.motionX / 4.0D, + this.posY + this.motionY / 4.0D, + this.posZ + this.motionZ / 4.0D, + -this.motionX / 2, + -this.motionY / 2 + 0.2D, + -this.motionZ / 2); Entity target = getTarget(); Vector3d arrowLoc = new Vector3d(posX, posY, posZ); @@ -119,13 +119,13 @@ public void onUpdate() { private void findNewTarget() { List candidates = worldObj - .getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(8, 8, 8)); + .getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(8, 8, 8)); Collections.sort(candidates, new Comparator() { @Override public int compare(EntityLiving o1, EntityLiving o2) { double dist = EntityHomingArrow.this.getDistanceSqToEntity(o1) - - EntityHomingArrow.this.getDistanceSqToEntity(o2); + - EntityHomingArrow.this.getDistanceSqToEntity(o2); if (dist == 0.0) { return 0; } else { @@ -135,7 +135,10 @@ public int compare(EntityLiving o1, EntityLiving o2) { }); if (!candidates.isEmpty()) { - dataWatcher.updateObject(DW_TARGET_ID, candidates.get(0).getEntityId()); + dataWatcher.updateObject( + DW_TARGET_ID, + candidates.get(0) + .getEntityId()); } newTargetCooldown = 5; diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLavaProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLavaProjectile.java index 880ac1081..dba188bc3 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLavaProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLavaProjectile.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.items.ItemPE; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +11,10 @@ import net.minecraft.world.storage.WorldInfo; import net.minecraftforge.common.util.ForgeDirection; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.items.ItemPE; +import moze_intel.projecte.utils.PlayerHelper; + public class EntityLavaProjectile extends PEProjectile { public EntityLavaProjectile(World world) { @@ -35,7 +35,7 @@ public void onUpdate() { if (!this.worldObj.isRemote) { if (ticksExisted > 400 - || !this.worldObj.blockExists(((int) this.posX), ((int) this.posY), ((int) this.posZ))) { + || !this.worldObj.blockExists(((int) this.posX), ((int) this.posY), ((int) this.posZ))) { this.setDead(); return; } @@ -51,13 +51,13 @@ public void onUpdate() { if (PlayerHelper.hasBreakPermission(player, x, y, z)) { this.worldObj.setBlockToAir(x, y, z); this.worldObj.playSoundEffect( - x + 0.5, - y + 0.5, - z + 0.5, - "random.fizz", - 0.5F, - 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) - * 0.8F); + x + 0.5, + y + 0.5, + z + 0.5, + "random.fizz", + 0.5F, + 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) + * 0.8F); } } } @@ -83,12 +83,12 @@ protected void apply(MovingObjectPosition mop) { case BLOCK: ForgeDirection dir = ForgeDirection.getOrientation(mop.sideHit); PlayerHelper.checkedPlaceBlock( - ((EntityPlayerMP) getThrower()), - mop.blockX + dir.offsetX, - mop.blockY + dir.offsetY, - mop.blockZ + dir.offsetZ, - Blocks.flowing_lava, - 0); + ((EntityPlayerMP) getThrower()), + mop.blockX + dir.offsetX, + mop.blockY + dir.offsetY, + mop.blockZ + dir.offsetZ, + Blocks.flowing_lava, + 0); break; case ENTITY: Entity ent = mop.entityHit; diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLensProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLensProjectile.java index 06c044d12..14f79a6dc 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLensProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLensProjectile.java @@ -1,16 +1,15 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.ParticlePKT; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import cpw.mods.fml.common.network.NetworkRegistry; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.ParticlePKT; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.WorldHelper; public class EntityLensProjectile extends PEProjectile { @@ -46,8 +45,8 @@ public void onUpdate() { if (this.isInWater()) { this.playSound("random.fizz", 0.7F, 1.6F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F); PacketHandler.sendToAllAround( - new ParticlePKT("largesmoke", posX, posY, posZ), - new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, posX, posY, posZ, 32)); + new ParticlePKT("largesmoke", posX, posY, posZ), + new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, posX, posY, posZ, 32)); this.setDead(); } } @@ -56,7 +55,7 @@ public void onUpdate() { protected void apply(MovingObjectPosition mop) { if (this.worldObj.isRemote) return; WorldHelper - .createNovaExplosion(worldObj, getThrower(), posX, posY, posZ, Constants.EXPLOSIVE_LENS_RADIUS[charge]); + .createNovaExplosion(worldObj, getThrower(), posX, posY, posZ, Constants.EXPLOSIVE_LENS_RADIUS[charge]); } public void writeEntityToNBT(NBTTagCompound nbt) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLootBall.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLootBall.java index 3614d1c1c..e9f0d4e29 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLootBall.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityLootBall.java @@ -3,12 +3,6 @@ import java.util.Arrays; import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.container.AlchBagContainer; -import moze_intel.projecte.gameObjs.items.AlchemicalBag; -import moze_intel.projecte.playerData.AlchemicalBags; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +15,12 @@ import com.google.common.collect.Lists; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.container.AlchBagContainer; +import moze_intel.projecte.gameObjs.items.AlchemicalBag; +import moze_intel.projecte.playerData.AlchemicalBags; +import moze_intel.projecte.utils.ItemHelper; + public class EntityLootBall extends Entity { private final int lifespan = 6000; @@ -65,13 +65,15 @@ public void onUpdate() { this.noClip = this.func_145771_j(this.posX, (this.boundingBox.minY + this.boundingBox.maxY) / 2.0D, this.posZ); this.moveEntity(this.motionX, this.motionY, this.motionZ); boolean flag = (int) this.prevPosX != (int) this.posX || (int) this.prevPosY != (int) this.posY - || (int) this.prevPosZ != (int) this.posZ; + || (int) this.prevPosZ != (int) this.posZ; if (flag || this.ticksExisted % 25 == 0) { - if (this.worldObj.getBlock( + if (this.worldObj + .getBlock( MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), - MathHelper.floor_double(this.posZ)).getMaterial() == Material.lava) { + MathHelper.floor_double(this.posZ)) + .getMaterial() == Material.lava) { this.motionY = 0.20000000298023224D; this.motionX = (double) ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); this.motionZ = (double) ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); @@ -82,9 +84,9 @@ public void onUpdate() { float f = 0.98F; if (this.onGround) f = this.worldObj.getBlock( - MathHelper.floor_double(this.posX), - MathHelper.floor_double(this.boundingBox.minY) - 1, - MathHelper.floor_double(this.posZ)).slipperiness * 0.98F; + MathHelper.floor_double(this.posX), + MathHelper.floor_double(this.boundingBox.minY) - 1, + MathHelper.floor_double(this.posZ)).slipperiness * 0.98F; this.motionX *= (double) f; this.motionY *= 0.9800000190734863D; @@ -100,7 +102,7 @@ public void onUpdate() { } if (ticksExisted % 60 == 0 && !isDead) { List nearby = worldObj - .getEntitiesWithinAABB(EntityLootBall.class, this.boundingBox.expand(1.0F, 1.0F, 1.0F)); + .getEntitiesWithinAABB(EntityLootBall.class, this.boundingBox.expand(1.0F, 1.0F, 1.0F)); for (EntityLootBall e : nearby) { mergeWith(e); } @@ -115,7 +117,8 @@ public void mergeWith(EntityLootBall other) { } other.setDead(); items.addAll(Lists.newArrayList(other.getItemList())); - other.getItemList().clear(); + other.getItemList() + .clear(); ItemHelper.compactItemList(items); } @@ -162,10 +165,10 @@ public void onCollideWithPlayer(EntityPlayer player) { if (playSound) { this.worldObj.playSoundAtEntity( - player, - "random.pop", - 0.2F, - ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + player, + "random.pop", + 0.2F, + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } if (list.size() > 0) { @@ -236,10 +239,10 @@ public void onCollideWithPlayer(EntityPlayer player) { if (playSound) { this.worldObj.playSoundAtEntity( - player, - "random.pop", - 0.2F, - ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + player, + "random.pop", + 0.2F, + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } if (list.size() > 0) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityMobRandomizer.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityMobRandomizer.java index 230de9195..83e1a1cbb 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityMobRandomizer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityMobRandomizer.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.ParticlePKT; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +8,10 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.ParticlePKT; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.WorldHelper; public class EntityMobRandomizer extends PEProjectile { @@ -30,7 +29,7 @@ public void onUpdate() { if (!this.worldObj.isRemote) { if (ticksExisted > 400 || this.isInWater() - || !this.worldObj.blockExists(((int) this.posX), ((int) this.posY), ((int) this.posZ))) { + || !this.worldObj.blockExists(((int) this.posX), ((int) this.posY), ((int) this.posZ))) { this.setDead(); } } @@ -63,15 +62,15 @@ protected void apply(MovingObjectPosition mop) { for (int i = 0; i < 4; i++) { PacketHandler.sendToAllAround( - new ParticlePKT( - "portal", - ent.posX + (this.rand.nextDouble() - 0.5D) * (double) ent.width, - ent.posY + this.rand.nextDouble() * (double) ent.height - 0.25D, - ent.posZ + (this.rand.nextDouble() - 0.5D) * (double) ent.width, - (this.rand.nextDouble() - 0.5D) * 2.0D, - -this.rand.nextDouble(), - (this.rand.nextDouble() - 0.5D) * 2.0D), - new TargetPoint(this.worldObj.provider.dimensionId, ent.posX, ent.posY, ent.posZ, 32)); + new ParticlePKT( + "portal", + ent.posX + (this.rand.nextDouble() - 0.5D) * (double) ent.width, + ent.posY + this.rand.nextDouble() * (double) ent.height - 0.25D, + ent.posZ + (this.rand.nextDouble() - 0.5D) * (double) ent.width, + (this.rand.nextDouble() - 0.5D) * 2.0D, + -this.rand.nextDouble(), + (this.rand.nextDouble() - 0.5D) * 2.0D), + new TargetPoint(this.worldObj.provider.dimensionId, ent.posX, ent.posY, ent.posZ, 32)); } } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCataclysmPrimed.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCataclysmPrimed.java index bd042ed17..a82cc1c0c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCataclysmPrimed.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCataclysmPrimed.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.world.World; +import moze_intel.projecte.utils.WorldHelper; + public class EntityNovaCataclysmPrimed extends EntityTNTPrimed { public EntityNovaCataclysmPrimed(World world) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCatalystPrimed.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCatalystPrimed.java index 22f1f368b..9df767a6e 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCatalystPrimed.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityNovaCatalystPrimed.java @@ -1,11 +1,11 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.world.World; +import moze_intel.projecte.utils.WorldHelper; + public class EntityNovaCatalystPrimed extends EntityTNTPrimed { public EntityNovaCatalystPrimed(World world) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntitySWRGProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntitySWRGProjectile.java index 3f4a1e70f..f0fc12a7b 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntitySWRGProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntitySWRGProjectile.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.block.Block; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; @@ -10,6 +7,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.items.ItemPE; + public class EntitySWRGProjectile extends PEProjectile { public EntitySWRGProjectile(World world) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityWaterProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityWaterProjectile.java index 00514eeac..3b8615fc2 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/EntityWaterProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/EntityWaterProjectile.java @@ -1,7 +1,5 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,8 @@ import net.minecraft.world.storage.WorldInfo; import net.minecraftforge.common.util.ForgeDirection; +import moze_intel.projecte.utils.PlayerHelper; + public class EntityWaterProjectile extends PEProjectile { public EntityWaterProjectile(World world) { @@ -33,7 +33,7 @@ public void onUpdate() { if (!this.worldObj.isRemote) { if (ticksExisted > 400 - || !this.worldObj.blockExists(((int) this.posX), ((int) this.posY), ((int) this.posZ))) { + || !this.worldObj.blockExists(((int) this.posX), ((int) this.posY), ((int) this.posZ))) { this.setDead(); return; } @@ -48,23 +48,21 @@ public void onUpdate() { if (block == Blocks.lava) { PlayerHelper.checkedReplaceBlock(player, x, y, z, Blocks.obsidian, 0); this.worldObj.playSoundEffect( - x + 0.5, - y + 0.5, - z + 0.5, - "random.fizz", - 0.5F, - 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) - * 0.8F); + x + 0.5, + y + 0.5, + z + 0.5, + "random.fizz", + 0.5F, + 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.8F); } else if (block == Blocks.flowing_lava) { PlayerHelper.checkedReplaceBlock(player, x, y, z, Blocks.cobblestone, 0); this.worldObj.playSoundEffect( - x + 0.5, - y + 0.5, - z + 0.5, - "random.fizz", - 0.5F, - 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) - * 0.8F); + x + 0.5, + y + 0.5, + z + 0.5, + "random.fizz", + 0.5F, + 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.8F); } } @@ -92,12 +90,12 @@ protected void apply(MovingObjectPosition mop) { ForgeDirection dir = ForgeDirection.getOrientation(mop.sideHit); if (worldObj.isAirBlock(mop.blockX + dir.offsetX, mop.blockY + dir.offsetY, mop.blockZ + dir.offsetZ)) { PlayerHelper.checkedPlaceBlock( - ((EntityPlayerMP) getThrower()), - mop.blockX + dir.offsetX, - mop.blockY + dir.offsetY, - mop.blockZ + dir.offsetZ, - Blocks.flowing_water, - 0); + ((EntityPlayerMP) getThrower()), + mop.blockX + dir.offsetX, + mop.blockY + dir.offsetY, + mop.blockZ + dir.offsetZ, + Blocks.flowing_water, + 0); } } else if (mop.typeOfHit == MovingObjectType.ENTITY) { Entity ent = mop.entityHit; diff --git a/src/main/java/moze_intel/projecte/gameObjs/entity/PEProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/entity/PEProjectile.java index ecfa8afec..4895c837d 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/entity/PEProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/entity/PEProjectile.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.entity; -import moze_intel.projecte.gameObjs.items.ItemPE; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityThrowable; @@ -10,6 +7,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import moze_intel.projecte.gameObjs.items.ItemPE; +import moze_intel.projecte.utils.PlayerHelper; + public abstract class PEProjectile extends EntityThrowable { public PEProjectile(World world) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIAlchChest.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIAlchChest.java index ac12e3f90..e4f01fa25 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIAlchChest.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIAlchChest.java @@ -1,11 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.AlchBagContainer; -import moze_intel.projecte.gameObjs.container.AlchBagInventory; -import moze_intel.projecte.gameObjs.container.AlchChestContainer; -import moze_intel.projecte.gameObjs.tiles.AlchChestTile; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -13,11 +7,17 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.AlchBagContainer; +import moze_intel.projecte.gameObjs.container.AlchBagInventory; +import moze_intel.projecte.gameObjs.container.AlchChestContainer; +import moze_intel.projecte.gameObjs.tiles.AlchChestTile; + public class GUIAlchChest extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/alchchest.png"); + PECore.MODID.toLowerCase(), + "textures/gui/alchchest.png"); public GUIAlchChest(InventoryPlayer invPlayer, AlchChestTile tile) { super(new AlchChestContainer(invPlayer, tile)); diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK1.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK1.java index dbe808e1c..b39029928 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK1.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK1.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.CollectorMK1Container; -import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; -import moze_intel.projecte.utils.Constants; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +7,16 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.CollectorMK1Container; +import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; +import moze_intel.projecte.utils.Constants; + public class GUICollectorMK1 extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/collector1.png"); + PECore.MODID.toLowerCase(), + "textures/gui/collector1.png"); private CollectorMK1Tile tile; public GUICollectorMK1(InventoryPlayer invPlayer, CollectorMK1Tile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK2.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK2.java index 5281c32bb..2c4177e26 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK2.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK2.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.CollectorMK2Container; -import moze_intel.projecte.gameObjs.tiles.CollectorMK2Tile; -import moze_intel.projecte.utils.Constants; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +7,16 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.CollectorMK2Container; +import moze_intel.projecte.gameObjs.tiles.CollectorMK2Tile; +import moze_intel.projecte.utils.Constants; + public class GUICollectorMK2 extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/collector2.png"); + PECore.MODID.toLowerCase(), + "textures/gui/collector2.png"); private CollectorMK2Tile tile; public GUICollectorMK2(InventoryPlayer invPlayer, CollectorMK2Tile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK3.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK3.java index 81855b87f..3035a7b6d 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK3.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICollectorMK3.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.CollectorMK3Container; -import moze_intel.projecte.gameObjs.tiles.CollectorMK3Tile; -import moze_intel.projecte.utils.Constants; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +7,16 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.CollectorMK3Container; +import moze_intel.projecte.gameObjs.tiles.CollectorMK3Tile; +import moze_intel.projecte.utils.Constants; + public class GUICollectorMK3 extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/collector3.png"); + PECore.MODID.toLowerCase(), + "textures/gui/collector3.png"); private CollectorMK3Tile tile; public GUICollectorMK3(InventoryPlayer invPlayer, CollectorMK3Tile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenser.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenser.java index 9da7ebd2a..ffbcc70fa 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenser.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenser.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.CondenserContainer; -import moze_intel.projecte.gameObjs.tiles.CondenserTile; -import moze_intel.projecte.utils.TransmutationEMCFormatter; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +7,16 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.CondenserContainer; +import moze_intel.projecte.gameObjs.tiles.CondenserTile; +import moze_intel.projecte.utils.TransmutationEMCFormatter; + public class GUICondenser extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/condenser.png"); + PECore.MODID.toLowerCase(), + "textures/gui/condenser.png"); private CondenserTile tile; public GUICondenser(InventoryPlayer invPlayer, CondenserTile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenserMK2.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenserMK2.java index 8f4967db5..b08c6a502 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenserMK2.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUICondenserMK2.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.CondenserMK2Container; -import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; -import moze_intel.projecte.utils.TransmutationEMCFormatter; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +7,16 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.CondenserMK2Container; +import moze_intel.projecte.gameObjs.tiles.CondenserMK2Tile; +import moze_intel.projecte.utils.TransmutationEMCFormatter; + public class GUICondenserMK2 extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/condenser_mk2.png"); + PECore.MODID.toLowerCase(), + "textures/gui/condenser_mk2.png"); private CondenserMK2Tile tile; public GUICondenserMK2(InventoryPlayer invPlayer, CondenserMK2Tile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIDMFurnace.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIDMFurnace.java index 73d760c50..52d0af520 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIDMFurnace.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIDMFurnace.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.DMFurnaceContainer; -import moze_intel.projecte.gameObjs.tiles.DMFurnaceTile; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +8,15 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.DMFurnaceContainer; +import moze_intel.projecte.gameObjs.tiles.DMFurnaceTile; + public class GUIDMFurnace extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/dmfurnace.png"); + PECore.MODID.toLowerCase(), + "textures/gui/dmfurnace.png"); private DMFurnaceTile tile; public GUIDMFurnace(InventoryPlayer invPlayer, DMFurnaceTile tile) { @@ -49,6 +49,6 @@ protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { protected void drawGuiContainerForegroundLayer(int var1, int var2) { this.fontRendererObj.drawString(StatCollector.translateToLocal("pe.dmfurnace.shortname"), 57, 5, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("container.inventory"), 57, ySize - 96 + 2, 4210752); + .drawString(StatCollector.translateToLocal("container.inventory"), 57, ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIEternalDensity.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIEternalDensity.java index 0e301e9d4..b7c40b6d5 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIEternalDensity.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIEternalDensity.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.EternalDensityContainer; -import moze_intel.projecte.gameObjs.container.inventory.EternalDensityInventory; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -13,11 +9,15 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.EternalDensityContainer; +import moze_intel.projecte.gameObjs.container.inventory.EternalDensityInventory; + public class GUIEternalDensity extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/eternal_density.png"); + PECore.MODID.toLowerCase(), + "textures/gui/eternal_density.png"); private EternalDensityInventory inventory; public GUIEternalDensity(InventoryPlayer invPlayer, EternalDensityInventory invGem) { @@ -34,13 +34,13 @@ public void initGui() { super.initGui(); this.buttonList.add( - new GuiButton( - 1, - (width - xSize) / 2 + 62, - (height - ySize) / 2 + 4, - 52, - 20, - inventory.isWhitelistMode() ? "Whitelist" : "Blacklist")); + new GuiButton( + 1, + (width - xSize) / 2 + 62, + (height - ySize) / 2 + 4, + 52, + 20, + inventory.isWhitelistMode() ? "Whitelist" : "Blacklist")); } @Override @@ -50,7 +50,7 @@ protected void actionPerformed(GuiButton button) { inventory.changeMode(); button.displayString = StatCollector - .translateToLocal(inventory.isWhitelistMode() ? "pe.gemdensity.whitelist" : "pe.gemdensity.blacklist"); + .translateToLocal(inventory.isWhitelistMode() ? "pe.gemdensity.whitelist" : "pe.gemdensity.blacklist"); } @Override diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIManual.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIManual.java index 5a59b6e93..4ed1c492c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIManual.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIManual.java @@ -4,15 +4,6 @@ import java.util.Iterator; import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.manual.AbstractPage; -import moze_intel.projecte.manual.ImagePage; -import moze_intel.projecte.manual.IndexPage; -import moze_intel.projecte.manual.ItemPage; -import moze_intel.projecte.manual.ManualFontRenderer; -import moze_intel.projecte.manual.ManualPageHandler; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -32,6 +23,14 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.manual.AbstractPage; +import moze_intel.projecte.manual.ImagePage; +import moze_intel.projecte.manual.IndexPage; +import moze_intel.projecte.manual.ItemPage; +import moze_intel.projecte.manual.ManualFontRenderer; +import moze_intel.projecte.manual.ManualPageHandler; +import moze_intel.projecte.utils.PELogger; @SideOnly(Side.CLIENT) public class GUIManual extends GuiScreen { @@ -83,28 +82,28 @@ public void initGui() { GL11.glScalef(1 / GUI_SCALE_FACTOR, 1, 1 / GUI_SCALE_FACTOR); this.buttonList.add( - new PageTurnButton( - 0, - Math.round((k + 256 - 40) * GUI_SCALE_FACTOR), - PAGE_HEIGHT - Math.round(BUTTON_HEIGHT * 1.4f), - true)); + new PageTurnButton( + 0, + Math.round((k + 256 - 40) * GUI_SCALE_FACTOR), + PAGE_HEIGHT - Math.round(BUTTON_HEIGHT * 1.4f), + true)); this.buttonList.add( - new PageTurnButton( - 1, - Math.round((k + 20) * GUI_SCALE_FACTOR), - PAGE_HEIGHT - Math.round(BUTTON_HEIGHT * 1.4f), - false)); + new PageTurnButton( + 1, + Math.round((k + 20) * GUI_SCALE_FACTOR), + PAGE_HEIGHT - Math.round(BUTTON_HEIGHT * 1.4f), + false)); String text = StatCollector.translateToLocal("pe.manual.index_button"); int stringWidth = mc.fontRenderer.getStringWidth(text); this.buttonList.add( - new TocButton( - 2, - (this.width / 2) - (stringWidth / 2), - PAGE_HEIGHT - Math.round(BUTTON_HEIGHT * 1.3f), - stringWidth, - 15, - text)); + new TocButton( + 2, + (this.width / 2) - (stringWidth / 2), + PAGE_HEIGHT - Math.round(BUTTON_HEIGHT * 1.3f), + stringWidth, + 15, + text)); addIndexButtons(Math.round((k + 20) * GUI_SCALE_FACTOR)); currentSpread = 0; @@ -116,14 +115,17 @@ public void initGui() { public void drawScreen(int mouseX, int mouseY, float partialTicks) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(BOOK_TEXTURE); + this.mc.getTextureManager() + .bindTexture(BOOK_TEXTURE); GL11.glScalef(GUI_SCALE_FACTOR, 1, GUI_SCALE_FACTOR); this.drawTexturedModalRect(k, 5, 0, 0, WINDOW_WIDTH, PAGE_HEIGHT); GL11.glScalef(1 / GUI_SCALE_FACTOR, 1, 1 / GUI_SCALE_FACTOR); - AbstractPage currentPage = ManualPageHandler.spreads.get(currentSpread).getLeft(); - AbstractPage nextPage = ManualPageHandler.spreads.get(currentSpread).getRight(); + AbstractPage currentPage = ManualPageHandler.spreads.get(currentSpread) + .getLeft(); + AbstractPage nextPage = ManualPageHandler.spreads.get(currentSpread) + .getRight(); if (currentPage != null) drawPage(currentPage, k + 40, k + 20); if (nextPage != null) drawPage(nextPage, k + 160, k + 140); @@ -151,11 +153,13 @@ protected void actionPerformed(GuiButton button) { default: int val = Math.round((button.id - 3) / 2.0F); PELogger.logDebug( - "Clicked button %d which is supposed to be page %d, taking you to spread %d which has page %d on the left", - button.id, - button.id - 3, - val, - ManualPageHandler.pages.indexOf(ManualPageHandler.spreads.get(val).getLeft())); + "Clicked button %d which is supposed to be page %d, taking you to spread %d which has page %d on the left", + button.id, + button.id - 3, + val, + ManualPageHandler.pages.indexOf( + ManualPageHandler.spreads.get(val) + .getLeft())); currentSpread = val; } this.updateButtons(); @@ -172,9 +176,9 @@ private void updateButtons() { // Display if the indexLinks map has this button for the current spread, handling nulls on the right as // necessary ((IndexLinkButton) buttonList.get(i)).visible = indexLinks.get(((IndexPage) spread.getLeft())) - .contains(buttonList.get(i)) - || (spread.getRight() != null - && indexLinks.get(((IndexPage) spread.getRight())).contains(buttonList.get(i))); + .contains(buttonList.get(i)) + || (spread.getRight() != null && indexLinks.get(((IndexPage) spread.getRight())) + .contains(buttonList.get(i))); } } else if (currentSpread == ManualPageHandler.spreads.size() - 1) { ((PageTurnButton) this.buttonList.get(0)).visible = false; @@ -238,12 +242,12 @@ private void addIndexButtons(int x) { String text = page.getHeaderText(); int buttonID = ManualPageHandler.pages.indexOf(page) + BUTTON_ID_OFFSET; IndexLinkButton button = new IndexLinkButton( - buttonID, - x, - yOffset, - mc.fontRenderer.getStringWidth(text), - CHARACTER_HEIGHT, - text); + buttonID, + x, + yOffset, + mc.fontRenderer.getStringWidth(text), + CHARACTER_HEIGHT, + text); buttonList.add(button); indexLinks.put(addingTo, button); @@ -254,7 +258,8 @@ private void addIndexButtons(int x) { } private boolean isViewingIndex() { - return ManualPageHandler.spreads.get(currentSpread).getLeft() instanceof IndexPage; + return ManualPageHandler.spreads.get(currentSpread) + .getLeft() instanceof IndexPage; } // Header = k+40, k+160, Image/Text = k+20, k+140 @@ -269,23 +274,26 @@ public void drawPage(AbstractPage page, int headerX, int contentX) { bodyTexts = splitBody(page.getBodyText()); for (int i = 0; i < bodyTexts.size() - && i < Math.floor(GUIManual.TEXT_HEIGHT / GUIManual.TEXT_Y_OFFSET); i++) { + && i < Math.floor(GUIManual.TEXT_HEIGHT / GUIManual.TEXT_Y_OFFSET); i++) { this.fontRendererObj.drawString( - bodyTexts.get(i).charAt(0) == 32 ? bodyTexts.get(i).substring(1) : bodyTexts.get(i), - Math.round(contentX * GUI_SCALE_FACTOR), - 43 + TEXT_Y_OFFSET * i, - Color.black.getRGB()); + bodyTexts.get(i) + .charAt(0) == 32 ? bodyTexts.get(i) + .substring(1) : bodyTexts.get(i), + Math.round(contentX * GUI_SCALE_FACTOR), + 43 + TEXT_Y_OFFSET * i, + Color.black.getRGB()); } if (page instanceof ItemPage) { ItemPage itemPage = ((ItemPage) page); drawItemStackToGui( - mc, - itemPage.getItemStack(), - Math.round(contentX * GUI_SCALE_FACTOR), - 22, - !(itemPage.getItemStack().getItem() instanceof ItemBlock) - || itemPage.getItemStack().getItem() == Item.getItemFromBlock(ObjHandler.confuseTorch)); + mc, + itemPage.getItemStack(), + Math.round(contentX * GUI_SCALE_FACTOR), + 22, + !(itemPage.getItemStack() + .getItem() instanceof ItemBlock) || itemPage.getItemStack() + .getItem() == Item.getItemFromBlock(ObjHandler.confuseTorch)); } } } @@ -329,10 +337,11 @@ public PageTurnButton(int ID, int xPos, int yPos, boolean par4) { public void drawButton(Minecraft mc, int mouseX, int mouseY) { if (this.visible) { boolean hover = mouseX >= this.xPosition && mouseY >= this.yPosition - && mouseX < this.xPosition + this.width - && mouseY < this.yPosition + this.height; + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.getTextureManager().bindTexture(bookGui); + mc.getTextureManager() + .bindTexture(bookGui); int u = 0; int v = 192; diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIMercurialEye.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIMercurialEye.java index 3ef585485..d3926520e 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIMercurialEye.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIMercurialEye.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.MercurialEyeContainer; -import moze_intel.projecte.gameObjs.container.inventory.MercurialEyeInventory; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -11,11 +7,15 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.MercurialEyeContainer; +import moze_intel.projecte.gameObjs.container.inventory.MercurialEyeInventory; + public class GUIMercurialEye extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/mercurial_eye.png"); + PECore.MODID.toLowerCase(), + "textures/gui/mercurial_eye.png"); private MercurialEyeInventory inventory; public GUIMercurialEye(InventoryPlayer invPlayer, MercurialEyeInventory inventory) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPedestal.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPedestal.java index 7bdaedfb2..227f3d01b 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPedestal.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPedestal.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.PedestalContainer; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -11,6 +7,10 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.PedestalContainer; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; + public class GUIPedestal extends GuiContainer { private ResourceLocation texture = new ResourceLocation(PECore.MODID.toLowerCase(), "textures/gui/pedestal.png"); @@ -24,7 +24,9 @@ public GUIPedestal(InventoryPlayer inventory, DMPedestalTile tile) { @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + Minecraft.getMinecraft() + .getTextureManager() + .bindTexture(texture); int x = (width - xSize) / 2; int y = (height - ySize) / 2; diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPhilosStone.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPhilosStone.java index b53fcbdb9..83d9285f0 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPhilosStone.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIPhilosStone.java @@ -1,7 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.gameObjs.container.PhilosStoneContainer; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -11,12 +9,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.container.PhilosStoneContainer; @SideOnly(Side.CLIENT) public class GUIPhilosStone extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - "textures/gui/container/crafting_table.png"); + "textures/gui/container/crafting_table.png"); public GUIPhilosStone(InventoryPlayer inventoryPlayer) { super(new PhilosStoneContainer(inventoryPlayer)); @@ -25,12 +24,13 @@ public GUIPhilosStone(InventoryPlayer inventoryPlayer) { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { this.fontRendererObj.drawString(StatCollector.translateToLocal("container.crafting"), 28, 6, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + .drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(craftingTableGuiTextures); + this.mc.getTextureManager() + .bindTexture(craftingTableGuiTextures); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRMFurnace.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRMFurnace.java index 43a820bee..575dd7f2f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRMFurnace.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRMFurnace.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.RMFurnaceContainer; -import moze_intel.projecte.gameObjs.tiles.RMFurnaceTile; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +8,15 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.RMFurnaceContainer; +import moze_intel.projecte.gameObjs.tiles.RMFurnaceTile; + public class GUIRMFurnace extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/rmfurnace.png"); + PECore.MODID.toLowerCase(), + "textures/gui/rmfurnace.png"); private RMFurnaceTile tile; public GUIRMFurnace(InventoryPlayer invPlayer, RMFurnaceTile tile) { @@ -51,6 +51,6 @@ protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { protected void drawGuiContainerForegroundLayer(int var1, int var2) { this.fontRendererObj.drawString(StatCollector.translateToLocal("pe.rmfurnace.shortname"), 76, 5, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("container.inventory"), 76, ySize - 96 + 2, 4210752); + .drawString(StatCollector.translateToLocal("container.inventory"), 76, ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK1.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK1.java index 6d465707a..55a0600a7 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK1.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK1.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.RelayMK1Container; -import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +8,15 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.RelayMK1Container; +import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; + public class GUIRelayMK1 extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/relay1.png"); + PECore.MODID.toLowerCase(), + "textures/gui/relay1.png"); private RelayMK1Tile tile; public GUIRelayMK1(InventoryPlayer invPlayer, RelayMK1Tile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK2.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK2.java index b9a97af88..76babfea4 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK2.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK2.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.RelayMK2Container; -import moze_intel.projecte.gameObjs.tiles.RelayMK2Tile; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +8,15 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.RelayMK2Container; +import moze_intel.projecte.gameObjs.tiles.RelayMK2Tile; + public class GUIRelayMK2 extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/relay2.png"); + PECore.MODID.toLowerCase(), + "textures/gui/relay2.png"); private RelayMK2Tile tile; public GUIRelayMK2(InventoryPlayer invPlayer, RelayMK2Tile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK3.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK3.java index 7f4b5e16c..9bdf3a308 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK3.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUIRelayMK3.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.gui; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.RelayMK3Container; -import moze_intel.projecte.gameObjs.tiles.RelayMK3Tile; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,11 +8,15 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.RelayMK3Container; +import moze_intel.projecte.gameObjs.tiles.RelayMK3Tile; + public class GUIRelayMK3 extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/relay3.png"); + PECore.MODID.toLowerCase(), + "textures/gui/relay3.png"); private RelayMK3Tile tile; public GUIRelayMK3(InventoryPlayer invPlayer, RelayMK3Tile tile) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/gui/GUITransmutation.java b/src/main/java/moze_intel/projecte/gameObjs/gui/GUITransmutation.java index 9922b5a13..f307298da 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/gui/GUITransmutation.java +++ b/src/main/java/moze_intel/projecte/gameObjs/gui/GUITransmutation.java @@ -2,11 +2,6 @@ import java.util.Locale; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.container.TransmutationContainer; -import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; -import moze_intel.projecte.utils.TransmutationEMCFormatter; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -17,11 +12,16 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.container.TransmutationContainer; +import moze_intel.projecte.gameObjs.container.inventory.TransmutationInventory; +import moze_intel.projecte.utils.TransmutationEMCFormatter; + public class GUITransmutation extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/gui/transmute.png"); + PECore.MODID.toLowerCase(), + "textures/gui/transmute.png"); TransmutationInventory inv; private GuiTextField textBoxFilter; @@ -68,44 +68,44 @@ protected void drawGuiContainerForegroundLayer(int var1, int var2) { if (inv.learnFlag > 0) { this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned0"), 98, 30, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned0"), 98, 30, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned1"), 99, 38, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned1"), 99, 38, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned2"), 100, 46, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned2"), 100, 46, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned3"), 101, 54, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned3"), 101, 54, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned4"), 102, 62, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned4"), 102, 62, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned5"), 103, 70, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned5"), 103, 70, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned6"), 104, 78, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned6"), 104, 78, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.learned7"), 107, 86, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.learned7"), 107, 86, 4210752); inv.learnFlag--; } if (inv.unlearnFlag > 0) { this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned0"), 97, 22, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned0"), 97, 22, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned1"), 98, 30, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned1"), 98, 30, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned2"), 99, 38, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned2"), 99, 38, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned3"), 100, 46, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned3"), 100, 46, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned4"), 101, 54, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned4"), 101, 54, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned5"), 102, 62, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned5"), 102, 62, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned6"), 103, 70, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned6"), 103, 70, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned7"), 104, 78, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned7"), 104, 78, 4210752); this.fontRendererObj - .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned8"), 107, 86, 4210752); + .drawString(StatCollector.translateToLocal("pe.transmutation.unlearned8"), 107, 86, 4210752); inv.unlearnFlag--; } @@ -122,7 +122,8 @@ protected void keyTyped(char par1, int par2) { if (this.textBoxFilter.isFocused()) { this.textBoxFilter.textboxKeyTyped(par1, par2); - String srch = this.textBoxFilter.getText().toLowerCase(); + String srch = this.textBoxFilter.getText() + .toLowerCase(); if (!inv.filter.equals(srch)) { inv.filter = srch; @@ -132,7 +133,7 @@ protected void keyTyped(char par1, int par2) { } if (par2 == 1 - || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode() && !this.textBoxFilter.isFocused()) { + || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode() && !this.textBoxFilter.isFocused()) { this.mc.thePlayer.closeScreen(); } } @@ -165,7 +166,8 @@ public void onGuiClosed() { @Override protected void actionPerformed(GuiButton button) { - String srch = this.textBoxFilter.getText().toLowerCase(Locale.ROOT); + String srch = this.textBoxFilter.getText() + .toLowerCase(Locale.ROOT); if (button.id == 1) { if (inv.searchpage != 0) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/AlchemicalBag.java b/src/main/java/moze_intel/projecte/gameObjs/items/AlchemicalBag.java index 1c254c145..845383084 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/AlchemicalBag.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/AlchemicalBag.java @@ -2,15 +2,6 @@ import java.util.List; -import moze_intel.projecte.PECore; -import moze_intel.projecte.api.item.IAlchBagItem; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.container.AlchBagContainer; -import moze_intel.projecte.playerData.AlchemicalBags; -import moze_intel.projecte.utils.AchievementHandler; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -24,19 +15,27 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.api.item.IAlchBagItem; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.container.AlchBagContainer; +import moze_intel.projecte.playerData.AlchemicalBags; +import moze_intel.projecte.utils.AchievementHandler; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.ItemHelper; public class AlchemicalBag extends ItemPE { private final String[] colors = new String[] { "white", "orange", "magenta", "lightBlue", "yellow", "lime", "pink", - "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black" }; + "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black" }; // MC Lang files have these unlocalized names mapped to raw color names private final String[] unlocalizedColors = new String[] { "item.fireworksCharge.white", - "item.fireworksCharge.orange", "item.fireworksCharge.magenta", "item.fireworksCharge.lightBlue", - "item.fireworksCharge.yellow", "item.fireworksCharge.lime", "item.fireworksCharge.pink", - "item.fireworksCharge.gray", "item.fireworksCharge.silver", "item.fireworksCharge.cyan", - "item.fireworksCharge.purple", "item.fireworksCharge.blue", "item.fireworksCharge.brown", - "item.fireworksCharge.green", "item.fireworksCharge.red", "item.fireworksCharge.black" }; + "item.fireworksCharge.orange", "item.fireworksCharge.magenta", "item.fireworksCharge.lightBlue", + "item.fireworksCharge.yellow", "item.fireworksCharge.lime", "item.fireworksCharge.pink", + "item.fireworksCharge.gray", "item.fireworksCharge.silver", "item.fireworksCharge.cyan", + "item.fireworksCharge.purple", "item.fireworksCharge.blue", "item.fireworksCharge.brown", + "item.fireworksCharge.green", "item.fireworksCharge.red", "item.fireworksCharge.black" }; @SideOnly(Side.CLIENT) private IIcon[] icons; @@ -52,12 +51,12 @@ public AlchemicalBag() { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (!world.isRemote) { player.openGui( - PECore.instance, - Constants.ALCH_BAG_GUI, - world, - (int) player.posX, - (int) player.posY, - (int) player.posZ); + PECore.instance, + Constants.ALCH_BAG_GUI, + world, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } return stack; @@ -155,8 +154,7 @@ public static ItemStack getFirstBagWithSuctionItem(EntityPlayer player, ItemStac if (stack.getItem() == ObjHandler.alchBag) { ItemStack[] inv = AlchemicalBags.get(player, ((byte) stack.getItemDamage())); if (ItemHelper.invContainsItem(inv, new ItemStack(ObjHandler.blackHole, 1, 1)) - || ItemHelper.invContainsItem(inv, new ItemStack(ObjHandler.voidRing, 1, 1))) - return stack; + || ItemHelper.invContainsItem(inv, new ItemStack(ObjHandler.voidRing, 1, 1))) return stack; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/CataliticLens.java b/src/main/java/moze_intel/projecte/gameObjs/items/CataliticLens.java index 50a911da8..fa23aef63 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/CataliticLens.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/CataliticLens.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.items; -import moze_intel.projecte.api.item.IProjectileShooter; -import moze_intel.projecte.gameObjs.entity.EntityLensProjectile; -import moze_intel.projecte.utils.Constants; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +7,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IProjectileShooter; +import moze_intel.projecte.gameObjs.entity.EntityLensProjectile; +import moze_intel.projecte.utils.Constants; public class CataliticLens extends DestructionCatalyst implements IProjectileShooter { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/DestructionCatalyst.java b/src/main/java/moze_intel/projecte/gameObjs/items/DestructionCatalyst.java index 17b2c531a..a91b3a9cc 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/DestructionCatalyst.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/DestructionCatalyst.java @@ -2,12 +2,6 @@ import java.util.List; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.ParticlePKT; -import moze_intel.projecte.utils.Coordinates; -import moze_intel.projecte.utils.PlayerHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -25,6 +19,11 @@ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.ParticlePKT; +import moze_intel.projecte.utils.Coordinates; +import moze_intel.projecte.utils.PlayerHelper; +import moze_intel.projecte.utils.WorldHelper; public class DestructionCatalyst extends ItemCharge { @@ -82,8 +81,8 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla if (world.rand.nextInt(8) == 0) { PacketHandler.sendToAllAround( - new ParticlePKT("largesmoke", x, y, z), - new TargetPoint(world.provider.dimensionId, x, y + 1, z, 32)); + new ParticlePKT("largesmoke", x, y, z), + new TargetPoint(world.provider.dimensionId, x, y + 1, z, 32)); } } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodLow.java b/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodLow.java index 34fd87db5..e5a69ac5d 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodLow.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodLow.java @@ -5,14 +5,6 @@ import java.util.Map; import java.util.Map.Entry; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.utils.Comparators; -import moze_intel.projecte.utils.Coordinates; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.PlayerHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -32,6 +24,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.utils.Comparators; +import moze_intel.projecte.utils.Coordinates; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.PlayerHelper; +import moze_intel.projecte.utils.WorldHelper; public class DiviningRodLow extends ItemPE implements IModeChanger { @@ -72,7 +71,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla byte mode = getMode(stack); int depth = getDepthFromMode(mode); AxisAlignedBB box = WorldHelper - .getDeepBox(new Coordinates(mop), ForgeDirection.getOrientation(mop.sideHit), depth); + .getDeepBox(new Coordinates(mop), ForgeDirection.getOrientation(mop.sideHit), depth); for (int i = (int) box.minX; i <= box.maxX; i++) for (int j = (int) box.minY; j <= box.maxY; j++) for (int k = (int) box.minZ; k <= box.maxZ; k++) { @@ -92,7 +91,8 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla long blockEmc = EMCHelper.getEmcValue(blockStack); if (blockEmc == 0) { - Map map = FurnaceRecipes.smelting().getSmeltingList(); + Map map = FurnaceRecipes.smelting() + .getSmeltingList(); for (Entry entry : map.entrySet()) { if (entry == null || entry.getKey() == null) { @@ -141,7 +141,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla } player.addChatComponentMessage( - new ChatComponentTranslation("pe.divining.avgemc", numBlocks, (totalEmc / numBlocks))); + new ChatComponentTranslation("pe.divining.avgemc", numBlocks, (totalEmc / numBlocks))); if (this instanceof DiviningRodMedium) { player.addChatComponentMessage(new ChatComponentTranslation("pe.divining.maxemc", maxValues[0])); diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodMedium.java b/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodMedium.java index 93956e29c..91edecea9 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodMedium.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/DiviningRodMedium.java @@ -28,9 +28,9 @@ protected DiviningRodMedium(String[] modeDesc) { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { if (stack.hasTagCompound()) { list.add( - StatCollector.translateToLocal("pe.item.mode") + ": " - + EnumChatFormatting.AQUA - + modes[getMode(stack)]); + StatCollector.translateToLocal("pe.item.mode") + ": " + + EnumChatFormatting.AQUA + + modes[getMode(stack)]); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/EvertideAmulet.java b/src/main/java/moze_intel/projecte/gameObjs/items/EvertideAmulet.java index e60c3b70c..cd11c48c8 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/EvertideAmulet.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/EvertideAmulet.java @@ -2,18 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.api.item.IProjectileShooter; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.entity.EntityWaterProjectile; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.ClientKeyHelper; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.FluidHelper; -import moze_intel.projecte.utils.MathUtils; -import moze_intel.projecte.utils.PEKeybind; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockCauldron; import net.minecraft.client.renderer.texture.IIconRegister; @@ -34,14 +22,24 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -import baubles.api.BaubleType; -import baubles.api.IBauble; - import com.google.common.collect.Lists; +import baubles.api.BaubleType; +import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.api.item.IProjectileShooter; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.entity.EntityWaterProjectile; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.ClientKeyHelper; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.FluidHelper; +import moze_intel.projecte.utils.MathUtils; +import moze_intel.projecte.utils.PEKeybind; +import moze_intel.projecte.utils.PlayerHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class EvertideAmulet extends ItemPE implements IProjectileShooter, IBauble, IPedestalItem, IFluidContainerItem { @@ -55,7 +53,7 @@ public EvertideAmulet() { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int sideHit, - float f1, float f2, float f3) { + float f1, float f2, float f3) { if (!world.isRemote && PlayerHelper.hasEditPermission(((EntityPlayerMP) player), x, y, z)) { TileEntity tile = world.getTileEntity(x, y, z); @@ -127,22 +125,22 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla private void placeWater(World world, EntityPlayer player, int i, int j, int k) { if (world.provider.isHellWorld) { world.playSoundEffect( - (double) ((float) i + 0.5F), - (double) ((float) j + 0.5F), - (double) ((float) k + 0.5F), - "random.fizz", - 0.5F, - 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + (double) ((float) i + 0.5F), + (double) ((float) j + 0.5F), + (double) ((float) k + 0.5F), + "random.fizz", + 0.5F, + 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); for (int l = 0; l < 8; ++l) { world.spawnParticle( - "largesmoke", - (double) i + Math.random(), - (double) j + Math.random(), - (double) k + Math.random(), - 0.0D, - 0.0D, - 0.0D); + "largesmoke", + (double) i + Math.random(), + (double) j + Math.random(), + (double) k + Math.random(), + 0.0D, + 0.0D, + 0.0D); } } else { PlayerHelper.checkedPlaceBlock(((EntityPlayerMP) player), i, j, k, Blocks.flowing_water, 0); @@ -163,7 +161,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, b int z = (int) Math.floor(player.posZ); if ((world.getBlock(x, y - 1, z) == Blocks.water || world.getBlock(x, y - 1, z) == Blocks.flowing_water) - && world.getBlock(x, y, z) == Blocks.air) { + && world.getBlock(x, y, z) == Blocks.air) { if (!player.isSneaking()) { player.motionY = 0.0D; player.fallDistance = 0.0F; @@ -230,9 +228,9 @@ public void registerIcons(IIconRegister register) { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add( - String.format( - StatCollector.translateToLocal("pe.evertide.tooltip1"), - ClientKeyHelper.getKeyName(PEKeybind.FIRE_PROJECTILE))); + String.format( + StatCollector.translateToLocal("pe.evertide.tooltip1"), + ClientKeyHelper.getKeyName(PEKeybind.FIRE_PROJECTILE))); list.add(StatCollector.translateToLocal("pe.evertide.tooltip2")); list.add(StatCollector.translateToLocal("pe.evertide.tooltip3")); @@ -278,9 +276,12 @@ public void updateInPedestal(World world, int x, int y, int z) { if (tile.getActivityCooldown() == 0) { int i = (300 + world.rand.nextInt(600)) * 20; - world.getWorldInfo().setRainTime(i); - world.getWorldInfo().setThunderTime(i); - world.getWorldInfo().setRaining(true); + world.getWorldInfo() + .setRainTime(i); + world.getWorldInfo() + .setThunderTime(i); + world.getWorldInfo() + .setRaining(true); tile.setActivityCooldown(ProjectEConfig.evertidePedCooldown); } else { @@ -295,9 +296,9 @@ public List getPedestalDescription() { if (ProjectEConfig.evertidePedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.evertide.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.evertide.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.evertidePedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.evertide.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.evertidePedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/GemEternalDensity.java b/src/main/java/moze_intel/projecte/gameObjs/items/GemEternalDensity.java index 1ae6bc6aa..622d62780 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/GemEternalDensity.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/GemEternalDensity.java @@ -3,20 +3,6 @@ import java.util.ArrayList; import java.util.List; -import moze_intel.projecte.PECore; -import moze_intel.projecte.api.item.IAlchBagItem; -import moze_intel.projecte.api.item.IAlchChestItem; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.tiles.AlchChestTile; -import moze_intel.projecte.utils.ClientKeyHelper; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.PEKeybind; -import moze_intel.projecte.utils.PELogger; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -31,14 +17,26 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -import baubles.api.BaubleType; -import baubles.api.IBauble; - import com.google.common.collect.Lists; +import baubles.api.BaubleType; +import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.api.item.IAlchBagItem; +import moze_intel.projecte.api.item.IAlchChestItem; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.tiles.AlchChestTile; +import moze_intel.projecte.utils.ClientKeyHelper; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.PEKeybind; +import moze_intel.projecte.utils.PELogger; +import moze_intel.projecte.utils.WorldHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class GemEternalDensity extends ItemPE implements IAlchBagItem, IAlchChestItem, IModeChanger, IBauble { @@ -84,8 +82,8 @@ public static boolean condense(ItemStack gem, ItemStack[] inv) { ItemStack s = inv[i]; if (s == null || !EMCHelper.doesItemHaveEmc(s) - || s.getMaxStackSize() == 1 - || EMCHelper.getEmcValue(s) >= EMCHelper.getEmcValue(target)) { + || s.getMaxStackSize() == 1 + || EMCHelper.getEmcValue(s) >= EMCHelper.getEmcValue(target)) { continue; } @@ -148,12 +146,12 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla } } else { player.openGui( - PECore.instance, - Constants.ETERNAL_DENSITY_GUI, - world, - (int) player.posX, - (int) player.posY, - (int) player.posZ); + PECore.instance, + Constants.ETERNAL_DENSITY_GUI, + world, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } } @@ -190,8 +188,8 @@ private static ItemStack getTarget(ItemStack stack) { case 4: return new ItemStack(ObjHandler.matter, 1, 1); default: - PELogger.logFatal( - "Invalid target for gem of eternal density: " + stack.stackTagCompound.getByte("Target")); + PELogger + .logFatal("Invalid target for gem of eternal density: " + stack.stackTagCompound.getByte("Target")); return null; } } @@ -295,8 +293,8 @@ public void changeMode(EntityPlayer player, ItemStack stack) { } player.addChatComponentMessage( - new ChatComponentTranslation("pe.gemdensity.mode_switch").appendText(" ") - .appendSibling(new ChatComponentTranslation(getTargetName(stack)))); + new ChatComponentTranslation("pe.gemdensity.mode_switch").appendText(" ") + .appendSibling(new ChatComponentTranslation(getTargetName(stack)))); } @Override @@ -306,14 +304,14 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool if (stack.hasTagCompound()) { list.add( - String.format( - StatCollector.translateToLocal("pe.gemdensity.tooltip2"), - StatCollector.translateToLocal(getTargetName(stack)))); + String.format( + StatCollector.translateToLocal("pe.gemdensity.tooltip2"), + StatCollector.translateToLocal(getTargetName(stack)))); } list.add( - String.format( - StatCollector.translateToLocal("pe.gemdensity.tooltip3"), - ClientKeyHelper.getKeyName(PEKeybind.MODE))); + String.format( + StatCollector.translateToLocal("pe.gemdensity.tooltip3"), + ClientKeyHelper.getKeyName(PEKeybind.MODE))); list.add(StatCollector.translateToLocal("pe.gemdensity.tooltip4")); list.add(StatCollector.translateToLocal("pe.gemdensity.tooltip5")); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/HyperkineticLens.java b/src/main/java/moze_intel/projecte/gameObjs/items/HyperkineticLens.java index 57699f85e..c08c31105 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/HyperkineticLens.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/HyperkineticLens.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.items; -import moze_intel.projecte.api.item.IProjectileShooter; -import moze_intel.projecte.gameObjs.entity.EntityLensProjectile; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,6 +7,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IProjectileShooter; +import moze_intel.projecte.gameObjs.entity.EntityLensProjectile; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.PlayerHelper; public class HyperkineticLens extends ItemCharge implements IProjectileShooter { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/ItemCharge.java b/src/main/java/moze_intel/projecte/gameObjs/items/ItemCharge.java index be0ac77ed..da3a8420a 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/ItemCharge.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/ItemCharge.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items; -import moze_intel.projecte.api.item.IItemCharge; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import moze_intel.projecte.api.item.IItemCharge; + public class ItemCharge extends ItemPE implements IItemCharge { byte numCharges; @@ -57,18 +57,18 @@ public void changeCharge(EntityPlayer player, ItemStack stack) { if (player.isSneaking()) { if (currentCharge > 0) { player.worldObj.playSoundAtEntity( - player, - "projecte:item.peuncharge", - 1.0F, - 0.5F + ((0.5F / (float) numCharges) * currentCharge)); + player, + "projecte:item.peuncharge", + 1.0F, + 0.5F + ((0.5F / (float) numCharges) * currentCharge)); stack.stackTagCompound.setByte("Charge", (byte) (currentCharge - 1)); } } else if (currentCharge < numCharges) { player.worldObj.playSoundAtEntity( - player, - "projecte:item.pecharge", - 1.0F, - 0.5F + ((0.5F / (float) numCharges) * currentCharge)); + player, + "projecte:item.pecharge", + 1.0F, + 0.5F + ((0.5F / (float) numCharges) * currentCharge)); stack.stackTagCompound.setByte("Charge", (byte) (currentCharge + 1)); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/ItemMode.java b/src/main/java/moze_intel/projecte/gameObjs/items/ItemMode.java index 55100e188..4b06f17d9 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/ItemMode.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/ItemMode.java @@ -2,8 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IModeChanger; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; @@ -12,6 +10,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IModeChanger; public abstract class ItemMode extends ItemCharge implements IModeChanger { @@ -51,9 +50,9 @@ public void changeMode(EntityPlayer player, ItemStack stack) { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { if (stack.hasTagCompound() && this.numModes > 0) { list.add( - StatCollector.translateToLocal("pe.item.mode") + ": " - + EnumChatFormatting.AQUA - + getModeDescription(stack)); + StatCollector.translateToLocal("pe.item.mode") + ": " + + EnumChatFormatting.AQUA + + getModeDescription(stack)); } } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/ItemPE.java b/src/main/java/moze_intel/projecte/gameObjs/items/ItemPE.java index 954e94aba..8ff8348fa 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/ItemPE.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/ItemPE.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.EMCHelper; + public abstract class ItemPE extends Item { public ItemPE() { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/KleinStar.java b/src/main/java/moze_intel/projecte/gameObjs/items/KleinStar.java index 1ae73ca2c..3575696f9 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/KleinStar.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/KleinStar.java @@ -2,10 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.utils.AchievementHandler; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -19,6 +15,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.utils.AchievementHandler; +import moze_intel.projecte.utils.EMCHelper; public class KleinStar extends ItemPE implements IItemEmc { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/Matter.java b/src/main/java/moze_intel/projecte/gameObjs/items/Matter.java index 58c3552af..37ee1269c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/Matter.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/Matter.java @@ -2,8 +2,6 @@ import java.util.List; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +13,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.utils.AchievementHandler; public class Matter extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/MercurialEye.java b/src/main/java/moze_intel/projecte/gameObjs/items/MercurialEye.java index c01cdffba..cda617768 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/MercurialEye.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/MercurialEye.java @@ -1,11 +1,5 @@ package moze_intel.projecte.gameObjs.items; -import moze_intel.projecte.PECore; -import moze_intel.projecte.api.item.IExtraFunction; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +18,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.api.item.IExtraFunction; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.PlayerHelper; public class MercurialEye extends ItemMode implements IExtraFunction { @@ -71,7 +70,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla Vec3 look = player.getLookVec(); AxisAlignedBB box = AxisAlignedBB - .getBoundingBox(mop.blockX, mop.blockY, mop.blockZ, mop.blockX, mop.blockY, mop.blockZ); + .getBoundingBox(mop.blockX, mop.blockY, mop.blockZ, mop.blockX, mop.blockY, mop.blockZ); int dX = 0, dY = 0, dZ = 0; @@ -85,8 +84,10 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla if (lookingDown || mode == TRANSMUTATION_MODE) { box = box.expand(charge, 0, charge); dY = 1; - } else if (lookingAlongZ) box = box.expand(charge, charge * 2, 0).offset(0, charge, 0); - else box = box.expand(0, charge * 2, charge).offset(0, charge, 0); + } else if (lookingAlongZ) box = box.expand(charge, charge * 2, 0) + .offset(0, charge, 0); + else box = box.expand(0, charge * 2, charge) + .offset(0, charge, 0); break; @@ -95,8 +96,10 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla box = box.expand(charge, 0, charge); dY = -1; - } else if (lookingAlongZ) box = box.expand(charge, charge * 2, 0).offset(0, -charge, 0); - else box = box.expand(0, charge * 2, charge).offset(0, -charge, 0); + } else if (lookingAlongZ) box = box.expand(charge, charge * 2, 0) + .offset(0, -charge, 0); + else box = box.expand(0, charge * 2, charge) + .offset(0, -charge, 0); break; @@ -133,30 +136,25 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla if (mode == NORMAL_MODE && oldBlock == Blocks.air) { if (kleinEmc < reqEmc) break; if (PlayerHelper - .checkedPlaceBlock(((EntityPlayerMP) player), x, y, z, newBlock, newMeta)) { + .checkedPlaceBlock(((EntityPlayerMP) player), x, y, z, newBlock, newMeta)) { removeKleinEMC(stack, reqEmc); kleinEmc -= reqEmc; } } else if (mode == TRANSMUTATION_MODE) { if ((oldBlock == newBlock && oldMeta == newMeta) || oldBlock == Blocks.air - || world.getTileEntity(x, y, z) != null - || !EMCHelper.doesItemHaveEmc(new ItemStack(oldBlock, 1, oldMeta))) { + || world.getTileEntity(x, y, z) != null + || !EMCHelper.doesItemHaveEmc(new ItemStack(oldBlock, 1, oldMeta))) { continue; } long emc = EMCHelper.getEmcValue(new ItemStack(oldBlock, 1, oldMeta)); if (emc > reqEmc) { - if (PlayerHelper.checkedReplaceBlock( - ((EntityPlayerMP) player), - x, - y, - z, - newBlock, - newMeta)) { + if (PlayerHelper + .checkedReplaceBlock(((EntityPlayerMP) player), x, y, z, newBlock, newMeta)) { long difference = emc - reqEmc; kleinEmc += MathHelper - .clamp_double(kleinEmc, 0, EMCHelper.getKleinStarMaxEmc(inventory[0])); + .clamp_double(kleinEmc, 0, EMCHelper.getKleinStarMaxEmc(inventory[0])); addKleinEMC(stack, difference); } } else if (emc < reqEmc) { @@ -164,29 +162,29 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla if (kleinEmc >= difference) { if (PlayerHelper.checkedReplaceBlock( - ((EntityPlayerMP) player), - x, - y, - z, - newBlock, - newMeta)) { + ((EntityPlayerMP) player), + x, + y, + z, + newBlock, + newMeta)) { kleinEmc -= difference; removeKleinEMC(stack, difference); } } } else { PlayerHelper - .checkedReplaceBlock(((EntityPlayerMP) player), x, y, z, newBlock, newMeta); + .checkedReplaceBlock(((EntityPlayerMP) player), x, y, z, newBlock, newMeta); } } } } } player.worldObj.playSoundAtEntity( - player, - "projecte:item.pepower", - 1.0F, - 0.80F + ((0.20F / (float) numCharges) * charge)); + player, + "projecte:item.pepower", + 1.0F, + 0.80F + ((0.20F / (float) numCharges) * charge)); } } @@ -205,7 +203,7 @@ private void addKleinEMC(ItemStack eye, long amount) { NBTTagCompound tag = nbt.getCompoundTag("tag"); double newEmc = MathHelper - .clamp_double(tag.getDouble("StoredEMC") + amount, 0, EMCHelper.getKleinStarMaxEmc(kleinStar)); + .clamp_double(tag.getDouble("StoredEMC") + amount, 0, EMCHelper.getKleinStarMaxEmc(kleinStar)); tag.setDouble("StoredEMC", newEmc); break; @@ -245,12 +243,12 @@ private ItemStack[] getInventory(ItemStack eye) { @Override public void doExtraFunction(ItemStack stack, EntityPlayer player) { player.openGui( - PECore.instance, - Constants.MERCURIAL_GUI, - player.worldObj, - (int) player.posX, - (int) player.posY, - (int) player.posZ); + PECore.instance, + Constants.MERCURIAL_GUI, + player.worldObj, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } @Override diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/PEManual.java b/src/main/java/moze_intel/projecte/gameObjs/items/PEManual.java index e6ef8dc7e..5bfc3fc73 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/PEManual.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/PEManual.java @@ -1,7 +1,5 @@ package moze_intel.projecte.gameObjs.items; -import moze_intel.projecte.gameObjs.gui.GUIManual; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -10,6 +8,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.gui.GUIManual; public class PEManual extends ItemPE { @@ -21,7 +20,8 @@ public PEManual() { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (world.isRemote) { - FMLCommonHandler.instance().showGuiScreen(new GUIManual()); + FMLCommonHandler.instance() + .showGuiScreen(new GUIManual()); } return stack; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/PhilosophersStone.java b/src/main/java/moze_intel/projecte/gameObjs/items/PhilosophersStone.java index 1718ad2dd..9b38aea73 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/PhilosophersStone.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/PhilosophersStone.java @@ -2,6 +2,19 @@ import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Direction; +import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import moze_intel.projecte.PECore; import moze_intel.projecte.api.item.IExtraFunction; import moze_intel.projecte.api.item.IProjectileShooter; @@ -17,29 +30,15 @@ import moze_intel.projecte.utils.PlayerHelper; import moze_intel.projecte.utils.WorldTransmutations; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class PhilosophersStone extends ItemMode implements IProjectileShooter, IExtraFunction { public PhilosophersStone() { super( - "philosophers_stone", - (byte) 4, - new String[] { StatCollector.translateToLocal("pe.philstone.mode1"), - StatCollector.translateToLocal("pe.philstone.mode2"), - StatCollector.translateToLocal("pe.philstone.mode3") }); + "philosophers_stone", + (byte) 4, + new String[] { StatCollector.translateToLocal("pe.philstone.mode1"), + StatCollector.translateToLocal("pe.philstone.mode2"), + StatCollector.translateToLocal("pe.philstone.mode3") }); this.setContainerItem(this); this.setNoRepair(); } @@ -51,7 +50,7 @@ public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int blockX, int blockY, int blockZ, - int sideHit, float px, float py, float pz) { + int sideHit, float px, float py, float pz) { if (world.isRemote) { return false; } @@ -59,7 +58,7 @@ public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int MetaBlock mBlock = new MetaBlock(world, blockX, blockY, blockZ); MetaBlock result = WorldTransmutations - .getWorldTransmutation(world, blockX, blockY, blockZ, player.isSneaking()); + .getWorldTransmutation(world, blockX, blockY, blockZ, player.isSneaking()); if (result != null) { Coordinates pos = new Coordinates(blockX, blockY, blockZ); @@ -84,7 +83,7 @@ public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int } private void getAxisOrientedPanel(ForgeDirection direction, int charge, MetaBlock pointed, MetaBlock result, - Coordinates coords, World world, EntityPlayer player) { + Coordinates coords, World world, EntityPlayer player) { int side; if (direction.offsetY != 0) { @@ -99,7 +98,7 @@ private void getAxisOrientedPanel(ForgeDirection direction, int charge, MetaBloc } private void getAxisOrientedLine(ForgeDirection direction, int charge, MetaBlock pointed, MetaBlock result, - Coordinates coords, World world, EntityPlayer player) { + Coordinates coords, World world, EntityPlayer player) { int side; if (direction.offsetX != 0) { @@ -108,7 +107,7 @@ private void getAxisOrientedLine(ForgeDirection direction, int charge, MetaBlock side = 1; } else { String dir = Direction.directions[MathHelper - .floor_double((double) ((player.rotationYaw * 4F) / 360F) + 0.5D) & 3]; + .floor_double((double) ((player.rotationYaw * 4F) / 360F) + 0.5D) & 3]; if (dir.equals("NORTH") || dir.equals("SOUTH")) { side = 0; @@ -124,7 +123,7 @@ private void getAxisOrientedLine(ForgeDirection direction, int charge, MetaBlock * type 0 = cube, type 1 = panel, type 2 = line */ private void doWorldTransmutation(World world, MetaBlock pointed, MetaBlock result, Coordinates coords, int type, - int side, int charge, EntityPlayer player) { + int side, int charge, EntityPlayer player) { if (type == 0) { for (int i = coords.x - charge; i <= coords.x + charge; i++) for (int j = coords.y - charge; j <= coords.y + charge; j++) @@ -162,15 +161,15 @@ private void doWorldTransmutation(World world, MetaBlock pointed, MetaBlock resu } private void changeBlock(World world, MetaBlock pointed, MetaBlock result, int x, int y, int z, - EntityPlayer player) { + EntityPlayer player) { MetaBlock block = new MetaBlock(world, x, y, z); if (block.equals(pointed)) { PlayerHelper.checkedReplaceBlock(((EntityPlayerMP) player), x, y, z, result.getBlock(), result.getMeta()); if (world.rand.nextInt(8) == 0) { PacketHandler.sendToAllAround( - new ParticlePKT("largesmoke", x, y + 1, z), - new TargetPoint(world.provider.dimensionId, x, y + 1, z, 32)); + new ParticlePKT("largesmoke", x, y + 1, z), + new TargetPoint(world.provider.dimensionId, x, y + 1, z, 32)); } } } @@ -196,12 +195,12 @@ public boolean shootProjectile(EntityPlayer player, ItemStack stack) { public void doExtraFunction(ItemStack stack, EntityPlayer player) { if (!player.worldObj.isRemote) { player.openGui( - PECore.instance, - Constants.PHILOS_STONE_GUI, - player.worldObj, - (int) player.posX, - (int) player.posY, - (int) player.posZ); + PECore.instance, + Constants.PHILOS_STONE_GUI, + player.worldObj, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } } @@ -209,9 +208,9 @@ public void doExtraFunction(ItemStack stack, EntityPlayer player) { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add( - String.format( - StatCollector.translateToLocal("pe.philstone.tooltip1"), - ClientKeyHelper.getKeyName(PEKeybind.EXTRA_FUNCTION))); + String.format( + StatCollector.translateToLocal("pe.philstone.tooltip1"), + ClientKeyHelper.getKeyName(PEKeybind.EXTRA_FUNCTION))); } @Override diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/RepairTalisman.java b/src/main/java/moze_intel/projecte/gameObjs/items/RepairTalisman.java index 240d5f2c9..d90c0b12c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/RepairTalisman.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/RepairTalisman.java @@ -2,17 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IAlchBagItem; -import moze_intel.projecte.api.item.IAlchChestItem; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.items.rings.RingToggle; -import moze_intel.projecte.gameObjs.tiles.AlchChestTile; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.handlers.PlayerTimers; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -25,17 +14,26 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import baubles.api.BaubleType; -import baubles.api.BaublesApi; -import baubles.api.IBauble; - import com.cricketcraft.chisel.api.IChiselItem; import com.google.common.collect.Lists; +import baubles.api.BaubleType; +import baubles.api.BaublesApi; +import baubles.api.IBauble; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IAlchBagItem; +import moze_intel.projecte.api.item.IAlchChestItem; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.items.rings.RingToggle; +import moze_intel.projecte.gameObjs.tiles.AlchChestTile; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.handlers.PlayerTimers; +import moze_intel.projecte.utils.MathUtils; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class RepairTalisman extends ItemPE implements IAlchBagItem, IAlchChestItem, IBauble, IPedestalItem { @@ -70,7 +68,9 @@ public void repairAllItems(EntityPlayer player) { for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack invStack = inv.getStackInSlot(i); - if (invStack == null || invStack.getItem() instanceof IModeChanger || !invStack.getItem().isRepairable()) { + if (invStack == null || invStack.getItem() instanceof IModeChanger + || !invStack.getItem() + .isRepairable()) { continue; } @@ -103,7 +103,8 @@ public void baubleRepair(EntityPlayer player) { for (int i = 0; i < bInv.getSizeInventory(); i++) { ItemStack bInvStack = bInv.getStackInSlot(i); if (bInvStack == null || bInvStack.getItem() instanceof IModeChanger - || !bInvStack.getItem().isRepairable()) { + || !bInvStack.getItem() + .isRepairable()) { continue; } @@ -173,9 +174,9 @@ public List getPedestalDescription() { if (ProjectEConfig.repairPedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.repairtalisman.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.repairtalisman.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.repairPedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.repairtalisman.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.repairPedCooldown))); } return list; } @@ -203,7 +204,8 @@ public void updateInAlchChest(World world, int x, int y, int z, ItemStack stack) ItemStack invStack = tile.getStackInSlot(i); if (invStack == null || invStack.getItem() instanceof RingToggle - || !invStack.getItem().isRepairable()) { + || !invStack.getItem() + .isRepairable()) { continue; } @@ -245,7 +247,8 @@ public boolean updateInAlchBag(ItemStack[] inv, EntityPlayer player, ItemStack s ItemStack invStack = inv[i]; if (invStack == null || invStack.getItem() instanceof RingToggle - || !invStack.getItem().isRepairable()) { + || !invStack.getItem() + .isRepairable()) { continue; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/TimeWatch.java b/src/main/java/moze_intel/projecte/gameObjs/items/TimeWatch.java index db261a792..bf260ee25 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/TimeWatch.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/TimeWatch.java @@ -3,12 +3,6 @@ import java.util.List; import java.util.Set; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.IGrowable; @@ -30,24 +24,28 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.fluids.BlockFluidBase; -import baubles.api.BaubleType; -import baubles.api.IBauble; - import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import baubles.api.BaubleType; +import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.WorldHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class TimeWatch extends ItemCharge implements IModeChanger, IBauble, IPedestalItem { private static Set internalBlacklist = Sets.newHashSet( - "moze_intel.projecte.gameObjs.tiles.DMPedestalTile", - "Reika.ChromatiCraft.TileEntity.AOE.TileEntityAccelerator", - "com.sci.torcherino.tile.TileTorcherino", - "com.sci.torcherino.tile.TileCompressedTorcherino"); + "moze_intel.projecte.gameObjs.tiles.DMPedestalTile", + "Reika.ChromatiCraft.TileEntity.AOE.TileEntityAccelerator", + "com.sci.torcherino.tile.TileTorcherino", + "com.sci.torcherino.tile.TileCompressedTorcherino"); @SideOnly(Side.CLIENT) private IIcon ringOff; @@ -76,9 +74,9 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla setTimeBoost(stack, (byte) (current == 2 ? 0 : current + 1)); player.addChatComponentMessage( - new ChatComponentTranslation( - "pe.timewatch.mode_switch", - new ChatComponentTranslation(getTimeName(stack)).getUnformattedTextForChat())); + new ChatComponentTranslation( + "pe.timewatch.mode_switch", + new ChatComponentTranslation(getTimeName(stack)).getUnformattedTextForChat())); } return stack; @@ -100,7 +98,8 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, b byte timeControl = getTimeBoost(stack); - if (world.getGameRules().getGameRuleBooleanValue("doDaylightCycle")) { + if (world.getGameRules() + .getGameRuleBooleanValue("doDaylightCycle")) { if (timeControl == 1) { if (world.getWorldTime() + ((getCharge(stack) + 1) * 4) > Long.MAX_VALUE) { world.setWorldTime(Long.MAX_VALUE); @@ -175,7 +174,9 @@ private void speedUpTileEntities(World world, int bonusTicks, AxisAlignedBB bBox List list = WorldHelper.getTileEntitiesWithinAABB(world, bBox); for (int i = 0; i < bonusTicks; i++) { for (TileEntity tile : list) { - if (!tile.isInvalid() && !internalBlacklist.contains(tile.getClass().getName())) { + if (!tile.isInvalid() && !internalBlacklist.contains( + tile.getClass() + .getName())) { tile.updateEntity(); } } @@ -194,10 +195,10 @@ private void speedUpRandomTicks(World world, int bonusTicks, AxisAlignedBB bBox) if (block.getTickRandomly() && !(block instanceof BlockLiquid) // Don't speed vanilla non-source // blocks - dupe issues - && !(block instanceof BlockFluidBase) // Don't speed Forge fluids - just in case of dupes as - // well - && !(block instanceof IGrowable) - && !(block instanceof IPlantable) // All plants should be sped using Harvest Goddess + && !(block instanceof BlockFluidBase) // Don't speed Forge fluids - just in case of dupes as + // well + && !(block instanceof IGrowable) + && !(block instanceof IPlantable) // All plants should be sped using Harvest Goddess ) { for (int i = 0; i < bonusTicks; i++) { block.updateTick(world, x, y, z, itemRand); @@ -284,9 +285,9 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool if (stack.hasTagCompound()) { list.add( - String.format( - StatCollector.translateToLocal("pe.timewatch.mode"), - StatCollector.translateToLocal(getTimeName(stack)))); + String.format( + StatCollector.translateToLocal("pe.timewatch.mode"), + StatCollector.translateToLocal(getTimeName(stack)))); } } @@ -347,15 +348,14 @@ public List getPedestalDescription() { List list = Lists.newArrayList(); if (ProjectEConfig.timePedBonus > 0) { list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.timewatch.pedestal1"), - ProjectEConfig.timePedBonus)); + EnumChatFormatting.BLUE + String + .format(StatCollector.translateToLocal("pe.timewatch.pedestal1"), ProjectEConfig.timePedBonus)); } if (ProjectEConfig.timePedMobSlowness < 1.0F) { list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.timewatch.pedestal2"), - ProjectEConfig.timePedMobSlowness)); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.timewatch.pedestal2"), + ProjectEConfig.timePedMobSlowness)); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/Tome.java b/src/main/java/moze_intel/projecte/gameObjs/items/Tome.java index 81d00b0ff..4a3702b35 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/Tome.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/Tome.java @@ -2,8 +2,6 @@ import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; public class Tome extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/TransmutationTablet.java b/src/main/java/moze_intel/projecte/gameObjs/items/TransmutationTablet.java index b99d050af..b83242aa7 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/TransmutationTablet.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/TransmutationTablet.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.items; -import moze_intel.projecte.PECore; -import moze_intel.projecte.utils.AchievementHandler; -import moze_intel.projecte.utils.Constants; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +7,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.utils.AchievementHandler; +import moze_intel.projecte.utils.Constants; public class TransmutationTablet extends ItemPE { @@ -23,12 +22,12 @@ public TransmutationTablet() { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (!world.isRemote) { player.openGui( - PECore.instance, - Constants.TRANSMUTATION_GUI, - world, - (int) player.posX, - (int) player.posY, - (int) player.posZ); + PECore.instance, + Constants.TRANSMUTATION_GUI, + world, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } return stack; diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/VolcaniteAmulet.java b/src/main/java/moze_intel/projecte/gameObjs/items/VolcaniteAmulet.java index acf8e7d92..c984cef88 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/VolcaniteAmulet.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/VolcaniteAmulet.java @@ -2,18 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.api.item.IProjectileShooter; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.entity.EntityLavaProjectile; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.ClientKeyHelper; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.FluidHelper; -import moze_intel.projecte.utils.MathUtils; -import moze_intel.projecte.utils.PEKeybind; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -29,14 +17,24 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.IFluidHandler; -import baubles.api.BaubleType; -import baubles.api.IBauble; - import com.google.common.collect.Lists; +import baubles.api.BaubleType; +import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.api.item.IProjectileShooter; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.entity.EntityLavaProjectile; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.ClientKeyHelper; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.FluidHelper; +import moze_intel.projecte.utils.MathUtils; +import moze_intel.projecte.utils.PEKeybind; +import moze_intel.projecte.utils.PlayerHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class VolcaniteAmulet extends ItemPE implements IProjectileShooter, IBauble, IPedestalItem, IFireProtector { @@ -49,7 +47,7 @@ public VolcaniteAmulet() { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int sideHit, - float f1, float f2, float f3) { + float f1, float f2, float f3) { if (!world.isRemote && PlayerHelper.hasEditPermission(((EntityPlayerMP) player), x, y, z)) { TileEntity tile = world.getTileEntity(x, y, z); @@ -128,7 +126,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, b int z = (int) Math.floor(player.posZ); if ((world.getBlock(x, y - 1, z) == Blocks.lava || world.getBlock(x, y - 1, z) == Blocks.flowing_lava) - && world.getBlock(x, y, z) == Blocks.air) { + && world.getBlock(x, y, z) == Blocks.air) { if (!player.isSneaking()) { player.motionY = 0.0D; player.fallDistance = 0.0F; @@ -167,9 +165,9 @@ public void registerIcons(IIconRegister register) { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add( - String.format( - StatCollector.translateToLocal("pe.volcanite.tooltip1"), - ClientKeyHelper.getKeyName(PEKeybind.FIRE_PROJECTILE))); + String.format( + StatCollector.translateToLocal("pe.volcanite.tooltip1"), + ClientKeyHelper.getKeyName(PEKeybind.FIRE_PROJECTILE))); list.add(StatCollector.translateToLocal("pe.volcanite.tooltip2")); list.add(StatCollector.translateToLocal("pe.volcanite.tooltip3")); list.add(StatCollector.translateToLocal("pe.volcanite.tooltip4")); @@ -196,7 +194,7 @@ public void onWornTick(ItemStack stack, EntityLivingBase ent) { int z = (int) Math.floor(player.posZ); if ((world.getBlock(x, y - 1, z) == Blocks.lava || world.getBlock(x, y - 1, z) == Blocks.flowing_lava) - && world.getBlock(x, y, z) == Blocks.air) { + && world.getBlock(x, y, z) == Blocks.air) { if (!player.isSneaking()) { player.motionY = 0.0D; player.fallDistance = 0.0F; @@ -238,10 +236,14 @@ public void updateInPedestal(World world, int x, int y, int z) { if (!world.isRemote && ProjectEConfig.volcanitePedCooldown != -1) { DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z)); if (tile.getActivityCooldown() == 0) { - world.getWorldInfo().setRainTime(0); - world.getWorldInfo().setThunderTime(0); - world.getWorldInfo().setRaining(false); - world.getWorldInfo().setThundering(false); + world.getWorldInfo() + .setRainTime(0); + world.getWorldInfo() + .setThunderTime(0); + world.getWorldInfo() + .setRaining(false); + world.getWorldInfo() + .setThundering(false); tile.setActivityCooldown(ProjectEConfig.volcanitePedCooldown); } else { @@ -256,9 +258,9 @@ public List getPedestalDescription() { if (ProjectEConfig.volcanitePedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.volcanite.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.volcanite.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.volcanitePedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.volcanite.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.volcanitePedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/armor/DMArmor.java b/src/main/java/moze_intel/projecte/gameObjs/items/armor/DMArmor.java index 354fdaae2..9ea0b1d23 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/armor/DMArmor.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/armor/DMArmor.java @@ -2,9 +2,6 @@ import java.util.Locale; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.EnumArmorType; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +13,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.EnumArmorType; public class DMArmor extends ItemArmor implements ISpecialArmor { @@ -33,7 +32,7 @@ public DMArmor(EnumArmorType armorPiece) { @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, - int slot) { + int slot) { EnumArmorType type = ((DMArmor) armor.getItem()).armorPiece; if (source.isExplosion()) { return new ArmorProperties(1, 1.0D, 350); diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemArmorBase.java b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemArmorBase.java index be9c504f2..22ef016fb 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemArmorBase.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemArmorBase.java @@ -2,9 +2,6 @@ import java.util.Locale; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.EnumArmorType; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +13,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.EnumArmorType; public abstract class GemArmorBase extends ItemArmor implements ISpecialArmor { @@ -50,7 +49,7 @@ public static boolean hasFullSet(EntityPlayer player) { @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, - int slot) { + int slot) { EnumArmorType type = ((GemArmorBase) armor.getItem()).armorPiece; if (source.isExplosion()) { return new ArmorProperties(1, 1.0D, 750); diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemChest.java b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemChest.java index fc6360feb..734ec4eb0 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemChest.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemChest.java @@ -2,12 +2,6 @@ import java.util.List; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.items.IFireProtector; -import moze_intel.projecte.handlers.PlayerTimers; -import moze_intel.projecte.utils.EnumArmorType; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -18,6 +12,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.items.IFireProtector; +import moze_intel.projecte.handlers.PlayerTimers; +import moze_intel.projecte.utils.EnumArmorType; +import moze_intel.projecte.utils.WorldHelper; public class GemChest extends GemArmorBase implements IFireProtector { @@ -40,7 +39,8 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack chest) { Block b = world.getBlock(x, y - 1, z); - if ((b == Blocks.lava || b == Blocks.flowing_lava) && world.getBlock(x, y, z).equals(Blocks.air)) { + if ((b == Blocks.lava || b == Blocks.flowing_lava) && world.getBlock(x, y, z) + .equals(Blocks.air)) { if (!player.isSneaking()) { player.motionY = 0.0d; player.fallDistance = 0.0f; @@ -51,8 +51,10 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack chest) { EntityPlayerMP playerMP = ((EntityPlayerMP) player); PlayerTimers.activateFeed(playerMP); - if (player.getFoodStats().needFood() && PlayerTimers.canFeed(playerMP)) { - player.getFoodStats().addStats(2, 10); + if (player.getFoodStats() + .needFood() && PlayerTimers.canFeed(playerMP)) { + player.getFoodStats() + .addStats(2, 10); } } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemFeet.java b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemFeet.java index 2364ffb78..8727d015c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemFeet.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemFeet.java @@ -2,14 +2,6 @@ import java.util.List; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.items.IFlightProvider; -import moze_intel.projecte.gameObjs.items.IStepAssister; -import moze_intel.projecte.utils.ChatHelper; -import moze_intel.projecte.utils.ClientKeyHelper; -import moze_intel.projecte.utils.EnumArmorType; -import moze_intel.projecte.utils.PEKeybind; - import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; @@ -25,6 +17,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.items.IFlightProvider; +import moze_intel.projecte.gameObjs.items.IStepAssister; +import moze_intel.projecte.utils.ChatHelper; +import moze_intel.projecte.utils.ClientKeyHelper; +import moze_intel.projecte.utils.EnumArmorType; +import moze_intel.projecte.utils.PEKeybind; public class GemFeet extends GemArmorBase implements IFlightProvider, IStepAssister { @@ -50,8 +49,8 @@ public void toggleStepAssist(ItemStack boots, EntityPlayer player) { EnumChatFormatting e = value ? EnumChatFormatting.GREEN : EnumChatFormatting.RED; String s = value ? "pe.gem.enabled" : "pe.gem.disabled"; player.addChatMessage( - new ChatComponentTranslation("pe.gem.stepassist_tooltip").appendText(" ") - .appendSibling(ChatHelper.modifyColor(new ChatComponentTranslation(s), e))); + new ChatComponentTranslation("pe.gem.stepassist_tooltip").appendText(" ") + .appendSibling(ChatHelper.modifyColor(new ChatComponentTranslation(s), e))); } @Override @@ -74,10 +73,10 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { player.motionZ *= 0.9; } else if (player.moveForward > 0 && player.motionX * player.motionX + player.motionY * player.motionY - + player.motionZ * player.motionZ < 3) { - player.motionX *= 1.1; - player.motionZ *= 1.1; - } + + player.motionZ * player.motionZ < 3) { + player.motionX *= 1.1; + player.motionZ *= 1.1; + } } } } @@ -88,29 +87,29 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { public void addInformation(ItemStack stack, EntityPlayer player, List tooltips, boolean unused) { tooltips.add(StatCollector.translateToLocal("pe.gem.feet.lorename")); tooltips.add( - String.format( - StatCollector.translateToLocal("pe.gem.stepassist.prompt"), - ClientKeyHelper.getKeyName(PEKeybind.ARMOR_TOGGLE))); + String.format( + StatCollector.translateToLocal("pe.gem.stepassist.prompt"), + ClientKeyHelper.getKeyName(PEKeybind.ARMOR_TOGGLE))); EnumChatFormatting e = canStep(stack) ? EnumChatFormatting.GREEN : EnumChatFormatting.RED; String s = canStep(stack) ? "pe.gem.enabled" : "pe.gem.disabled"; tooltips.add( - StatCollector.translateToLocal("pe.gem.stepassist_tooltip") + " " - + e - + StatCollector.translateToLocal(s)); + StatCollector.translateToLocal("pe.gem.stepassist_tooltip") + " " + e + StatCollector.translateToLocal(s)); } private boolean canStep(ItemStack stack) { - return stack.getTagCompound() != null && stack.getTagCompound().hasKey("StepAssist") - && stack.getTagCompound().getBoolean("StepAssist"); + return stack.getTagCompound() != null && stack.getTagCompound() + .hasKey("StepAssist") + && stack.getTagCompound() + .getBoolean("StepAssist"); } @Override public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Armor modifier", 1.0, 2)); + SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Armor modifier", 1.0, 2)); return multimap; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemHelmet.java b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemHelmet.java index dc5732f56..c8ad919ab 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemHelmet.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemHelmet.java @@ -2,14 +2,6 @@ import java.util.List; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.handlers.PlayerTimers; -import moze_intel.projecte.utils.ChatHelper; -import moze_intel.projecte.utils.ClientKeyHelper; -import moze_intel.projecte.utils.EnumArmorType; -import moze_intel.projecte.utils.PEKeybind; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; @@ -26,15 +18,22 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; -import thaumcraft.api.IGoggles; -import thaumcraft.api.nodes.IRevealer; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.handlers.PlayerTimers; +import moze_intel.projecte.utils.ChatHelper; +import moze_intel.projecte.utils.ClientKeyHelper; +import moze_intel.projecte.utils.EnumArmorType; +import moze_intel.projecte.utils.PEKeybind; +import moze_intel.projecte.utils.PlayerHelper; +import thaumcraft.api.IGoggles; +import thaumcraft.api.nodes.IRevealer; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), - @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft") }) + value = { @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), + @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft") }) public class GemHelmet extends GemArmorBase implements IGoggles, IRevealer { public GemHelmet() { @@ -42,8 +41,10 @@ public GemHelmet() { } public static boolean isNightVisionEnabled(ItemStack helm) { - return helm.hasTagCompound() && helm.getTagCompound().hasKey("NightVision") - && helm.getTagCompound().getBoolean("NightVision"); + return helm.hasTagCompound() && helm.getTagCompound() + .hasKey("NightVision") + && helm.getTagCompound() + .getBoolean("NightVision"); } @@ -65,8 +66,8 @@ public static void toggleNightVision(ItemStack helm, EntityPlayer player) { EnumChatFormatting e = value ? EnumChatFormatting.GREEN : EnumChatFormatting.RED; String s = value ? "pe.gem.enabled" : "pe.gem.disabled"; player.addChatMessage( - new ChatComponentTranslation("pe.gem.nightvision_tooltip").appendText(" ") - .appendSibling(ChatHelper.modifyColor(new ChatComponentTranslation(s), e))); + new ChatComponentTranslation("pe.gem.nightvision_tooltip").appendText(" ") + .appendSibling(ChatHelper.modifyColor(new ChatComponentTranslation(s), e))); } @Override @@ -75,17 +76,15 @@ public void addInformation(ItemStack stack, EntityPlayer player, List tooltips, tooltips.add(StatCollector.translateToLocal("pe.gem.helm.lorename")); tooltips.add( - String.format( - StatCollector.translateToLocal("pe.gem.nightvision.prompt"), - ClientKeyHelper.getKeyName(Minecraft.getMinecraft().gameSettings.keyBindSneak), - ClientKeyHelper.getKeyName(PEKeybind.ARMOR_TOGGLE))); + String.format( + StatCollector.translateToLocal("pe.gem.nightvision.prompt"), + ClientKeyHelper.getKeyName(Minecraft.getMinecraft().gameSettings.keyBindSneak), + ClientKeyHelper.getKeyName(PEKeybind.ARMOR_TOGGLE))); EnumChatFormatting e = isNightVisionEnabled(stack) ? EnumChatFormatting.GREEN : EnumChatFormatting.RED; String s = isNightVisionEnabled(stack) ? "pe.gem.enabled" : "pe.gem.disabled"; tooltips.add( - StatCollector.translateToLocal("pe.gem.nightvision_tooltip") + " " - + e - + StatCollector.translateToLocal(s)); + StatCollector.translateToLocal("pe.gem.nightvision_tooltip") + " " + e + StatCollector.translateToLocal(s)); } @Override @@ -97,7 +96,8 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { Block b = world.getBlock(x, y - 1, z); - if ((b == Blocks.water || b == Blocks.flowing_water) && world.getBlock(x, y, z).equals(Blocks.air)) { + if ((b == Blocks.water || b == Blocks.flowing_water) && world.getBlock(x, y, z) + .equals(Blocks.air)) { if (!player.isSneaking()) { player.motionY = 0.0d; player.fallDistance = 0.0f; @@ -140,7 +140,7 @@ public void doZap(EntityPlayer player) { Vec3 strikePos = PlayerHelper.getBlockLookingAt(player, 120.0F); if (strikePos != null) { player.worldObj.addWeatherEffect( - new EntityLightningBolt(player.worldObj, strikePos.xCoord, strikePos.yCoord, strikePos.zCoord)); + new EntityLightningBolt(player.worldObj, strikePos.xCoord, strikePos.yCoord, strikePos.zCoord)); } } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemLegs.java b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemLegs.java index 392767fc8..1f421a8a6 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemLegs.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/armor/GemLegs.java @@ -2,9 +2,6 @@ import java.util.List; -import moze_intel.projecte.utils.EnumArmorType; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -13,6 +10,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.utils.EnumArmorType; +import moze_intel.projecte.utils.WorldHelper; public class GemLegs extends GemArmorBase { @@ -36,12 +35,12 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { if (player.isSneaking()) { AxisAlignedBB box = AxisAlignedBB.getBoundingBox( - player.posX - 3.5, - player.posY - 3.5, - player.posZ - 3.5, - player.posX + 3.5, - player.posY + 3.5, - player.posZ + 3.5); + player.posX - 3.5, + player.posY - 3.5, + player.posZ - 3.5, + player.posX + 3.5, + player.posY + 3.5, + player.posZ + 3.5); WorldHelper.repelEntitiesInAABBFromPoint(world, box, player.posX, player.posY, player.posZ, true); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/armor/RMArmor.java b/src/main/java/moze_intel/projecte/gameObjs/items/armor/RMArmor.java index 61c219eb6..534ac3488 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/armor/RMArmor.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/armor/RMArmor.java @@ -2,9 +2,6 @@ import java.util.Locale; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.EnumArmorType; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -14,15 +11,17 @@ import net.minecraft.util.DamageSource; import net.minecraftforge.common.ISpecialArmor; -import thaumcraft.api.IGoggles; -import thaumcraft.api.nodes.IRevealer; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.EnumArmorType; +import thaumcraft.api.IGoggles; +import thaumcraft.api.nodes.IRevealer; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), - @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft") }) + value = { @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), + @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft") }) public class RMArmor extends ItemArmor implements ISpecialArmor, IRevealer, IGoggles { private final EnumArmorType armorPiece; @@ -38,7 +37,7 @@ public RMArmor(EnumArmorType armorType) { @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, - int slot) { + int slot) { EnumArmorType type = ((RMArmor) armor.getItem()).armorPiece; if (source.isExplosion()) { return new ArmorProperties(1, 1.0D, 500); diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemAlchemyChestBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemAlchemyChestBlock.java index df8137623..f0783406e 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemAlchemyChestBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemAlchemyChestBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemAlchemyChestBlock extends ItemBlock { public ItemAlchemyChestBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCollectorBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCollectorBlock.java index d0a485a62..0f5953b1f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCollectorBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCollectorBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemCollectorBlock extends ItemBlock { public ItemCollectorBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCondenserBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCondenserBlock.java index 57d510871..df7eb1a0f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCondenserBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemCondenserBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemCondenserBlock extends ItemBlock { public ItemCondenserBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemDMFurnaceBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemDMFurnaceBlock.java index 272dbab69..f469a12f1 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemDMFurnaceBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemDMFurnaceBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemDMFurnaceBlock extends ItemBlock { public ItemDMFurnaceBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemMatterBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemMatterBlock.java index 9abd52245..9bf2b4b77 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemMatterBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemMatterBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemMatterBlock extends ItemBlock { public ItemMatterBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRMFurnaceBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRMFurnaceBlock.java index ba9741a65..28e0d56db 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRMFurnaceBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRMFurnaceBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemRMFurnaceBlock extends ItemBlock { public ItemRMFurnaceBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRelayBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRelayBlock.java index 6e8cef86d..7b9d14b2e 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRelayBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemRelayBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemRelayBlock extends ItemBlock { public ItemRelayBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemTransmutationBlock.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemTransmutationBlock.java index 874b266f1..32444f4da 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemTransmutationBlock.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemBlocks/ItemTransmutationBlock.java @@ -1,13 +1,13 @@ package moze_intel.projecte.gameObjs.items.itemBlocks; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import moze_intel.projecte.utils.AchievementHandler; + public class ItemTransmutationBlock extends ItemBlock { public ItemTransmutationBlock(Block block) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/FireProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/FireProjectile.java index caefe8353..e15a1a846 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/FireProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/FireProjectile.java @@ -1,9 +1,9 @@ package moze_intel.projecte.gameObjs.items.itemEntities; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; +import moze_intel.projecte.gameObjs.items.ItemPE; + public class FireProjectile extends ItemPE { public FireProjectile() { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LavaOrb.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LavaOrb.java index 91551a6a0..a1861e19f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LavaOrb.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LavaOrb.java @@ -1,11 +1,10 @@ package moze_intel.projecte.gameObjs.items.itemEntities; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.items.ItemPE; public class LavaOrb extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LensExplosive.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LensExplosive.java index 46149ad4f..24adf273f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LensExplosive.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LensExplosive.java @@ -1,11 +1,10 @@ package moze_intel.projecte.gameObjs.items.itemEntities; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.items.ItemPE; public class LensExplosive extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LightningProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LightningProjectile.java index 3a0038b86..a7a3acd1d 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LightningProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LightningProjectile.java @@ -1,9 +1,9 @@ package moze_intel.projecte.gameObjs.items.itemEntities; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; +import moze_intel.projecte.gameObjs.items.ItemPE; + public class LightningProjectile extends ItemPE { public LightningProjectile() { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LootBallItem.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LootBallItem.java index 7f87ef359..b5390294f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LootBallItem.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/LootBallItem.java @@ -1,11 +1,10 @@ package moze_intel.projecte.gameObjs.items.itemEntities; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.items.ItemPE; public class LootBallItem extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/RandomizerProjectile.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/RandomizerProjectile.java index 977c0049b..c8a2abc9b 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/RandomizerProjectile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/RandomizerProjectile.java @@ -1,11 +1,10 @@ package moze_intel.projecte.gameObjs.items.itemEntities; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.items.ItemPE; public class RandomizerProjectile extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/WaterOrb.java b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/WaterOrb.java index 50888ad65..8ceaf4b37 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/WaterOrb.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/itemEntities/WaterOrb.java @@ -1,11 +1,10 @@ package moze_intel.projecte.gameObjs.items.itemEntities; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.items.ItemPE; public class WaterOrb extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/Arcana.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/Arcana.java index f332ff498..137f23c03 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/Arcana.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/Arcana.java @@ -2,17 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IExtraFunction; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.api.item.IProjectileShooter; -import moze_intel.projecte.gameObjs.entity.EntityFireProjectile; -import moze_intel.projecte.gameObjs.entity.EntitySWRGProjectile; -import moze_intel.projecte.gameObjs.items.IFireProtector; -import moze_intel.projecte.gameObjs.items.IFlightProvider; -import moze_intel.projecte.gameObjs.items.ItemPE; -import moze_intel.projecte.utils.PlayerHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -31,10 +20,20 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; +import moze_intel.projecte.api.item.IExtraFunction; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.api.item.IProjectileShooter; +import moze_intel.projecte.gameObjs.entity.EntityFireProjectile; +import moze_intel.projecte.gameObjs.entity.EntitySWRGProjectile; +import moze_intel.projecte.gameObjs.items.IFireProtector; +import moze_intel.projecte.gameObjs.items.IFlightProvider; +import moze_intel.projecte.gameObjs.items.ItemPE; +import moze_intel.projecte.utils.PlayerHelper; +import moze_intel.projecte.utils.WorldHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class Arcana extends ItemPE - implements IBauble, IModeChanger, IFlightProvider, IFireProtector, IExtraFunction, IProjectileShooter { + implements IBauble, IModeChanger, IFlightProvider, IFireProtector, IExtraFunction, IProjectileShooter { private IIcon[] icons = new IIcon[4]; private IIcon[] iconsOn = new IIcon[4]; @@ -63,7 +62,8 @@ public void changeMode(EntityPlayer player, ItemStack stack) { } private void tick(ItemStack stack, World world, EntityPlayerMP player) { - if (stack.getTagCompound().getBoolean("Active")) { + if (stack.getTagCompound() + .getBoolean("Active")) { switch (stack.getItemDamage()) { case 0: WorldHelper.freezeInBoundingBox(world, player.boundingBox.expand(5, 5, 5), player, true); @@ -76,12 +76,12 @@ private void tick(ItemStack stack, World world, EntityPlayerMP player) { break; case 3: WorldHelper.repelEntitiesInAABBFromPoint( - world, - player.boundingBox.expand(5, 5, 5), - player.posX, - player.posY, - player.posZ, - true); + world, + player.boundingBox.expand(5, 5, 5), + player.posX, + player.posY, + player.posZ, + true); break; } } @@ -139,7 +139,8 @@ public IIcon getIcon(ItemStack stack, int pass) { @Override public IIcon getIconIndex(ItemStack stack) { - boolean active = stack.hasTagCompound() && stack.getTagCompound().getBoolean("Active"); + boolean active = stack.hasTagCompound() && stack.getTagCompound() + .getBoolean("Active"); return (active ? iconsOn : icons)[MathHelper.clamp_int(stack.getItemDamage(), 0, 3)]; } @@ -163,8 +164,8 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("pe.arcana.inactive")); } else { list.add( - StatCollector.translateToLocal("pe.arcana.mode") + EnumChatFormatting.AQUA - + StatCollector.translateToLocal("pe.arcana.mode." + stack.getItemDamage())); + StatCollector.translateToLocal("pe.arcana.mode") + EnumChatFormatting.AQUA + + StatCollector.translateToLocal("pe.arcana.mode." + stack.getItemDamage())); } } } @@ -197,7 +198,7 @@ public void doExtraFunction(ItemStack stack, EntityPlayer player) // GIANT FIRE for (int z = (int) (player.posZ - 3); z <= player.posZ + 3; z++) if (world.isAirBlock(x, y, z)) { PlayerHelper - .checkedPlaceBlock(((EntityPlayerMP) player), x, y, z, Blocks.fire, 0); + .checkedPlaceBlock(((EntityPlayerMP) player), x, y, z, Blocks.fire, 0); } break; case 1: // west, -x @@ -207,7 +208,7 @@ public void doExtraFunction(ItemStack stack, EntityPlayer player) // GIANT FIRE for (int z = (int) (player.posZ - 30); z <= player.posZ + 30; z++) { if (world.isAirBlock(x, y, z)) { PlayerHelper - .checkedPlaceBlock(((EntityPlayerMP) player), x, y, z, Blocks.fire, 0); + .checkedPlaceBlock(((EntityPlayerMP) player), x, y, z, Blocks.fire, 0); } } break; diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/ArchangelSmite.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/ArchangelSmite.java index 6e9b3d503..40b1c3b37 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/ArchangelSmite.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/ArchangelSmite.java @@ -2,15 +2,6 @@ import java.util.List; -import moze_intel.projecte.PECore; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.entity.EntityHomingArrow; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -29,6 +20,14 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.entity.EntityHomingArrow; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.MathUtils; public class ArchangelSmite extends RingToggle implements IPedestalItem, IModeChanger { @@ -57,7 +56,7 @@ private void fireArrow(ItemStack ring, World world, EntityLivingBase shooter) { EntityHomingArrow arrow = new EntityHomingArrow(world, shooter, 2.0F); if (!(shooter instanceof EntityPlayer) - || consumeFuel(((EntityPlayer) shooter), ring, EMCHelper.getEmcValue(Items.arrow), true)) { + || consumeFuel(((EntityPlayer) shooter), ring, EMCHelper.getEmcValue(Items.arrow), true)) { world.playSoundAtEntity(shooter, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + 0.5F); world.spawnEntityInWorld(arrow); } @@ -80,12 +79,13 @@ public void updateInPedestal(World world, int x, int y, int z) { if (!world.isRemote && ProjectEConfig.archangelPedCooldown != -1) { DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z)); if (tile.getActivityCooldown() == 0) { - if (!world.getEntitiesWithinAABB(EntityLiving.class, tile.getEffectBounds()).isEmpty()) { + if (!world.getEntitiesWithinAABB(EntityLiving.class, tile.getEffectBounds()) + .isEmpty()) { for (int i = 0; i < 3; i++) { EntityHomingArrow arrow = new EntityHomingArrow( - world, - FakePlayerFactory.get(((WorldServer) world), PECore.FAKEPLAYER_GAMEPROFILE), - 2.0F); + world, + FakePlayerFactory.get(((WorldServer) world), PECore.FAKEPLAYER_GAMEPROFILE), + 2.0F); arrow.posX = tile.centeredX; arrow.posY = tile.centeredY + 2; arrow.posZ = tile.centeredZ; @@ -93,10 +93,10 @@ public void updateInPedestal(World world, int x, int y, int z) { arrow.motionZ = 0; arrow.motionY = 1; world.playSoundAtEntity( - arrow, - "random.bow", - 1.0F, - 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + 0.5F); + arrow, + "random.bow", + 1.0F, + 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + 0.5F); world.spawnEntityInWorld(arrow); } } @@ -113,9 +113,9 @@ public List getPedestalDescription() { if (ProjectEConfig.archangelPedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.archangel.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.archangel.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.archangelPedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.archangel.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.archangelPedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/BlackHoleBand.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/BlackHoleBand.java index cbbd68010..85f5dee5e 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/BlackHoleBand.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/BlackHoleBand.java @@ -2,15 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IAlchBagItem; -import moze_intel.projecte.api.item.IAlchChestItem; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.gameObjs.entity.EntityLootBall; -import moze_intel.projecte.gameObjs.tiles.AlchChestTile; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -23,11 +14,19 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import baubles.api.BaubleType; import baubles.api.IBauble; - -import com.google.common.collect.Lists; import cpw.mods.fml.common.Optional; +import moze_intel.projecte.api.item.IAlchBagItem; +import moze_intel.projecte.api.item.IAlchChestItem; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.gameObjs.entity.EntityLootBall; +import moze_intel.projecte.gameObjs.tiles.AlchChestTile; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.WorldHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class BlackHoleBand extends RingToggle implements IAlchBagItem, IAlchChestItem, IBauble, IPedestalItem { @@ -134,8 +133,8 @@ private void suckDumpItem(EntityItem item, DMPedestalTile tile) { @Override public List getPedestalDescription() { return Lists.newArrayList( - EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.bhb.pedestal1"), - EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.bhb.pedestal2")); + EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.bhb.pedestal1"), + EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.bhb.pedestal2")); } @Override @@ -143,17 +142,18 @@ public void updateInAlchChest(World world, int x, int y, int z, ItemStack stack) AlchChestTile tile = ((AlchChestTile) world.getTileEntity(x, y, z)); if (stack.getItemDamage() == 1) { AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox( - tile.xCoord - 5, - tile.yCoord - 5, - tile.zCoord - 5, - tile.xCoord + 5, - tile.yCoord + 5, - tile.zCoord + 5); + tile.xCoord - 5, + tile.yCoord - 5, + tile.zCoord - 5, + tile.xCoord + 5, + tile.yCoord + 5, + tile.zCoord + 5); double centeredX = tile.xCoord + 0.5; double centeredY = tile.yCoord + 0.5; double centeredZ = tile.zCoord + 0.5; - for (EntityItem e : (List) tile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, aabb)) { + for (EntityItem e : (List) tile.getWorldObj() + .getEntitiesWithinAABB(EntityItem.class, aabb)) { WorldHelper.gravitateEntityTowards(e, centeredX, centeredY, centeredZ); if (!e.worldObj.isRemote && !e.isDead && e.getDistanceSq(centeredX, centeredY, centeredZ) < 1.21) { ItemStack result = ItemHelper.pushStackInInv(tile, e.getEntityItem()); @@ -166,7 +166,7 @@ public void updateInAlchChest(World world, int x, int y, int z, ItemStack stack) } for (EntityLootBall e : (List) tile.getWorldObj() - .getEntitiesWithinAABB(EntityLootBall.class, aabb)) { + .getEntitiesWithinAABB(EntityLootBall.class, aabb)) { WorldHelper.gravitateEntityTowards(e, centeredX, centeredY, centeredZ); if (!e.worldObj.isRemote && !e.isDead && e.getDistanceSq(centeredX, centeredY, centeredZ) < 1.21) { ItemHelper.pushLootBallInInv(tile, e); @@ -180,12 +180,12 @@ public boolean updateInAlchBag(ItemStack[] inv, EntityPlayer player, ItemStack s if (stack.getItemDamage() == 1) { for (EntityItem e : (List) player.worldObj - .getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(5, 5, 5))) { + .getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(5, 5, 5))) { WorldHelper.gravitateEntityTowards(e, player.posX, player.posY, player.posZ); } for (EntityLootBall e : (List) player.worldObj - .getEntitiesWithinAABB(EntityLootBall.class, player.boundingBox.expand(5, 5, 5))) { + .getEntitiesWithinAABB(EntityLootBall.class, player.boundingBox.expand(5, 5, 5))) { WorldHelper.gravitateEntityTowards(e, player.posX, player.posY, player.posZ); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/BodyStone.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/BodyStone.java index 57d7a1411..f28c0687c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/BodyStone.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/BodyStone.java @@ -2,12 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.handlers.PlayerTimers; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -17,11 +11,16 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import baubles.api.BaubleType; import baubles.api.IBauble; - -import com.google.common.collect.Lists; import cpw.mods.fml.common.Optional; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.handlers.PlayerTimers; +import moze_intel.projecte.utils.MathUtils; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class BodyStone extends RingToggle implements IBauble, IPedestalItem { @@ -49,9 +48,11 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool } else { PlayerTimers.activateFeed(player); - if (player.getFoodStats().needFood() && PlayerTimers.canFeed(player)) { + if (player.getFoodStats() + .needFood() && PlayerTimers.canFeed(player)) { world.playSoundAtEntity(player, "projecte:item.peheal", 1.0F, 1.0F); - player.getFoodStats().addStats(2, 10); + player.getFoodStats() + .addStats(2, 10); removeEmc(stack, 64); } } @@ -109,12 +110,14 @@ public void updateInPedestal(World world, int x, int y, int z) { DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z)); if (tile.getActivityCooldown() == 0) { List players = world - .getEntitiesWithinAABB(EntityPlayerMP.class, tile.getEffectBounds()); + .getEntitiesWithinAABB(EntityPlayerMP.class, tile.getEffectBounds()); for (EntityPlayerMP player : players) { - if (player.getFoodStats().needFood()) { + if (player.getFoodStats() + .needFood()) { world.playSoundAtEntity(player, "projecte:item.peheal", 1.0F, 1.0F); - player.getFoodStats().addStats(1, 1); // 1/2 shank + player.getFoodStats() + .addStats(1, 1); // 1/2 shank } } @@ -131,9 +134,9 @@ public List getPedestalDescription() { if (ProjectEConfig.bodyPedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.body.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.body.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.bodyPedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.body.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.bodyPedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/HarvestGoddess.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/HarvestGoddess.java index 427fe08e3..fde6beea1 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/HarvestGoddess.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/HarvestGoddess.java @@ -2,12 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.MathUtils; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.entity.Entity; @@ -24,6 +18,12 @@ import com.google.common.collect.Lists; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.MathUtils; +import moze_intel.projecte.utils.WorldHelper; + public class HarvestGoddess extends RingToggle implements IPedestalItem { public HarvestGoddess() { @@ -56,7 +56,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool } public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, - float par8, float par9, float par10) { + float par8, float par9, float par10) { if (world.isRemote || !player.canPlayerEdit(x, y, z, par7, stack)) { return false; } @@ -131,7 +131,7 @@ private boolean plantSeeds(World world, EntityPlayer player, int xCoord, int yCo } if (block.canSustainPlant(world, x, yCoord, z, ForgeDirection.UP, plant) - && world.isAirBlock(x, yCoord + 1, z)) { + && world.isAirBlock(x, yCoord + 1, z)) { world.setBlock(x, yCoord + 1, z, plant.getPlant(world, x, yCoord + 1, z)); player.inventory.decrStackSize(s.slot, 1); player.inventoryContainer.detectAndSendChanges(); @@ -182,8 +182,8 @@ private Object[] getStackFromInventory(ItemStack[] inv, Item item, int meta, int ItemStack stack = inv[i]; if (stack != null && stack.stackSize >= minAmount - && stack.getItem() == item - && stack.getItemDamage() == meta) { + && stack.getItem() == item + && stack.getItemDamage() == meta) { obj[0] = i; obj[1] = stack; return obj; @@ -226,9 +226,9 @@ public List getPedestalDescription() { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.harvestgod.pedestal1")); list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.harvestgod.pedestal2")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.harvestgod.pedestal3"), - MathUtils.tickToSecFormatted(ProjectEConfig.harvestPedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.harvestgod.pedestal3"), + MathUtils.tickToSecFormatted(ProjectEConfig.harvestPedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/Ignition.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/Ignition.java index 693740e89..aa1a0beaf 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/Ignition.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/Ignition.java @@ -2,16 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.api.item.IProjectileShooter; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.entity.EntityFireProjectile; -import moze_intel.projecte.gameObjs.items.IFireProtector; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.MathUtils; -import moze_intel.projecte.utils.PlayerHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.BlockTNT; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -25,11 +15,20 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import baubles.api.BaubleType; import baubles.api.IBauble; - -import com.google.common.collect.Lists; import cpw.mods.fml.common.Optional; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.api.item.IProjectileShooter; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.entity.EntityFireProjectile; +import moze_intel.projecte.gameObjs.items.IFireProtector; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.MathUtils; +import moze_intel.projecte.utils.PlayerHelper; +import moze_intel.projecte.utils.WorldHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class Ignition extends RingToggle implements IBauble, IPedestalItem, IFireProtector, IProjectileShooter { @@ -77,11 +76,11 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla if (!world.isRemote) { MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, false); if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - if (world.getBlock(mop.blockX, mop.blockY, mop.blockZ) instanceof BlockTNT && PlayerHelper - .hasBreakPermission(((EntityPlayerMP) player), mop.blockX, mop.blockY, mop.blockZ)) { + if (world.getBlock(mop.blockX, mop.blockY, mop.blockZ) instanceof BlockTNT + && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), mop.blockX, mop.blockY, mop.blockZ)) { // Ignite TNT or derivatives ((BlockTNT) world.getBlock(mop.blockX, mop.blockY, mop.blockZ)) - .func_150114_a(world, mop.blockX, mop.blockY, mop.blockZ, 1, player); + .func_150114_a(world, mop.blockX, mop.blockY, mop.blockZ, 1, player); world.setBlockToAir(mop.blockX, mop.blockY, mop.blockZ); } } @@ -146,9 +145,9 @@ public List getPedestalDescription() { if (ProjectEConfig.ignitePedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.ignition.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.ignition.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.ignitePedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.ignition.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.ignitePedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/IronBand.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/IronBand.java index 0f80a3edc..16e6e1ecc 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/IronBand.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/IronBand.java @@ -1,11 +1,10 @@ package moze_intel.projecte.gameObjs.items.rings; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.items.ItemPE; public class IronBand extends ItemPE { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/LifeStone.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/LifeStone.java index 29ff8a21e..63c8645ee 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/LifeStone.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/LifeStone.java @@ -2,12 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.handlers.PlayerTimers; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -17,11 +11,16 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import baubles.api.BaubleType; import baubles.api.IBauble; - -import com.google.common.collect.Lists; import cpw.mods.fml.common.Optional; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.handlers.PlayerTimers; +import moze_intel.projecte.utils.MathUtils; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class LifeStone extends RingToggle implements IBauble, IPedestalItem { @@ -54,9 +53,11 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool removeEmc(stack, 64); } - if (player.getFoodStats().needFood() && PlayerTimers.canFeed(player)) { + if (player.getFoodStats() + .needFood() && PlayerTimers.canFeed(player)) { world.playSoundAtEntity(player, "projecte:item.peheal", 1.0F, 1.0F); - player.getFoodStats().addStats(2, 10); + player.getFoodStats() + .addStats(2, 10); removeEmc(stack, 64); } } @@ -114,16 +115,18 @@ public void updateInPedestal(World world, int x, int y, int z) { DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z)); if (tile.getActivityCooldown() == 0) { List players = world - .getEntitiesWithinAABB(EntityPlayerMP.class, tile.getEffectBounds()); + .getEntitiesWithinAABB(EntityPlayerMP.class, tile.getEffectBounds()); for (EntityPlayerMP player : players) { if (player.getHealth() < player.getMaxHealth()) { world.playSoundAtEntity(player, "projecte:item.peheal", 1.0F, 1.0F); player.heal(1.0F); // 1/2 heart } - if (player.getFoodStats().needFood()) { + if (player.getFoodStats() + .needFood()) { world.playSoundAtEntity(player, "projecte:item.peheal", 1.0F, 1.0F); - player.getFoodStats().addStats(1, 1); // 1/2 shank + player.getFoodStats() + .addStats(1, 1); // 1/2 shank } } @@ -140,9 +143,9 @@ public List getPedestalDescription() { if (ProjectEConfig.lifePedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.life.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.life.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.lifePedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.life.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.lifePedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/MindStone.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/MindStone.java index d80ebb31e..96fceedad 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/MindStone.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/MindStone.java @@ -2,10 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; @@ -16,6 +12,10 @@ import com.google.common.collect.Lists; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.WorldHelper; + public class MindStone extends RingToggle implements IPedestalItem { private final int TRANSFER_RATE = 50; @@ -51,7 +51,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int par4, int par5, int par6, int par7, - float par8, float par9, float par10) { + float par8, float par9, float par10) { if (!world.isRemote && stack.getItemDamage() == 0 && getStoredXP(stack) != 0) { int toAdd = removeStoredXP(stack, TRANSFER_RATE); @@ -75,7 +75,7 @@ private void removeXP(EntityPlayer player, int amount) { player.experienceTotal = experiencetotal; player.experienceLevel = getLvlForXP(experiencetotal); player.experience = (float) (experiencetotal - getXPForLvl(player.experienceLevel)) - / (float) player.xpBarCap(); + / (float) player.xpBarCap(); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/RingToggle.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/RingToggle.java index fa4ebfecd..b46459fac 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/RingToggle.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/RingToggle.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.items.rings; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.gameObjs.items.ItemPE; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +10,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.gameObjs.items.ItemPE; public abstract class RingToggle extends ItemPE implements IModeChanger { diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/SWRG.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/SWRG.java index 1c94900a3..6b6f65405 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/SWRG.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/SWRG.java @@ -2,15 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.items.IFlightProvider; -import moze_intel.projecte.gameObjs.items.ItemPE; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.handlers.PlayerChecks; -import moze_intel.projecte.utils.MathUtils; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -26,14 +17,21 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import baubles.api.BaubleType; -import baubles.api.IBauble; - import com.google.common.collect.Lists; +import baubles.api.BaubleType; +import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.items.IFlightProvider; +import moze_intel.projecte.gameObjs.items.ItemPE; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.handlers.PlayerChecks; +import moze_intel.projecte.utils.MathUtils; +import moze_intel.projecte.utils.WorldHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class SWRG extends ItemPE implements IBauble, IPedestalItem, IFlightProvider { @@ -54,12 +52,12 @@ private void tick(ItemStack stack, EntityPlayer player) { if (stack.getItemDamage() > 1) { // Repel on both sides - smooth animation WorldHelper.repelEntitiesInAABBFromPoint( - player.worldObj, - player.boundingBox.expand(5.0, 5.0, 5.0), - player.posX, - player.posY, - player.posZ, - true); + player.worldObj, + player.boundingBox.expand(5.0, 5.0, 5.0), + player.posX, + player.posY, + player.posZ, + true); } if (player.worldObj.isRemote) { @@ -258,9 +256,9 @@ public List getPedestalDescription() { if (ProjectEConfig.swrgPedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.swrg.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.swrg.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.swrgPedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.swrg.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.swrgPedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/SoulStone.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/SoulStone.java index 56246d6b4..c7bc8bdf2 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/SoulStone.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/SoulStone.java @@ -2,12 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.handlers.PlayerTimers; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -17,11 +11,16 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import baubles.api.BaubleType; import baubles.api.IBauble; - -import com.google.common.collect.Lists; import cpw.mods.fml.common.Optional; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.handlers.PlayerTimers; +import moze_intel.projecte.utils.MathUtils; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class SoulStone extends RingToggle implements IBauble, IPedestalItem { @@ -108,7 +107,7 @@ public void updateInPedestal(World world, int x, int y, int z) { DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z)); if (tile.getActivityCooldown() == 0) { List players = world - .getEntitiesWithinAABB(EntityPlayerMP.class, tile.getEffectBounds()); + .getEntitiesWithinAABB(EntityPlayerMP.class, tile.getEffectBounds()); for (EntityPlayerMP player : players) { if (player.getHealth() < player.getMaxHealth()) { @@ -130,9 +129,9 @@ public List getPedestalDescription() { if (ProjectEConfig.soulPedCooldown != -1) { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.soul.pedestal1")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.soul.pedestal2"), - MathUtils.tickToSecFormatted(ProjectEConfig.soulPedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.soul.pedestal2"), + MathUtils.tickToSecFormatted(ProjectEConfig.soulPedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/VoidRing.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/VoidRing.java index 168e73665..a92eccc26 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/VoidRing.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/VoidRing.java @@ -2,14 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IAlchBagItem; -import moze_intel.projecte.api.item.IAlchChestItem; -import moze_intel.projecte.api.item.IExtraFunction; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.items.GemEternalDensity; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +14,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IAlchBagItem; +import moze_intel.projecte.api.item.IAlchChestItem; +import moze_intel.projecte.api.item.IExtraFunction; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.items.GemEternalDensity; +import moze_intel.projecte.utils.PlayerHelper; public class VoidRing extends GemEternalDensity implements IPedestalItem, IExtraFunction { @@ -38,11 +37,16 @@ public VoidRing() { public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean isHeld) { super.onUpdate(stack, world, entity, slot, isHeld); ObjHandler.blackHole.onUpdate(stack, world, entity, slot, isHeld); - if (!stack.getTagCompound().hasKey("teleportCooldown")) { - stack.getTagCompound().setByte("teleportCooldown", ((byte) 10)); + if (!stack.getTagCompound() + .hasKey("teleportCooldown")) { + stack.getTagCompound() + .setByte("teleportCooldown", ((byte) 10)); } stack.getTagCompound() - .setByte("teleportCooldown", ((byte) (stack.getTagCompound().getByte("teleportCooldown") - 1))); + .setByte( + "teleportCooldown", + ((byte) (stack.getTagCompound() + .getByte("teleportCooldown") - 1))); } @Override @@ -70,13 +74,15 @@ public void registerIcons(IIconRegister register) { @Override public void doExtraFunction(ItemStack stack, EntityPlayer player) { - if (stack.getTagCompound().getByte("teleportCooldown") > 0) { + if (stack.getTagCompound() + .getByte("teleportCooldown") > 0) { return; } Vec3 c = PlayerHelper.getBlockLookingAt(player, 64); if (c == null) { - c = PlayerHelper.getLookVec(player, 32).getRight(); + c = PlayerHelper.getLookVec(player, 32) + .getRight(); } EnderTeleportEvent event = new EnderTeleportEvent(player, c.xCoord, c.yCoord, c.zCoord, 0); @@ -88,7 +94,8 @@ public void doExtraFunction(ItemStack stack, EntityPlayer player) { player.setPositionAndUpdate(event.targetX, event.targetY, event.targetZ); player.worldObj.playSoundAtEntity(player, "mob.endermen.portal", 1.0F, 1.0F); player.fallDistance = 0.0F; - stack.getTagCompound().setByte("teleportCooldown", ((byte) 10)); + stack.getTagCompound() + .setByte("teleportCooldown", ((byte) 10)); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/rings/Zero.java b/src/main/java/moze_intel/projecte/gameObjs/items/rings/Zero.java index 3e9ebc919..93fe8362c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/rings/Zero.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/rings/Zero.java @@ -2,14 +2,6 @@ import java.util.List; -import moze_intel.projecte.api.item.IModeChanger; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.items.ItemCharge; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.utils.MathUtils; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -21,14 +13,20 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import baubles.api.BaubleType; -import baubles.api.IBauble; - import com.google.common.collect.Lists; +import baubles.api.BaubleType; +import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IModeChanger; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.items.ItemCharge; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.utils.MathUtils; +import moze_intel.projecte.utils.WorldHelper; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class Zero extends ItemCharge implements IModeChanger, IBauble, IPedestalItem { @@ -53,12 +51,12 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool } AxisAlignedBB box = AxisAlignedBB.getBoundingBox( - entity.posX - 3, - entity.posY - 3, - entity.posZ - 3, - entity.posX + 3, - entity.posY + 3, - entity.posZ + 3); + entity.posX - 3, + entity.posY - 3, + entity.posZ - 3, + entity.posX + 3, + entity.posY + 3, + entity.posZ + 3); WorldHelper.freezeInBoundingBox(world, box, ((EntityPlayer) entity), true); } @@ -160,9 +158,9 @@ public List getPedestalDescription() { list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.zero.pedestal1")); list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("pe.zero.pedestal2")); list.add( - EnumChatFormatting.BLUE + String.format( - StatCollector.translateToLocal("pe.zero.pedestal3"), - MathUtils.tickToSecFormatted(ProjectEConfig.zeroPedCooldown))); + EnumChatFormatting.BLUE + String.format( + StatCollector.translateToLocal("pe.zero.pedestal3"), + MathUtils.tickToSecFormatted(ProjectEConfig.zeroPedCooldown))); } return list; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkAxe.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkAxe.java index 6c47b8756..9f4b843d1 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkAxe.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkAxe.java @@ -37,8 +37,8 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Tool modifier", this instanceof RedAxe ? 9 : 8, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Tool modifier", this instanceof RedAxe ? 9 : 8, 0)); return multimap; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHammer.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHammer.java index ba95a9ba1..5a1bb5108 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHammer.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHammer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.items.tools; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -14,6 +11,9 @@ import com.google.common.collect.Multimap; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.ObjHandler; + public class DarkHammer extends PEToolBase { public DarkHammer() { @@ -50,7 +50,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla @Override public float getDigSpeed(ItemStack stack, Block block, int metadata) { if ((block == ObjHandler.matterBlock && metadata == 0) || block == ObjHandler.dmFurnaceOff - || block == ObjHandler.dmFurnaceOn) { + || block == ObjHandler.dmFurnaceOn) { return 1200000.0F; } @@ -68,8 +68,8 @@ public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); return multimap; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHoe.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHoe.java index b09dd44f7..1380dbf42 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHoe.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkHoe.java @@ -20,7 +20,7 @@ protected DarkHoe(String name, byte numCharges, String[] modeDesc) { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, - float par8, float par9, float par10) { + float par8, float par9, float par10) { tillAOE(stack, player, world, x, y, z, par7, 0); return true; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkPick.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkPick.java index c66ef30df..4f791a5d4 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkPick.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkPick.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.items.tools; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.AchievementHandler; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -18,16 +13,21 @@ import com.google.common.collect.Multimap; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.AchievementHandler; +import moze_intel.projecte.utils.ItemHelper; + public class DarkPick extends PEToolBase { public DarkPick() { super( - "dm_pick", - (byte) 2, - new String[] { StatCollector.translateToLocal("pe.darkpick.mode1"), - StatCollector.translateToLocal("pe.darkpick.mode2"), - StatCollector.translateToLocal("pe.darkpick.mode3"), - StatCollector.translateToLocal("pe.darkpick.mode4") }); + "dm_pick", + (byte) 2, + new String[] { StatCollector.translateToLocal("pe.darkpick.mode1"), + StatCollector.translateToLocal("pe.darkpick.mode2"), + StatCollector.translateToLocal("pe.darkpick.mode3"), + StatCollector.translateToLocal("pe.darkpick.mode4") }); this.setNoRepair(); this.peToolMaterial = "dm_tools"; this.pePrimaryToolClass = "pickaxe"; @@ -64,7 +64,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, - EntityLivingBase eLiving) { + EntityLivingBase eLiving) { digBasedOnMode(stack, world, block, x, y, z, eLiving); return true; } @@ -72,7 +72,7 @@ public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x @Override public float getDigSpeed(ItemStack stack, Block block, int metadata) { if ((block == ObjHandler.matterBlock && metadata == 0) || block == ObjHandler.dmFurnaceOff - || block == ObjHandler.dmFurnaceOn) { + || block == ObjHandler.dmFurnaceOn) { return 1200000.0F; } @@ -92,8 +92,8 @@ public void onCreated(ItemStack stack, World world, EntityPlayer player) { public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Tool modifier", this instanceof RedPick ? 8 : 7, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Tool modifier", this instanceof RedPick ? 8 : 7, 0)); return multimap; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShears.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShears.java index 95d48f1d4..5815d107a 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShears.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShears.java @@ -30,12 +30,12 @@ protected DarkShears(String name, byte numCharges, String[] modeDesc) { @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, - EntityLivingBase ent) { + EntityLivingBase ent) { if (block.getMaterial() != Material.leaves && block != Blocks.web - && block != Blocks.tallgrass - && block != Blocks.vine - && block != Blocks.tripwire - && !(block instanceof IShearable)) { + && block != Blocks.tallgrass + && block != Blocks.vine + && block != Blocks.tripwire + && !(block instanceof IShearable)) { return super.onBlockDestroyed(stack, world, block, x, y, z, ent); } else { return true; diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShovel.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShovel.java index 79155666e..626504428 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShovel.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkShovel.java @@ -38,7 +38,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla MovingObjectPosition mop = this.getMovingObjectPositionFromPlayer(world, player, false); if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK - && world.getBlock(mop.blockX, mop.blockY, mop.blockZ) == Blocks.gravel) { + && world.getBlock(mop.blockX, mop.blockY, mop.blockZ) == Blocks.gravel) { tryVeinMine(stack, player, mop); } else { digAOE(stack, world, player, false, 0); @@ -50,8 +50,8 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Tool modifier", this instanceof RedShovel ? 6 : 5, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Tool modifier", this instanceof RedShovel ? 6 : 5, 0)); return multimap; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkSword.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkSword.java index 72a938bd0..d9af80ea0 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkSword.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/DarkSword.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.items.tools; -import moze_intel.projecte.api.item.IExtraFunction; -import moze_intel.projecte.config.ProjectEConfig; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +13,9 @@ import com.google.common.collect.Multimap; +import moze_intel.projecte.api.item.IExtraFunction; +import moze_intel.projecte.config.ProjectEConfig; + public class DarkSword extends PEToolBase implements IExtraFunction { public DarkSword() { @@ -44,9 +44,9 @@ public float getDigSpeed(ItemStack p_150893_1_, Block p_150893_2_, int meta) { } else { Material material = p_150893_2_.getMaterial(); return material != Material.plants && material != Material.vine - && material != Material.coral - && material != Material.leaves - && material != Material.gourd ? 1.0F : 1.5F; + && material != Material.coral + && material != Material.leaves + && material != Material.gourd ? 1.0F : 1.5F; } } @@ -87,8 +87,8 @@ public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); return multimap; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/PEToolBase.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/PEToolBase.java index cd3354b28..f13bbf0e7 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/PEToolBase.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/PEToolBase.java @@ -5,16 +5,6 @@ import java.util.Random; import java.util.Set; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.items.ItemMode; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.ParticlePKT; -import moze_intel.projecte.utils.Coordinates; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.MathUtils; -import moze_intel.projecte.utils.PlayerHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -51,6 +41,15 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.items.ItemMode; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.ParticlePKT; +import moze_intel.projecte.utils.Coordinates; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.MathUtils; +import moze_intel.projecte.utils.PlayerHelper; +import moze_intel.projecte.utils.WorldHelper; public abstract class PEToolBase extends ItemMode { @@ -144,16 +143,16 @@ protected void clearOdAOE(World world, ItemStack stack, EntityPlayer player, Str if (odName.equals(oreName)) { ArrayList blockDrops = WorldHelper - .getBlockDrops(world, player, block, stack, x, y, z); + .getBlockDrops(world, player, block, stack, x, y, z); if (PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z) - && consumeFuel(player, stack, emcCost, true)) { + && consumeFuel(player, stack, emcCost, true)) { drops.addAll(blockDrops); world.setBlockToAir(x, y, z); if (world.rand.nextInt(5) == 0) { PacketHandler.sendToAllAround( - new ParticlePKT("largesmoke", x, y, z), - new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y + 1, z, 32)); + new ParticlePKT("largesmoke", x, y, z), + new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y + 1, z, 32)); } } } @@ -167,7 +166,7 @@ && consumeFuel(player, stack, emcCost, true)) { * Tills in an AOE. Charge affects the AOE. Optional per-block EMC cost. */ protected void tillAOE(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int meta, - int emcCost) { + int emcCost) { byte charge = this.getCharge(stack); boolean hasAction = false; boolean hasSoundPlayed = false; @@ -180,12 +179,12 @@ protected void tillAOE(ItemStack stack, EntityPlayer player, World world, int x, if (!blockAbove.isOpaqueCube() && (block == Blocks.grass || block == Blocks.dirt)) { if (!hasSoundPlayed) { world.playSoundEffect( - (double) ((float) i + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) j + 0.5F), - Blocks.farmland.stepSound.getStepResourcePath(), - (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F, - Blocks.farmland.stepSound.getPitch() * 0.8F); + (double) ((float) i + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) j + 0.5F), + Blocks.farmland.stepSound.getStepResourcePath(), + (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F, + Blocks.farmland.stepSound.getPitch() * 0.8F); hasSoundPlayed = true; } @@ -201,8 +200,8 @@ protected void tillAOE(ItemStack stack, EntityPlayer player, World world, int x, PlayerHelper.checkedReplaceBlock(((EntityPlayerMP) player), i, y, j, Blocks.farmland, 0); if ((blockAbove.getMaterial() == Material.plants - || blockAbove.getMaterial() == Material.vine) - && !(blockAbove instanceof ITileEntityProvider)) { + || blockAbove.getMaterial() == Material.vine) + && !(blockAbove instanceof ITileEntityProvider)) { if (PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), i, y + 1, j)) { world.func_147480_a(i, y + 1, j, true); } @@ -225,7 +224,7 @@ protected void tillAOE(ItemStack stack, EntityPlayer player, World world, int x, * Called by multiple tools' left click function. Charge has no effect. Free operation. */ protected void digBasedOnMode(ItemStack stack, World world, Block block, int x, int y, int z, - EntityLivingBase living) { + EntityLivingBase living) { if (world.isRemote || !(living instanceof EntityPlayer)) { return; } @@ -291,9 +290,9 @@ protected void digBasedOnMode(ItemStack stack, World world, Block block, int x, Block b = world.getBlock(i, j, k); if (b != Blocks.air && b.getBlockHardness(world, i, j, k) != -1 - && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), i, j, k) - && (canHarvestBlock(block, stack) - || ForgeHooks.canToolHarvestBlock(block, world.getBlockMetadata(i, j, k), stack))) { + && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), i, j, k) + && (canHarvestBlock(block, stack) + || ForgeHooks.canToolHarvestBlock(block, world.getBlockMetadata(i, j, k), stack))) { drops.addAll(WorldHelper.getBlockDrops(world, player, b, stack, i, j, k)); world.setBlockToAir(i, j, k); } @@ -317,11 +316,11 @@ protected void digAOE(ItemStack stack, World world, EntityPlayer player, boolean } AxisAlignedBB box = affectDepth - ? WorldHelper.getBroadDeepBox( - new Coordinates(mop.blockX, mop.blockY, mop.blockZ), - ForgeDirection.getOrientation(mop.sideHit), - this.getCharge(stack)) - : WorldHelper.getFlatYBox(new Coordinates(mop.blockX, mop.blockY, mop.blockZ), this.getCharge(stack)); + ? WorldHelper.getBroadDeepBox( + new Coordinates(mop.blockX, mop.blockY, mop.blockZ), + ForgeDirection.getOrientation(mop.sideHit), + this.getCharge(stack)) + : WorldHelper.getFlatYBox(new Coordinates(mop.blockX, mop.blockY, mop.blockZ), this.getCharge(stack)); List drops = Lists.newArrayList(); @@ -330,9 +329,9 @@ protected void digAOE(ItemStack stack, World world, EntityPlayer player, boolean Block b = world.getBlock(i, j, k); if (b != Blocks.air && b.getBlockHardness(world, i, j, k) != -1 - && canHarvestBlock(b, stack) - && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), i, j, k) - && consumeFuel(player, stack, emcCost, true)) { + && canHarvestBlock(b, stack) + && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), i, j, k) + && consumeFuel(player, stack, emcCost, true)) { drops.addAll(WorldHelper.getBlockDrops(world, player, b, stack, i, j, k)); world.setBlockToAir(i, j, k); } @@ -349,7 +348,7 @@ && consumeFuel(player, stack, emcCost, true)) { * Attacks through armor. Charge affects damage. Free operation. */ protected void attackWithCharge(ItemStack stack, EntityLivingBase damaged, EntityLivingBase damager, - float baseDmg) { + float baseDmg) { if (!(damager instanceof EntityPlayer) || damager.worldObj.isRemote) { return; } @@ -407,14 +406,14 @@ protected void shearBlock(ItemStack stack, int x, int y, int z, EntityPlayer pla IShearable target = (IShearable) block; if (target.isShearable(stack, player.worldObj, x, y, z) - && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z)) { + && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z)) { ArrayList drops = target.onSheared( - stack, - player.worldObj, - x, - y, - z, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + stack, + player.worldObj, + x, + y, + z, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); Random rand = new Random(); for (ItemStack drop : drops) { @@ -423,11 +422,11 @@ protected void shearBlock(ItemStack stack, int x, int y, int z, EntityPlayer pla double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; EntityItem entityitem = new EntityItem( - player.worldObj, - (double) x + d, - (double) y + d1, - (double) z + d2, - drop); + player.worldObj, + (double) x + d, + (double) y + d1, + (double) z + d2, + drop); entityitem.delayBeforeCanPickup = 10; player.worldObj.spawnEntityInWorld(entityitem); } @@ -457,14 +456,14 @@ protected void shearEntityAOE(ItemStack stack, EntityPlayer player, int emcCost) IShearable target = (IShearable) ent; if (target.isShearable(stack, ent.worldObj, (int) ent.posX, (int) ent.posY, (int) ent.posZ) - && consumeFuel(player, stack, emcCost, true)) { + && consumeFuel(player, stack, emcCost, true)) { ArrayList entDrops = target.onSheared( - stack, - ent.worldObj, - (int) ent.posX, - (int) ent.posY, - (int) ent.posZ, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + stack, + ent.worldObj, + (int) ent.posX, + (int) ent.posY, + (int) ent.posZ, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); if (!entDrops.isEmpty()) { for (ItemStack drop : entDrops) { @@ -501,15 +500,15 @@ protected void tryVeinMine(ItemStack stack, EntityPlayer player, MovingObjectPos } AxisAlignedBB aabb = WorldHelper.getBroadDeepBox( - new Coordinates(mop.blockX, mop.blockY, mop.blockZ), - ForgeDirection.getOrientation(mop.sideHit), - getCharge(stack)); + new Coordinates(mop.blockX, mop.blockY, mop.blockZ), + ForgeDirection.getOrientation(mop.sideHit), + getCharge(stack)); Block target = player.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ); if (target.getBlockHardness(player.worldObj, mop.blockX, mop.blockY, mop.blockZ) <= -1 - || !(canHarvestBlock(target, stack) || ForgeHooks.canToolHarvestBlock( - target, - player.worldObj.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ), - stack))) { + || !(canHarvestBlock(target, stack) || ForgeHooks.canToolHarvestBlock( + target, + player.worldObj.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ), + stack))) { return; } @@ -549,9 +548,9 @@ protected void mineOreVeinsInAOE(ItemStack stack, EntityPlayer player) { Block block = world.getBlock(x, y, z); if (ItemHelper.isOre(block, world.getBlockMetadata(x, y, z)) - && block.getBlockHardness(player.worldObj, x, y, z) != -1 - && (canHarvestBlock(block, stack) - || ForgeHooks.canToolHarvestBlock(block, world.getBlockMetadata(x, y, z), stack))) { + && block.getBlockHardness(player.worldObj, x, y, z) != -1 + && (canHarvestBlock(block, stack) + || ForgeHooks.canToolHarvestBlock(block, world.getBlockMetadata(x, y, z), stack))) { WorldHelper.harvestVein(world, player, stack, new Coordinates(x, y, z), block, drops, 0); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedKatar.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedKatar.java index 1cc277e5d..41cfcb8f9 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedKatar.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedKatar.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.items.tools; -import moze_intel.projecte.api.item.IExtraFunction; -import moze_intel.projecte.config.ProjectEConfig; - import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -17,14 +14,17 @@ import com.google.common.collect.Multimap; +import moze_intel.projecte.api.item.IExtraFunction; +import moze_intel.projecte.config.ProjectEConfig; + public class RedKatar extends PEToolBase implements IExtraFunction { public RedKatar() { super( - "rm_katar", - (byte) 4, - new String[] { StatCollector.translateToLocal("pe.katar.mode1"), - StatCollector.translateToLocal("pe.katar.mode2"), }); + "rm_katar", + (byte) 4, + new String[] { StatCollector.translateToLocal("pe.katar.mode1"), + StatCollector.translateToLocal("pe.katar.mode2"), }); this.setNoRepair(); this.peToolMaterial = "rm_tools"; this.pePrimaryToolClass = "katar"; @@ -67,14 +67,14 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla if (blockHit instanceof BlockGrass || blockHit instanceof BlockDirt) { // Hoe tillAOE( - stack, - player, - world, - mop.blockX, - mop.blockY, - mop.blockZ, - world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ), - 0); + stack, + player, + world, + mop.blockX, + mop.blockY, + mop.blockZ, + world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ), + 0); } else if (blockHit instanceof BlockLog) { // Axe clearOdAOE(world, stack, player, "logWood", 0); @@ -117,8 +117,8 @@ public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); return multimap; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedPick.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedPick.java index 98d1125ce..4a9a10a72 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedPick.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedPick.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.items.tools; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.AchievementHandler; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -10,16 +7,18 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.AchievementHandler; + public class RedPick extends DarkPick { public RedPick() { super( - "rm_pick", - (byte) 3, - new String[] { StatCollector.translateToLocal("pe.redpick.mode1"), - StatCollector.translateToLocal("pe.redpick.mode2"), - StatCollector.translateToLocal("pe.redpick.mode3"), - StatCollector.translateToLocal("pe.redpick.mode4") }); + "rm_pick", + (byte) 3, + new String[] { StatCollector.translateToLocal("pe.redpick.mode1"), + StatCollector.translateToLocal("pe.redpick.mode2"), StatCollector.translateToLocal("pe.redpick.mode3"), + StatCollector.translateToLocal("pe.redpick.mode4") }); this.setNoRepair(); this.peToolMaterial = "rm_tools"; this.pePrimaryToolClass = "pickaxe"; @@ -40,7 +39,7 @@ public void onCreated(ItemStack stack, World world, EntityPlayer player) { @Override public float getDigSpeed(ItemStack stack, Block block, int metadata) { if ((block == ObjHandler.matterBlock && metadata == 1) || block == ObjHandler.rmFurnaceOff - || block == ObjHandler.rmFurnaceOn) { + || block == ObjHandler.rmFurnaceOn) { return 1200000.0F; } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedStar.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedStar.java index 0694a5868..5b3b1289c 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedStar.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedStar.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.items.tools; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockClay; import net.minecraft.block.BlockDirt; @@ -23,16 +19,20 @@ import com.google.common.collect.Multimap; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.ItemHelper; + public class RedStar extends PEToolBase { public RedStar() { super( - "rm_morning_star", - (byte) 4, - new String[] { StatCollector.translateToLocal("pe.morningstar.mode1"), - StatCollector.translateToLocal("pe.morningstar.mode2"), - StatCollector.translateToLocal("pe.morningstar.mode3"), - StatCollector.translateToLocal("pe.morningstar.mode4"), }); + "rm_morning_star", + (byte) 4, + new String[] { StatCollector.translateToLocal("pe.morningstar.mode1"), + StatCollector.translateToLocal("pe.morningstar.mode2"), + StatCollector.translateToLocal("pe.morningstar.mode3"), + StatCollector.translateToLocal("pe.morningstar.mode4"), }); this.setNoRepair(); this.peToolMaterial = "rm_tools"; this.pePrimaryToolClass = "morning_star"; @@ -66,7 +66,7 @@ public boolean hitEntity(ItemStack stack, EntityLivingBase damaged, EntityLiving @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, - EntityLivingBase eLiving) { + EntityLivingBase eLiving) { digBasedOnMode(stack, world, block, x, y, z, eLiving); return true; } @@ -109,9 +109,9 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla @Override public float getDigSpeed(ItemStack stack, Block block, int metadata) { if (block == ObjHandler.matterBlock || block == ObjHandler.dmFurnaceOff - || block == ObjHandler.dmFurnaceOn - || block == ObjHandler.rmFurnaceOff - || block == ObjHandler.rmFurnaceOn) { + || block == ObjHandler.dmFurnaceOn + || block == ObjHandler.rmFurnaceOff + || block == ObjHandler.rmFurnaceOn) { return 1200000.0F; } @@ -129,8 +129,8 @@ public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Weapon modifier", damage, 0)); return multimap; } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedSword.java b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedSword.java index 71bbd6b79..395cfdace 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedSword.java +++ b/src/main/java/moze_intel/projecte/gameObjs/items/tools/RedSword.java @@ -1,20 +1,20 @@ package moze_intel.projecte.gameObjs.items.tools; -import moze_intel.projecte.config.ProjectEConfig; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import moze_intel.projecte.config.ProjectEConfig; + public class RedSword extends DarkSword { public RedSword() { super( - "rm_sword", - (byte) 3, - new String[] { StatCollector.translateToLocal("pe.redsword.mode1"), - StatCollector.translateToLocal("pe.redsword.mode2") }); + "rm_sword", + (byte) 3, + new String[] { StatCollector.translateToLocal("pe.redsword.mode1"), + StatCollector.translateToLocal("pe.redsword.mode2") }); this.setNoRepair(); this.peToolMaterial = "rm_tools"; this.pePrimaryToolClass = "sword"; diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/AlchChestTile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/AlchChestTile.java index b3111bee6..42995f392 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/AlchChestTile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/AlchChestTile.java @@ -1,14 +1,14 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.api.item.IAlchChestItem; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import moze_intel.projecte.api.item.IAlchChestItem; +import moze_intel.projecte.gameObjs.ObjHandler; + public class AlchChestTile extends TileEmcDirection implements IInventory { private ItemStack[] inventory = new ItemStack[104]; @@ -121,10 +121,8 @@ public ItemStack[] getBackingInventoryArray() { @Override public boolean isUseableByPlayer(EntityPlayer var1) { return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false - : var1.getDistanceSq( - (double) this.xCoord + 0.5D, - (double) this.yCoord + 0.5D, - (double) this.zCoord + 0.5D) <= 64.0D; + : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override @@ -143,12 +141,12 @@ public void updateEntity() { adjustedXCoord = xCoord + 0.5D; adjustedZCoord = zCoord + 0.5D; worldObj.playSoundEffect( - adjustedXCoord, - yCoord + 0.5D, - adjustedZCoord, - "random.chestopen", - 0.5F, - worldObj.rand.nextFloat() * 0.1F + 0.9F); + adjustedXCoord, + yCoord + 0.5D, + adjustedZCoord, + "random.chestopen", + 0.5F, + worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (numPlayersUsing == 0 && lidAngle > 0.0F || numPlayersUsing > 0 && lidAngle < 1.0F) { @@ -168,12 +166,12 @@ public void updateEntity() { adjustedXCoord = xCoord + 0.5D; adjustedZCoord = zCoord + 0.5D; worldObj.playSoundEffect( - adjustedXCoord, - yCoord + 0.5D, - adjustedZCoord, - "random.chestclosed", - 0.5F, - worldObj.rand.nextFloat() * 0.1F + 0.9F); + adjustedXCoord, + yCoord + 0.5D, + adjustedZCoord, + "random.chestclosed", + 0.5F, + worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (lidAngle < 0.0F) { @@ -182,7 +180,8 @@ public void updateEntity() { } if (worldObj.isRemote) { - if (worldObj.getChunkFromBlockCoords(xCoord, zCoord).isEmpty()) { + if (worldObj.getChunkFromBlockCoords(xCoord, zCoord) + .isEmpty()) { // Handle condition where this method is called even after the clientside chunk has unloaded. // This will make IAlchChestItems below crash with an NPE since the TE they get back is null // Don't you love vanilla??? diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/CollectorMK1Tile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/CollectorMK1Tile.java index 0dfd92408..1e9d4a602 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/CollectorMK1Tile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/CollectorMK1Tile.java @@ -2,17 +2,6 @@ import java.util.Map; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.api.tile.IEmcProvider; -import moze_intel.projecte.emc.FuelMapper; -import moze_intel.projecte.gameObjs.items.ItemPE; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.CollectorSyncPKT; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -23,6 +12,16 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.api.tile.IEmcProvider; +import moze_intel.projecte.emc.FuelMapper; +import moze_intel.projecte.gameObjs.items.ItemPE; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.CollectorSyncPKT; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.WorldHelper; public class CollectorMK1Tile extends TileEmc implements IInventory, ISidedInventory, IEmcProvider { @@ -99,15 +98,15 @@ public void updateEntity() { if (numUsing > 0) { PacketHandler.sendToAllAround( - new CollectorSyncPKT(displayEmc, displayItemCharge, this.xCoord, this.yCoord, this.zCoord), - new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 8)); + new CollectorSyncPKT(displayEmc, displayItemCharge, this.xCoord, this.yCoord, this.zCoord), + new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 8)); } } private void sortInventory() { if (inventory[upgradedSlot] != null) { if (!(inventory[lockSlot] != null && inventory[upgradedSlot].getItem() == inventory[lockSlot].getItem() - && inventory[upgradedSlot].stackSize < inventory[upgradedSlot].getMaxStackSize())) { + && inventory[upgradedSlot].stackSize < inventory[upgradedSlot].getMaxStackSize())) { for (int i = 1; i < invBufferSize; i++) { if (inventory[i] == null) { inventory[i] = inventory[upgradedSlot]; @@ -146,19 +145,19 @@ private void sortInventory() { continue; } else if (ItemHelper.areItemStacksEqual(current, following) - && following.stackSize < following.getMaxStackSize()) { - int missingForFullStack = following.getMaxStackSize() - following.stackSize; - - if (current.stackSize <= missingForFullStack) { - inventory[nextIndex].stackSize += current.stackSize; - inventory[i] = null; - } else { - inventory[nextIndex].stackSize += missingForFullStack; - decrStackSize(i, missingForFullStack); - } - - continue; + && following.stackSize < following.getMaxStackSize()) { + int missingForFullStack = following.getMaxStackSize() - following.stackSize; + + if (current.stackSize <= missingForFullStack) { + inventory[nextIndex].stackSize += current.stackSize; + inventory[i] = null; + } else { + inventory[nextIndex].stackSize += missingForFullStack; + decrStackSize(i, missingForFullStack); } + + continue; + } } } @@ -198,7 +197,7 @@ public void updateEmc() { } ItemStack result = inventory[lockSlot] == null ? FuelMapper.getFuelUpgrade(inventory[0]) - : inventory[lockSlot].copy(); + : inventory[lockSlot].copy(); long upgradeCost = EMCHelper.getEmcValue(result) - EMCHelper.getEmcValue(inventory[0]); @@ -210,11 +209,11 @@ public void updateEmc() { this.setInventorySlotContents(upgradedSlot, result); this.decrStackSize(0, 1); } else if (ItemHelper.basicAreStacksEqual(result, upgrade) - && upgrade.stackSize < upgrade.getMaxStackSize()) { - this.removeEMC(upgradeCost); - inventory[upgradedSlot].stackSize++; - this.decrStackSize(0, 1); - } + && upgrade.stackSize < upgrade.getMaxStackSize()) { + this.removeEMC(upgradeCost); + inventory[upgradedSlot].stackSize++; + this.decrStackSize(0, 1); + } } } else { double toSend = this.getStoredEmc() < emcGen ? this.getStoredEmc() : emcGen; @@ -253,7 +252,7 @@ public int getKleinStarChargeScaled(int i) { } return ((int) Math - .round(displayItemCharge * i / ((IItemEmc) inventory[0].getItem()).getMaximumEmc(inventory[0]))); + .round(displayItemCharge * i / ((IItemEmc) inventory[0].getItem()).getMaximumEmc(inventory[0]))); } public int getSunLevel() { @@ -293,7 +292,7 @@ public long getFuelProgressScaled(int i) { return 0; } else { reqEmc = EMCHelper.getEmcValue(FuelMapper.getFuelUpgrade(inventory[0])) - - EMCHelper.getEmcValue(inventory[0]); + - EMCHelper.getEmcValue(inventory[0]); } } @@ -404,10 +403,8 @@ public int getInventoryStackLimit() { @Override public boolean isUseableByPlayer(EntityPlayer var1) { return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false - : var1.getDistanceSq( - (double) this.xCoord + 0.5D, - (double) this.yCoord + 0.5D, - (double) this.zCoord + 0.5D) <= 64.0D; + : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override @@ -454,7 +451,7 @@ public boolean canExtractItem(int slot, ItemStack stack, int side) { private void sendRelayBonus() { for (Map.Entry entry : WorldHelper.getAdjacentTileEntitiesMapped(worldObj, this) - .entrySet()) { + .entrySet()) { ForgeDirection dir = entry.getKey(); TileEntity tile = entry.getValue(); diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserMK2Tile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserMK2Tile.java index 7dfcb6852..87fad31cf 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserMK2Tile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserMK2Tile.java @@ -1,9 +1,9 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.utils.EMCHelper; - import net.minecraft.item.ItemStack; +import moze_intel.projecte.utils.EMCHelper; + public class CondenserMK2Tile extends CondenserTile { private static final int LOCK_SLOT = 0; diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserTile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserTile.java index 153a1cdd7..af350c748 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserTile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/CondenserTile.java @@ -1,15 +1,5 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.api.tile.IEmcAcceptor; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.handlers.TileEntityHandler; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.CondenserSyncPKT; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.NBTWhitelist; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -19,6 +9,15 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import moze_intel.projecte.api.tile.IEmcAcceptor; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.handlers.TileEntityHandler; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.CondenserSyncPKT; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.NBTWhitelist; public class CondenserTile extends TileEmcDirection implements IInventory, ISidedInventory, IEmcAcceptor { @@ -60,8 +59,8 @@ public void updateEntity() { if (numPlayersUsing > 0) { PacketHandler.sendToAllAround( - new CondenserSyncPKT(displayEmc, requiredEmc, this.xCoord, this.yCoord, this.zCoord), - new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 8)); + new CondenserSyncPKT(displayEmc, requiredEmc, this.xCoord, this.yCoord, this.zCoord), + new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 8)); } } @@ -302,10 +301,8 @@ public int getInventoryStackLimit() { @Override public boolean isUseableByPlayer(EntityPlayer var1) { return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false - : var1.getDistanceSq( - (double) this.xCoord + 0.5D, - (double) this.yCoord + 0.5D, - (double) this.zCoord + 0.5D) <= 64.0D; + : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } public void updateChest() { @@ -321,12 +318,12 @@ public void updateChest() { adjustedXCoord = xCoord + 0.5D; adjustedZCoord = zCoord + 0.5D; worldObj.playSoundEffect( - adjustedXCoord, - yCoord + 0.5D, - adjustedZCoord, - "random.chestopen", - 0.5F, - worldObj.rand.nextFloat() * 0.1F + 0.9F); + adjustedXCoord, + yCoord + 0.5D, + adjustedZCoord, + "random.chestopen", + 0.5F, + worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (numPlayersUsing == 0 && lidAngle > 0.0F || numPlayersUsing > 0 && lidAngle < 1.0F) { @@ -346,12 +343,12 @@ public void updateChest() { adjustedXCoord = xCoord + 0.5D; adjustedZCoord = zCoord + 0.5D; worldObj.playSoundEffect( - adjustedXCoord, - yCoord + 0.5D, - adjustedZCoord, - "random.chestclosed", - 0.5F, - worldObj.rand.nextFloat() * 0.1F + 0.9F); + adjustedXCoord, + yCoord + 0.5D, + adjustedZCoord, + "random.chestclosed", + 0.5F, + worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (lidAngle < 0.0F) { diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/DMFurnaceTile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/DMFurnaceTile.java index 25ed944e4..fab7aa6b5 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/DMFurnaceTile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/DMFurnaceTile.java @@ -1,7 +1,5 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.api.item.IItemEmc; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -10,6 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IItemEmc; public class DMFurnaceTile extends RMFurnaceTile implements IInventory, ISidedInventory { @@ -41,7 +40,8 @@ public boolean isItemValidForSlot(int slot, ItemStack stack) { if (slot == 0) { return TileEntityFurnace.isItemFuel(stack) || stack.getItem() instanceof IItemEmc; } else if (slot >= 1 && slot <= 9) { - return FurnaceRecipes.smelting().getSmeltingResult(stack) != null; + return FurnaceRecipes.smelting() + .getSmeltingResult(stack) != null; } return false; diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/DMPedestalTile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/DMPedestalTile.java index 4f3a46d68..b17474b5a 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/DMPedestalTile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/DMPedestalTile.java @@ -1,9 +1,5 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.api.item.IPedestalItem; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.SyncPedestalPKT; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -13,6 +9,10 @@ import net.minecraft.network.Packet; import net.minecraft.util.AxisAlignedBB; +import moze_intel.projecte.api.item.IPedestalItem; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.SyncPedestalPKT; + public class DMPedestalTile extends TileEmc implements IInventory { private boolean isActive = false; @@ -29,7 +29,8 @@ public DMPedestalTile() { @Override public void updateEntity() { if (worldObj.isRemote) { - if (worldObj.getChunkFromBlockCoords(xCoord, zCoord).isEmpty()) { + if (worldObj.getChunkFromBlockCoords(xCoord, zCoord) + .isEmpty()) { // Handle condition where this method is called even after the clientside chunk has unloaded. // This will make IPedestalItems below crash with an NPE since the TE they get back is null // Don't you love vanilla??? @@ -42,12 +43,12 @@ public void updateEntity() { if (effectBounds == null) { effectBounds = AxisAlignedBB.getBoundingBox( - centeredX - 4.5, - centeredY - 4.5, - centeredZ - 4.5, - centeredX + 4.5, - centeredY + 4.5, - centeredZ + 4.5); + centeredX - 4.5, + centeredY - 4.5, + centeredZ - 4.5, + centeredX + 4.5, + centeredY + 4.5, + centeredZ + 4.5); } if (getActive()) { @@ -213,10 +214,8 @@ public int getInventoryStackLimit() { @Override public boolean isUseableByPlayer(EntityPlayer var1) { return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false - : var1.getDistanceSq( - (double) this.xCoord + 0.5D, - (double) this.yCoord + 0.5D, - (double) this.zCoord + 0.5D) <= 64.0D; + : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override @@ -247,25 +246,25 @@ public void setActive(boolean newState) { worldObj.playSoundEffect(centeredX, centeredY, centeredZ, "projecte:item.pecharge", 1.0F, 1.0F); for (int i = 0; i < worldObj.rand.nextInt(35) + 10; ++i) { this.worldObj.spawnParticle( - "witchMagic", - centeredX + worldObj.rand.nextGaussian() * 0.12999999523162842D, - yCoord + 1 + worldObj.rand.nextGaussian() * 0.12999999523162842D, - centeredZ + worldObj.rand.nextGaussian() * 0.12999999523162842D, - 0.0D, - 0.0D, - 0.0D); + "witchMagic", + centeredX + worldObj.rand.nextGaussian() * 0.12999999523162842D, + yCoord + 1 + worldObj.rand.nextGaussian() * 0.12999999523162842D, + centeredZ + worldObj.rand.nextGaussian() * 0.12999999523162842D, + 0.0D, + 0.0D, + 0.0D); } } else { worldObj.playSoundEffect(centeredX, centeredY, centeredZ, "projecte:item.peuncharge", 1.0F, 1.0F); for (int i = 0; i < worldObj.rand.nextInt(35) + 10; ++i) { this.worldObj.spawnParticle( - "smoke", - centeredX + worldObj.rand.nextGaussian() * 0.12999999523162842D, - yCoord + 1 + worldObj.rand.nextGaussian() * 0.12999999523162842D, - centeredZ + worldObj.rand.nextGaussian() * 0.12999999523162842D, - 0.0D, - 0.0D, - 0.0D); + "smoke", + centeredX + worldObj.rand.nextGaussian() * 0.12999999523162842D, + yCoord + 1 + worldObj.rand.nextGaussian() * 0.12999999523162842D, + centeredZ + worldObj.rand.nextGaussian() * 0.12999999523162842D, + 0.0D, + 0.0D, + 0.0D); } } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/InterdictionTile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/InterdictionTile.java index fb420aba6..d0e2de88f 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/InterdictionTile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/InterdictionTile.java @@ -1,10 +1,10 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import moze_intel.projecte.utils.WorldHelper; + public class InterdictionTile extends TileEntity { private AxisAlignedBB effectBounds = null; @@ -12,9 +12,9 @@ public class InterdictionTile extends TileEntity { public void updateEntity() { if (effectBounds == null) { effectBounds = AxisAlignedBB - .getBoundingBox(xCoord - 8, yCoord - 8, zCoord - 8, xCoord + 8, yCoord + 8, zCoord + 8); + .getBoundingBox(xCoord - 8, yCoord - 8, zCoord - 8, xCoord + 8, yCoord + 8, zCoord + 8); } WorldHelper - .repelEntitiesInAABBFromPoint(worldObj, effectBounds, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, false); + .repelEntitiesInAABBFromPoint(worldObj, effectBounds, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, false); } } diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/RMFurnaceTile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/RMFurnaceTile.java index 0c40fead6..55a6343c6 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/RMFurnaceTile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/RMFurnaceTile.java @@ -1,10 +1,5 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.api.tile.IEmcAcceptor; -import moze_intel.projecte.gameObjs.blocks.MatterFurnace; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -20,6 +15,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.api.tile.IEmcAcceptor; +import moze_intel.projecte.gameObjs.blocks.MatterFurnace; +import moze_intel.projecte.utils.ItemHelper; public class RMFurnaceTile extends TileEmc implements IInventory, ISidedInventory, IEmcAcceptor { @@ -76,7 +75,8 @@ public void updateEntity() { --inventory[0].stackSize; if (inventory[0].stackSize == 0) { - inventory[0] = inventory[0].getItem().getContainerItem(inventory[0]); + inventory[0] = inventory[0].getItem() + .getContainerItem(inventory[0]); } } } @@ -98,7 +98,7 @@ public void updateEntity() { if (!this.worldObj.isRemote && block instanceof MatterFurnace) { ((MatterFurnace) block) - .updateFurnaceBlockState(furnaceBurnTime > 0, worldObj, xCoord, yCoord, zCoord); + .updateFurnaceBlockState(furnaceBurnTime > 0, worldObj, xCoord, yCoord, zCoord); } } } @@ -270,9 +270,10 @@ private void pullFromInventories() { } continue; - } else if (FurnaceRecipes.smelting().getSmeltingResult(stack) == null) { - continue; - } + } else if (FurnaceRecipes.smelting() + .getSmeltingResult(stack) == null) { + continue; + } for (int j = inputStorage[0]; j < inputStorage[1]; j++) { ItemStack otherStack = inventory[j]; @@ -374,10 +375,13 @@ private void pushToInventories() { private void smeltItem() { ItemStack toSmelt = inventory[1]; - ItemStack smeltResult = FurnaceRecipes.smelting().getSmeltingResult(toSmelt).copy(); + ItemStack smeltResult = FurnaceRecipes.smelting() + .getSmeltingResult(toSmelt) + .copy(); ItemStack currentSmelted = getStackInSlot(outputSlot); - if (ItemHelper.getOreDictionaryName(toSmelt).startsWith("ore")) { + if (ItemHelper.getOreDictionaryName(toSmelt) + .startsWith("ore")) { smeltResult.stackSize *= 2; } @@ -397,7 +401,8 @@ private boolean canSmelt() { return false; } - ItemStack smeltResult = FurnaceRecipes.smelting().getSmeltingResult(toSmelt); + ItemStack smeltResult = FurnaceRecipes.smelting() + .getSmeltingResult(toSmelt); if (smeltResult == null) { return false; } @@ -529,10 +534,8 @@ public int getInventoryStackLimit() { @Override public boolean isUseableByPlayer(EntityPlayer var1) { return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false - : var1.getDistanceSq( - (double) this.xCoord + 0.5D, - (double) this.yCoord + 0.5D, - (double) this.zCoord + 0.5D) <= 64.0D; + : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override @@ -554,7 +557,8 @@ public boolean isItemValidForSlot(int slot, ItemStack stack) { if (slot == 0) { return TileEntityFurnace.isItemFuel(stack) || stack.getItem() instanceof IItemEmc; } else if (slot >= 1 && slot <= 13) { - return FurnaceRecipes.smelting().getSmeltingResult(stack) != null; + return FurnaceRecipes.smelting() + .getSmeltingResult(stack) != null; } return false; @@ -567,7 +571,7 @@ public int[] getAccessibleSlotsFromSide(int side) { return new int[] { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }; // Outputs accessible from bottom case 1: return new int[] { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26 }; // Inputs accessible from top + 26 }; // Inputs accessible from top case 2: // Fall through case 3: case 4: diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/RelayMK1Tile.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/RelayMK1Tile.java index 328888ced..bace3e23d 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/RelayMK1Tile.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/RelayMK1Tile.java @@ -1,14 +1,5 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.api.tile.IEmcAcceptor; -import moze_intel.projecte.api.tile.IEmcProvider; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.RelaySyncPKT; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -19,6 +10,14 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.api.tile.IEmcAcceptor; +import moze_intel.projecte.api.tile.IEmcProvider; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.RelaySyncPKT; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; public class RelayMK1Tile extends TileEmc implements IInventory, ISidedInventory, IEmcAcceptor, IEmcProvider { @@ -90,14 +89,8 @@ public void updateEntity() { if (numUsing > 0) { PacketHandler.sendToAllAround( - new RelaySyncPKT( - displayEmc, - displayChargingEmc, - displayRawEmc, - this.xCoord, - this.yCoord, - this.zCoord), - new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 8)); + new RelaySyncPKT(displayEmc, displayChargingEmc, displayRawEmc, this.xCoord, this.yCoord, this.zCoord), + new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 8)); } } @@ -127,17 +120,17 @@ private void sortInventory() { inventory[nextIndex] = current; decrStackSize(i, current.stackSize); } else if (ItemHelper.areItemStacksEqual(current, following) - && following.stackSize < following.getMaxStackSize()) { - int missingForFullStack = following.getMaxStackSize() - following.stackSize; - - if (current.stackSize <= missingForFullStack) { - inventory[nextIndex].stackSize += current.stackSize; - inventory[i] = null; - } else { - inventory[nextIndex].stackSize += missingForFullStack; - decrStackSize(i, missingForFullStack); - } + && following.stackSize < following.getMaxStackSize()) { + int missingForFullStack = following.getMaxStackSize() - following.stackSize; + + if (current.stackSize <= missingForFullStack) { + inventory[nextIndex].stackSize += current.stackSize; + inventory[i] = null; + } else { + inventory[nextIndex].stackSize += missingForFullStack; + decrStackSize(i, missingForFullStack); } + } } } @@ -174,7 +167,7 @@ public int getChargingEMCScaled(int i) { int index = getSizeInventory() - 1; if (inventory[index] != null && inventory[index].getItem() instanceof IItemEmc) { return ((int) Math.round( - displayChargingEmc * i / ((IItemEmc) inventory[index].getItem()).getMaximumEmc(inventory[index]))); + displayChargingEmc * i / ((IItemEmc) inventory[index].getItem()).getMaximumEmc(inventory[index]))); } return 0; @@ -199,7 +192,7 @@ public int getRawEmcScaled(int i) { if (inventory[0].getItem() instanceof IItemEmc) { return (int) Math - .round(displayRawEmc * i / ((IItemEmc) inventory[0].getItem()).getMaximumEmc(inventory[0])); + .round(displayRawEmc * i / ((IItemEmc) inventory[0].getItem()).getMaximumEmc(inventory[0])); } long emc = EMCHelper.getEmcValue(inventory[0]); @@ -294,10 +287,8 @@ public int getInventoryStackLimit() { @Override public boolean isUseableByPlayer(EntityPlayer var1) { return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false - : var1.getDistanceSq( - (double) this.xCoord + 0.5D, - (double) this.yCoord + 0.5D, - (double) this.zCoord + 0.5D) <= 64.0D; + : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override @@ -341,9 +332,9 @@ public boolean canExtractItem(int slot, ItemStack stack, int side) { @Override public double acceptEMC(ForgeDirection side, double toAccept) { if (worldObj.getTileEntity( - xCoord + side.offsetX, - yCoord + side.offsetY, - zCoord + side.offsetZ) instanceof RelayMK1Tile) { + xCoord + side.offsetX, + yCoord + side.offsetY, + zCoord + side.offsetZ) instanceof RelayMK1Tile) { return 0; // Do not accept from other relays - avoid infinite loop / thrashing } else { double toAdd = Math.min(maximumEMC - currentEMC, toAccept); diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmc.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmc.java index 8199f0174..b44292509 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmc.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmc.java @@ -2,18 +2,18 @@ import java.util.Map; -import moze_intel.projecte.api.tile.IEmcAcceptor; -import moze_intel.projecte.api.tile.IEmcProvider; -import moze_intel.projecte.api.tile.TileEmcBase; -import moze_intel.projecte.utils.Constants; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import com.google.common.base.Predicates; import com.google.common.collect.Maps; +import moze_intel.projecte.api.tile.IEmcAcceptor; +import moze_intel.projecte.api.tile.IEmcProvider; +import moze_intel.projecte.api.tile.TileEmcBase; +import moze_intel.projecte.utils.Constants; +import moze_intel.projecte.utils.WorldHelper; + public abstract class TileEmc extends TileEmcBase { public TileEmc() { @@ -41,15 +41,18 @@ public void sendToAllAcceptors(double emc) { } Map tiles = Maps.filterValues( - WorldHelper.getAdjacentTileEntitiesMapped(worldObj, this), - Predicates.instanceOf(IEmcAcceptor.class)); + WorldHelper.getAdjacentTileEntitiesMapped(worldObj, this), + Predicates.instanceOf(IEmcAcceptor.class)); double emcPer = emc / tiles.size(); for (Map.Entry entry : tiles.entrySet()) { if (this instanceof RelayMK1Tile && entry.getValue() instanceof RelayMK1Tile) { continue; } - double provide = ((IEmcProvider) this).provideEMC(entry.getKey().getOpposite(), emcPer); + double provide = ((IEmcProvider) this).provideEMC( + entry.getKey() + .getOpposite(), + emcPer); double remain = provide - ((IEmcAcceptor) entry.getValue()).acceptEMC(entry.getKey(), provide); this.addEMC(remain); } diff --git a/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmcDirection.java b/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmcDirection.java index cecf2cb17..322e0fd6b 100644 --- a/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmcDirection.java +++ b/src/main/java/moze_intel/projecte/gameObjs/tiles/TileEmcDirection.java @@ -1,8 +1,5 @@ package moze_intel.projecte.gameObjs.tiles; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.OrientationSyncPKT; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -11,6 +8,9 @@ import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.OrientationSyncPKT; + public abstract class TileEmcDirection extends TileEmc { private ForgeDirection orientation; diff --git a/src/main/java/moze_intel/projecte/handlers/PlayerChecks.java b/src/main/java/moze_intel/projecte/handlers/PlayerChecks.java index 64be4a92e..7782929df 100644 --- a/src/main/java/moze_intel/projecte/handlers/PlayerChecks.java +++ b/src/main/java/moze_intel/projecte/handlers/PlayerChecks.java @@ -2,19 +2,19 @@ import java.util.Set; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.items.IFireProtector; -import moze_intel.projecte.gameObjs.items.IFlightProvider; -import moze_intel.projecte.gameObjs.items.IStepAssister; -import moze_intel.projecte.utils.PlayerHelper; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import com.google.common.collect.Sets; + import gnu.trove.map.hash.TObjectIntHashMap; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.items.IFireProtector; +import moze_intel.projecte.gameObjs.items.IFlightProvider; +import moze_intel.projecte.gameObjs.items.IStepAssister; +import moze_intel.projecte.utils.PlayerHelper; public final class PlayerChecks { @@ -115,7 +115,7 @@ private static boolean shouldPlayerFly(EntityPlayerMP player) { for (ItemStack stack : player.inventory.armorInventory) { if (stack != null && stack.getItem() instanceof IFlightProvider - && ((IFlightProvider) stack.getItem()).canProvideFlight(stack, player)) { + && ((IFlightProvider) stack.getItem()).canProvideFlight(stack, player)) { return true; } } @@ -124,7 +124,7 @@ private static boolean shouldPlayerFly(EntityPlayerMP player) { ItemStack stack = player.inventory.getStackInSlot(i); if (stack != null && stack.getItem() instanceof IFlightProvider - && ((IFlightProvider) stack.getItem()).canProvideFlight(stack, player)) { + && ((IFlightProvider) stack.getItem()).canProvideFlight(stack, player)) { return true; } } @@ -134,7 +134,7 @@ private static boolean shouldPlayerFly(EntityPlayerMP player) { for (int i = 0; i < baubles.getSizeInventory(); i++) { ItemStack stack = baubles.getStackInSlot(i); if (stack != null && stack.getItem() instanceof IFlightProvider - && ((IFlightProvider) stack.getItem()).canProvideFlight(stack, player)) { + && ((IFlightProvider) stack.getItem()).canProvideFlight(stack, player)) { return true; } } @@ -150,7 +150,7 @@ private static boolean shouldPlayerResistFire(EntityPlayerMP player) { for (ItemStack stack : player.inventory.armorInventory) { if (stack != null && stack.getItem() instanceof IFireProtector - && ((IFireProtector) stack.getItem()).canProtectAgainstFire(stack, player)) { + && ((IFireProtector) stack.getItem()).canProtectAgainstFire(stack, player)) { return true; } } @@ -159,7 +159,7 @@ private static boolean shouldPlayerResistFire(EntityPlayerMP player) { ItemStack stack = player.inventory.getStackInSlot(i); if (stack != null && stack.getItem() instanceof IFireProtector - && ((IFireProtector) stack.getItem()).canProtectAgainstFire(stack, player)) { + && ((IFireProtector) stack.getItem()).canProtectAgainstFire(stack, player)) { return true; } } @@ -169,7 +169,7 @@ private static boolean shouldPlayerResistFire(EntityPlayerMP player) { for (int i = 0; i < baubles.getSizeInventory(); i++) { ItemStack stack = baubles.getStackInSlot(i); if (stack != null && stack.getItem() instanceof IFireProtector - && ((IFireProtector) stack.getItem()).canProtectAgainstFire(stack, player)) { + && ((IFireProtector) stack.getItem()).canProtectAgainstFire(stack, player)) { return true; } } @@ -181,7 +181,7 @@ private static boolean shouldPlayerResistFire(EntityPlayerMP player) { private static boolean shouldPlayerStep(EntityPlayerMP player) { for (ItemStack stack : player.inventory.armorInventory) { if (stack != null && stack.getItem() instanceof IStepAssister - && ((IStepAssister) stack.getItem()).canAssistStep(stack, player)) { + && ((IStepAssister) stack.getItem()).canAssistStep(stack, player)) { return true; } } @@ -190,7 +190,7 @@ private static boolean shouldPlayerStep(EntityPlayerMP player) { ItemStack stack = player.inventory.getStackInSlot(i); if (stack != null && stack.getItem() instanceof IStepAssister - && ((IStepAssister) stack.getItem()).canAssistStep(stack, player)) { + && ((IStepAssister) stack.getItem()).canAssistStep(stack, player)) { return true; } } @@ -200,7 +200,7 @@ private static boolean shouldPlayerStep(EntityPlayerMP player) { for (int i = 0; i < baubles.getSizeInventory(); i++) { ItemStack stack = baubles.getStackInSlot(i); if (stack != null && stack.getItem() instanceof IStepAssister - && ((IStepAssister) stack.getItem()).canAssistStep(stack, player)) { + && ((IStepAssister) stack.getItem()).canAssistStep(stack, player)) { return true; } } @@ -212,7 +212,7 @@ private static boolean shouldPlayerStep(EntityPlayerMP player) { private static boolean hasSwrg(EntityPlayerMP player) { for (int i = 0; i <= 8; i++) { if (player.inventory.mainInventory[i] != null - && player.inventory.mainInventory[i].getItem() == ObjHandler.swrg) { + && player.inventory.mainInventory[i].getItem() == ObjHandler.swrg) { return true; } } @@ -220,7 +220,8 @@ private static boolean hasSwrg(EntityPlayerMP player) { IInventory baubles = PlayerHelper.getBaubles(player); if (baubles != null) { for (int i = 0; i < baubles.getSizeInventory(); i++) { - if (baubles.getStackInSlot(i) != null && baubles.getStackInSlot(i).getItem() == ObjHandler.swrg) { + if (baubles.getStackInSlot(i) != null && baubles.getStackInSlot(i) + .getItem() == ObjHandler.swrg) { return true; } } diff --git a/src/main/java/moze_intel/projecte/handlers/TileEntityHandler.java b/src/main/java/moze_intel/projecte/handlers/TileEntityHandler.java index 8c7aba59d..1129f4e5a 100644 --- a/src/main/java/moze_intel/projecte/handlers/TileEntityHandler.java +++ b/src/main/java/moze_intel/projecte/handlers/TileEntityHandler.java @@ -2,11 +2,11 @@ import java.util.Set; +import com.google.common.collect.Sets; + import moze_intel.projecte.gameObjs.tiles.CondenserTile; import moze_intel.projecte.utils.PELogger; -import com.google.common.collect.Sets; - public class TileEntityHandler { // The set of all (chunk)loaded condensers on the server. @@ -14,22 +14,22 @@ public class TileEntityHandler { public static void addCondenser(CondenserTile tile) { PELogger.logDebug( - String.format( - "Added condenser at coords %s, %s, %s", - Integer.toString(tile.xCoord), - Integer.toString(tile.yCoord), - Integer.toString(tile.zCoord))); + String.format( + "Added condenser at coords %s, %s, %s", + Integer.toString(tile.xCoord), + Integer.toString(tile.yCoord), + Integer.toString(tile.zCoord))); CONDENSERS.add(tile); } public static void removeCondenser(CondenserTile tile) { if (CONDENSERS.remove(tile)) { PELogger.logDebug( - String.format( - "Removed condenser at coords %s, %s, %s", - Integer.toString(tile.xCoord), - Integer.toString(tile.yCoord), - Integer.toString(tile.zCoord))); + String.format( + "Removed condenser at coords %s, %s, %s", + Integer.toString(tile.xCoord), + Integer.toString(tile.yCoord), + Integer.toString(tile.zCoord))); } } diff --git a/src/main/java/moze_intel/projecte/impl/BlacklistProxyImpl.java b/src/main/java/moze_intel/projecte/impl/BlacklistProxyImpl.java index efaecc04f..1296c390e 100644 --- a/src/main/java/moze_intel/projecte/impl/BlacklistProxyImpl.java +++ b/src/main/java/moze_intel/projecte/impl/BlacklistProxyImpl.java @@ -1,11 +1,5 @@ package moze_intel.projecte.impl; -import moze_intel.projecte.api.proxy.IBlacklistProxy; -import moze_intel.projecte.gameObjs.items.TimeWatch; -import moze_intel.projecte.utils.NBTWhitelist; -import moze_intel.projecte.utils.PELogger; -import moze_intel.projecte.utils.WorldHelper; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -14,6 +8,11 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState; +import moze_intel.projecte.api.proxy.IBlacklistProxy; +import moze_intel.projecte.gameObjs.items.TimeWatch; +import moze_intel.projecte.utils.NBTWhitelist; +import moze_intel.projecte.utils.PELogger; +import moze_intel.projecte.utils.WorldHelper; public class BlacklistProxyImpl implements IBlacklistProxy { @@ -25,40 +24,68 @@ private BlacklistProxyImpl() {} public void blacklistInterdiction(Class clazz) { Preconditions.checkNotNull(clazz); Preconditions.checkState( - Loader.instance().isInState(LoaderState.POSTINITIALIZATION), - "Mod %s registering interdiction blacklist at incorrect time!", - Loader.instance().activeModContainer().getModId()); - doBlacklistInterdiction(clazz, Loader.instance().activeModContainer().getModId()); + Loader.instance() + .isInState(LoaderState.POSTINITIALIZATION), + "Mod %s registering interdiction blacklist at incorrect time!", + Loader.instance() + .activeModContainer() + .getModId()); + doBlacklistInterdiction( + clazz, + Loader.instance() + .activeModContainer() + .getModId()); } @Override public void blacklistSwiftwolf(Class clazz) { Preconditions.checkNotNull(clazz); Preconditions.checkState( - Loader.instance().isInState(LoaderState.POSTINITIALIZATION), - "Mod %s registering SWRG repel at incorrect time!", - Loader.instance().activeModContainer().getModId()); - doBlacklistSwiftwolf(clazz, Loader.instance().activeModContainer().getModId()); + Loader.instance() + .isInState(LoaderState.POSTINITIALIZATION), + "Mod %s registering SWRG repel at incorrect time!", + Loader.instance() + .activeModContainer() + .getModId()); + doBlacklistSwiftwolf( + clazz, + Loader.instance() + .activeModContainer() + .getModId()); } @Override public void blacklistTimeWatch(Class clazz) { Preconditions.checkNotNull(clazz); Preconditions.checkState( - Loader.instance().isInState(LoaderState.POSTINITIALIZATION), - "Mod %s registering TimeWatch blacklist at incorrect time!", - Loader.instance().activeModContainer().getModId()); - doBlacklistTimewatch(clazz, Loader.instance().activeModContainer().getModId()); + Loader.instance() + .isInState(LoaderState.POSTINITIALIZATION), + "Mod %s registering TimeWatch blacklist at incorrect time!", + Loader.instance() + .activeModContainer() + .getModId()); + doBlacklistTimewatch( + clazz, + Loader.instance() + .activeModContainer() + .getModId()); } @Override public void whitelistNBT(ItemStack stack) { Preconditions.checkNotNull(stack); Preconditions.checkState( - Loader.instance().isInState(LoaderState.POSTINITIALIZATION), - "Mod %s registering NBT whitelist at incorrect time!", - Loader.instance().activeModContainer().getModId()); - doWhitelistNBT(stack, Loader.instance().activeModContainer().getModId()); + Loader.instance() + .isInState(LoaderState.POSTINITIALIZATION), + "Mod %s registering NBT whitelist at incorrect time!", + Loader.instance() + .activeModContainer() + .getModId()); + doWhitelistNBT( + stack, + Loader.instance() + .activeModContainer() + .getModId()); } /** diff --git a/src/main/java/moze_intel/projecte/impl/ConversionProxyImpl.java b/src/main/java/moze_intel/projecte/impl/ConversionProxyImpl.java index 28b42ca99..f6523d6fc 100644 --- a/src/main/java/moze_intel/projecte/impl/ConversionProxyImpl.java +++ b/src/main/java/moze_intel/projecte/impl/ConversionProxyImpl.java @@ -3,10 +3,6 @@ import java.util.List; import java.util.Map; -import moze_intel.projecte.api.proxy.IConversionProxy; -import moze_intel.projecte.emc.IngredientMap; -import moze_intel.projecte.emc.NormalizedSimpleStack; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -20,6 +16,9 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; +import moze_intel.projecte.api.proxy.IConversionProxy; +import moze_intel.projecte.emc.IngredientMap; +import moze_intel.projecte.emc.NormalizedSimpleStack; public class ConversionProxyImpl implements IConversionProxy { @@ -61,23 +60,26 @@ public NormalizedSimpleStack objectToNSS(Object object) { return NormalizedSimpleStack.getFor(((FluidStack) object).getFluid()); } else if (object instanceof String) { return NormalizedSimpleStack.forOreDictionary((String) object); - } else if (object != null && object.getClass().equals(Object.class)) { - if (fakes.containsKey(object)) return fakes.get(object); - - NormalizedSimpleStack nss = NormalizedSimpleStack.createFake("" + fakes.size() + " by " + getActiveMod()); - fakes.put(object, nss); - return nss; - } else { - throw new IllegalArgumentException( + } else if (object != null && object.getClass() + .equals(Object.class)) { + if (fakes.containsKey(object)) return fakes.get(object); + + NormalizedSimpleStack nss = NormalizedSimpleStack + .createFake("" + fakes.size() + " by " + getActiveMod()); + fakes.put(object, nss); + return nss; + } else { + throw new IllegalArgumentException( "Can not turn " + object - + " (" - + ClassUtils.getPackageCanonicalName(object, "") - + ") into NormalizedSimpleStack. need ItemStack, FluidStack, String or 'Object'"); - } + + " (" + + ClassUtils.getPackageCanonicalName(object, "") + + ") into NormalizedSimpleStack. need ItemStack, FluidStack, String or 'Object'"); + } } private String getActiveMod() { - ModContainer activeMod = Loader.instance().activeModContainer(); + ModContainer activeMod = Loader.instance() + .activeModContainer(); return activeMod == null ? "unknown Mod" : activeMod.getModId(); } @@ -88,7 +90,7 @@ public class APIConversion { public final ImmutableMap ingredients; private APIConversion(int amount, NormalizedSimpleStack output, - ImmutableMap ingredients) { + ImmutableMap ingredients) { this.amount = amount; this.output = output; this.ingredients = ingredients; diff --git a/src/main/java/moze_intel/projecte/impl/EMCProxyImpl.java b/src/main/java/moze_intel/projecte/impl/EMCProxyImpl.java index caa32be00..1ea611f5c 100644 --- a/src/main/java/moze_intel/projecte/impl/EMCProxyImpl.java +++ b/src/main/java/moze_intel/projecte/impl/EMCProxyImpl.java @@ -2,11 +2,6 @@ import javax.annotation.Nonnull; -import moze_intel.projecte.api.proxy.IEMCProxy; -import moze_intel.projecte.emc.mappers.APICustomEMCMapper; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,6 +10,10 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState; +import moze_intel.projecte.api.proxy.IEMCProxy; +import moze_intel.projecte.emc.mappers.APICustomEMCMapper; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.PELogger; public class EMCProxyImpl implements IEMCProxy { @@ -25,39 +24,53 @@ private EMCProxyImpl() {} @Override public void registerCustomEMC(ItemStack stack, int value) { Preconditions.checkNotNull(stack); - boolean flag = Loader.instance().isInState(LoaderState.PREINITIALIZATION) - || Loader.instance().isInState(LoaderState.INITIALIZATION) - || Loader.instance().isInState(LoaderState.POSTINITIALIZATION); + boolean flag = Loader.instance() + .isInState(LoaderState.PREINITIALIZATION) + || Loader.instance() + .isInState(LoaderState.INITIALIZATION) + || Loader.instance() + .isInState(LoaderState.POSTINITIALIZATION); Preconditions.checkState( - flag, - String.format( - "Mod %s tried to register EMC at an invalid time!", - Loader.instance().activeModContainer().getModId())); + flag, + String.format( + "Mod %s tried to register EMC at an invalid time!", + Loader.instance() + .activeModContainer() + .getModId())); APICustomEMCMapper.instance.registerCustomEMC(stack, value); PELogger.logInfo( - "Mod %s registered emc value %d for itemstack %s", - Loader.instance().activeModContainer().getModId(), - value, - stack.toString()); + "Mod %s registered emc value %d for itemstack %s", + Loader.instance() + .activeModContainer() + .getModId(), + value, + stack.toString()); } @Override public void registerCustomEMC(Object o, int value) { Preconditions.checkNotNull(o); - boolean flag = Loader.instance().isInState(LoaderState.PREINITIALIZATION) - || Loader.instance().isInState(LoaderState.INITIALIZATION) - || Loader.instance().isInState(LoaderState.POSTINITIALIZATION); + boolean flag = Loader.instance() + .isInState(LoaderState.PREINITIALIZATION) + || Loader.instance() + .isInState(LoaderState.INITIALIZATION) + || Loader.instance() + .isInState(LoaderState.POSTINITIALIZATION); Preconditions.checkState( - flag, - String.format( - "Mod %s tried to register EMC at an invalid time!", - Loader.instance().activeModContainer().getModId())); + flag, + String.format( + "Mod %s tried to register EMC at an invalid time!", + Loader.instance() + .activeModContainer() + .getModId())); APICustomEMCMapper.instance.registerCustomEMC(o, value); PELogger.logInfo( - "Mod %s registered emc value %d for Object %s", - Loader.instance().activeModContainer().getModId(), - value, - o); + "Mod %s registered emc value %d for Object %s", + Loader.instance() + .activeModContainer() + .getModId(), + value, + o); } @Override diff --git a/src/main/java/moze_intel/projecte/impl/IMCHandler.java b/src/main/java/moze_intel/projecte/impl/IMCHandler.java index 09bba144d..98a15ce01 100644 --- a/src/main/java/moze_intel/projecte/impl/IMCHandler.java +++ b/src/main/java/moze_intel/projecte/impl/IMCHandler.java @@ -2,13 +2,12 @@ import java.util.Locale; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.event.FMLInterModComms; +import moze_intel.projecte.utils.PELogger; public class IMCHandler { @@ -16,8 +15,8 @@ public static void handleIMC(FMLInterModComms.IMCMessage msg) { String messageKey = msg.key.toLowerCase(Locale.ROOT); if ("registeremc".equals(messageKey)) { PELogger.logWarn( - "Mod %s is using a deprecated version of the ProjectE API, their EMC registrations have been ignored", - msg.getSender()); + "Mod %s is using a deprecated version of the ProjectE API, their EMC registrations have been ignored", + msg.getSender()); } else if ("interdictionblacklist".equals(messageKey) && msg.isStringMessage()) { blacklist(false, msg); } else if ("swrgblacklist".equals(messageKey) && msg.isStringMessage()) { diff --git a/src/main/java/moze_intel/projecte/impl/TransmutationProxyImpl.java b/src/main/java/moze_intel/projecte/impl/TransmutationProxyImpl.java index 4862fc888..d03780ac7 100644 --- a/src/main/java/moze_intel/projecte/impl/TransmutationProxyImpl.java +++ b/src/main/java/moze_intel/projecte/impl/TransmutationProxyImpl.java @@ -5,13 +5,6 @@ import javax.annotation.Nullable; -import moze_intel.projecte.PECore; -import moze_intel.projecte.api.proxy.ITransmutationProxy; -import moze_intel.projecte.playerData.Transmutation; -import moze_intel.projecte.playerData.TransmutationOffline; -import moze_intel.projecte.utils.MetaBlock; -import moze_intel.projecte.utils.WorldTransmutations; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,6 +16,12 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.relauncher.Side; +import moze_intel.projecte.PECore; +import moze_intel.projecte.api.proxy.ITransmutationProxy; +import moze_intel.projecte.playerData.Transmutation; +import moze_intel.projecte.playerData.TransmutationOffline; +import moze_intel.projecte.utils.MetaBlock; +import moze_intel.projecte.utils.WorldTransmutations; public class TransmutationProxyImpl implements ITransmutationProxy { @@ -32,21 +31,24 @@ private TransmutationProxyImpl() {} @Override public boolean registerWorldTransmutation(Block origin, int originMeta, Block result1, int result1Meta, - @Nullable Block result2, int result2meta) { + @Nullable Block result2, int result2meta) { Preconditions.checkNotNull(origin); Preconditions.checkNotNull(result1); Preconditions.checkState( - Loader.instance().isInState(LoaderState.POSTINITIALIZATION), - String.format( - "Mod %s tried to register world transmutation at an invalid time!", - Loader.instance().activeModContainer().getModId())); + Loader.instance() + .isInState(LoaderState.POSTINITIALIZATION), + String.format( + "Mod %s tried to register world transmutation at an invalid time!", + Loader.instance() + .activeModContainer() + .getModId())); if (WorldTransmutations.getWorldTransmutation(new MetaBlock(origin, originMeta), false) != null) { return false; } else { WorldTransmutations.register( - new MetaBlock(origin, originMeta), - new MetaBlock(result1, result1Meta), - result2 == null ? null : new MetaBlock(result2, result2meta)); + new MetaBlock(origin, originMeta), + new MetaBlock(result1, result1Meta), + result2 == null ? null : new MetaBlock(result2, result2meta)); return true; } } @@ -54,14 +56,16 @@ public boolean registerWorldTransmutation(Block origin, int originMeta, Block re @Override public boolean hasKnowledgeFor(UUID playerUUID, ItemStack stack) { Preconditions.checkNotNull(stack); - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + if (FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT) { Preconditions.checkState(PECore.proxy.getClientPlayer() != null, "Client player doesn't exist!"); return Transmutation.hasKnowledgeForStack(stack, PECore.proxy.getClientPlayer()); } else { Preconditions.checkNotNull(playerUUID); Preconditions.checkState( - Loader.instance().hasReachedState(LoaderState.SERVER_STARTED), - "Server must be running to query knowledge!"); + Loader.instance() + .hasReachedState(LoaderState.SERVER_STARTED), + "Server must be running to query knowledge!"); EntityPlayer player = findOnlinePlayer(playerUUID); if (player != null) { return Transmutation.hasKnowledgeForStack(stack, player); @@ -73,14 +77,16 @@ public boolean hasKnowledgeFor(UUID playerUUID, ItemStack stack) { @Override public List getKnowledge(UUID playerUUID) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + if (FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT) { Preconditions.checkState(PECore.proxy.getClientPlayer() != null, "Client player doesn't exist!"); return Transmutation.getKnowledge(PECore.proxy.getClientPlayer()); } else { Preconditions.checkNotNull(playerUUID); Preconditions.checkState( - Loader.instance().hasReachedState(LoaderState.SERVER_STARTED), - "Server must be running to query knowledge!"); + Loader.instance() + .hasReachedState(LoaderState.SERVER_STARTED), + "Server must be running to query knowledge!"); EntityPlayer player = findOnlinePlayer(playerUUID); if (player != null) { return Transmutation.getKnowledge(player); @@ -100,11 +106,14 @@ public void addKnowledge(UUID playerUUID, ItemStack stack) { Preconditions.checkNotNull(playerUUID); Preconditions.checkNotNull(stack); Preconditions.checkState( - FMLCommonHandler.instance().getEffectiveSide().isServer(), - "Cannot modify knowledge clientside!"); + FMLCommonHandler.instance() + .getEffectiveSide() + .isServer(), + "Cannot modify knowledge clientside!"); Preconditions.checkState( - Loader.instance().hasReachedState(LoaderState.SERVER_STARTED), - "Server must be running to modify knowledge!"); + Loader.instance() + .hasReachedState(LoaderState.SERVER_STARTED), + "Server must be running to modify knowledge!"); EntityPlayer player = findOnlinePlayer(playerUUID); if (player != null) { Transmutation.addKnowledge(stack, player); @@ -117,11 +126,14 @@ public void removeKnowledge(UUID playerUUID, ItemStack stack) { Preconditions.checkNotNull(playerUUID); Preconditions.checkNotNull(stack); Preconditions.checkState( - FMLCommonHandler.instance().getEffectiveSide().isServer(), - "Cannot modify knowledge clientside!"); + FMLCommonHandler.instance() + .getEffectiveSide() + .isServer(), + "Cannot modify knowledge clientside!"); Preconditions.checkState( - Loader.instance().hasReachedState(LoaderState.SERVER_STARTED), - "Server must be running to modify knowledge!"); + Loader.instance() + .hasReachedState(LoaderState.SERVER_STARTED), + "Server must be running to modify knowledge!"); EntityPlayer player = findOnlinePlayer(playerUUID); if (player != null) { Transmutation.removeKnowledge(stack, player); @@ -132,11 +144,15 @@ public void removeKnowledge(UUID playerUUID, ItemStack stack) { @Override public void setEMC(UUID playerUUID, double emc) { Preconditions.checkNotNull(playerUUID); - Preconditions - .checkState(FMLCommonHandler.instance().getEffectiveSide().isServer(), "Cannot modify EMC clientside!"); Preconditions.checkState( - Loader.instance().hasReachedState(LoaderState.SERVER_STARTED), - "Server must be running to modify player EMC!"); + FMLCommonHandler.instance() + .getEffectiveSide() + .isServer(), + "Cannot modify EMC clientside!"); + Preconditions.checkState( + Loader.instance() + .hasReachedState(LoaderState.SERVER_STARTED), + "Server must be running to modify player EMC!"); EntityPlayer player = findOnlinePlayer(playerUUID); if (player != null) { Transmutation.setEmc(player, emc); @@ -146,14 +162,16 @@ public void setEMC(UUID playerUUID, double emc) { @Override public double getEMC(UUID playerUUID) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + if (FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT) { Preconditions.checkState(PECore.proxy.getClientPlayer() != null, "Client player doesn't exist!"); return Transmutation.getEmc(PECore.proxy.getClientPlayer()); } else { Preconditions.checkNotNull(playerUUID); Preconditions.checkState( - Loader.instance().hasReachedState(LoaderState.SERVER_STARTED), - "Server must be running to query player EMC!"); + Loader.instance() + .hasReachedState(LoaderState.SERVER_STARTED), + "Server must be running to query player EMC!"); EntityPlayer player = findOnlinePlayer(playerUUID); if (player != null) { return Transmutation.getEmc(player); @@ -166,8 +184,9 @@ public double getEMC(UUID playerUUID) { @SuppressWarnings("unchecked") private EntityPlayer findOnlinePlayer(UUID playerUUID) { for (EntityPlayer player : (List) MinecraftServer.getServer() - .getConfigurationManager().playerEntityList) { - if (player.getUniqueID().equals(playerUUID)) { + .getConfigurationManager().playerEntityList) { + if (player.getUniqueID() + .equals(playerUUID)) { return player; } } diff --git a/src/main/java/moze_intel/projecte/integration/Integration.java b/src/main/java/moze_intel/projecte/integration/Integration.java index 3f9a16e95..7c99f27ca 100644 --- a/src/main/java/moze_intel/projecte/integration/Integration.java +++ b/src/main/java/moze_intel/projecte/integration/Integration.java @@ -1,9 +1,9 @@ package moze_intel.projecte.integration; +import cpw.mods.fml.common.Loader; import moze_intel.projecte.integration.MineTweaker.TweakInit; import moze_intel.projecte.integration.NEI.NEIInit; import moze_intel.projecte.utils.PELogger; -import cpw.mods.fml.common.Loader; public class Integration { // Single class to initiate different mod compatibilities. Idea came from Avaritia by SpitefulFox diff --git a/src/main/java/moze_intel/projecte/integration/MineTweaker/KleinStar.java b/src/main/java/moze_intel/projecte/integration/MineTweaker/KleinStar.java index 894e7b98f..a31b534ae 100644 --- a/src/main/java/moze_intel/projecte/integration/MineTweaker/KleinStar.java +++ b/src/main/java/moze_intel/projecte/integration/MineTweaker/KleinStar.java @@ -3,6 +3,11 @@ import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; + +import cpw.mods.fml.common.registry.GameRegistry; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -10,14 +15,8 @@ import moze_intel.projecte.gameObjs.ObjHandler; import moze_intel.projecte.gameObjs.customRecipes.RecipeShapedKleinStar; import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cpw.mods.fml.common.registry.GameRegistry; @ZenClass("mods.projecte.KleinStar") public class KleinStar { @@ -76,7 +75,7 @@ public AddRecipeAction(ItemStack outputStack, ItemStack[] inputs, boolean shaped @Override public void apply() { recipe = shaped ? new RecipeShapedKleinStar(3, 3, inputs, output) - : new RecipeShapelessHidden(output, (Object) inputs); + : new RecipeShapelessHidden(output, (Object) inputs); GameRegistry.addRecipe(recipe); } @@ -87,7 +86,9 @@ public boolean canUndo() { @Override public void undo() { - CraftingManager.getInstance().getRecipeList().remove(recipe); + CraftingManager.getInstance() + .getRecipeList() + .remove(recipe); } @Override @@ -114,7 +115,8 @@ private static class RemoveRecipeAction implements IUndoableAction { public RemoveRecipeAction(IItemStack rem) { remove = MineTweakerMC.getItemStack(rem); - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { if (irecipe instanceof RecipeShapelessHidden) { if (remove.isItemEqual(irecipe.getRecipeOutput())) { @@ -126,7 +128,9 @@ public RemoveRecipeAction(IItemStack rem) { @Override public void apply() { - CraftingManager.getInstance().getRecipeList().remove(recipe); + CraftingManager.getInstance() + .getRecipeList() + .remove(recipe); } @Override @@ -136,17 +140,21 @@ public boolean canUndo() { @Override public void undo() { - CraftingManager.getInstance().getRecipeList().add(recipe); + CraftingManager.getInstance() + .getRecipeList() + .add(recipe); } @Override public String describe() { - return "Removing recipe for " + recipe.getRecipeOutput().getDisplayName() + " in a " + recipe.getClass(); + return "Removing recipe for " + recipe.getRecipeOutput() + .getDisplayName() + " in a " + recipe.getClass(); } @Override public String describeUndo() { - return "Un-removing recipe for " + recipe.getRecipeOutput().getDisplayName() + " in a " + recipe.getClass(); + return "Un-removing recipe for " + recipe.getRecipeOutput() + .getDisplayName() + " in a " + recipe.getClass(); } @Override diff --git a/src/main/java/moze_intel/projecte/integration/MineTweaker/PhiloStone.java b/src/main/java/moze_intel/projecte/integration/MineTweaker/PhiloStone.java index 057cecb2c..aa50308df 100644 --- a/src/main/java/moze_intel/projecte/integration/MineTweaker/PhiloStone.java +++ b/src/main/java/moze_intel/projecte/integration/MineTweaker/PhiloStone.java @@ -4,6 +4,13 @@ import java.util.List; import java.util.Map; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.OreDictionary; + +import cpw.mods.fml.common.registry.GameRegistry; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -12,16 +19,8 @@ import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; import moze_intel.projecte.utils.MetaBlock; import moze_intel.projecte.utils.WorldTransmutations; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cpw.mods.fml.common.registry.GameRegistry; @ZenClass("mods.projecte.PhiloStone") public class PhiloStone { @@ -78,16 +77,16 @@ public AddRecipeAction(IItemStack output, IItemStack input) { this.input = MineTweakerMC.getItemStack(input); this.fuel = new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE); this.recipe = new RecipeShapelessHidden( - this.output, - new ItemStack(ObjHandler.philosStone), - this.input, - this.input, - this.input, - this.input, - this.input, - this.input, - this.input, - this.fuel); + this.output, + new ItemStack(ObjHandler.philosStone), + this.input, + this.input, + this.input, + this.input, + this.input, + this.input, + this.input, + this.fuel); } public AddRecipeAction(IItemStack output, IItemStack input, IItemStack fuel) { @@ -95,16 +94,16 @@ public AddRecipeAction(IItemStack output, IItemStack input, IItemStack fuel) { this.input = MineTweakerMC.getItemStack(input); this.fuel = MineTweakerMC.getItemStack(fuel); this.recipe = new RecipeShapelessHidden( - this.output, - new ItemStack(ObjHandler.philosStone), - this.input, - this.input, - this.input, - this.input, - this.input, - this.input, - this.input, - this.fuel); + this.output, + new ItemStack(ObjHandler.philosStone), + this.input, + this.input, + this.input, + this.input, + this.input, + this.input, + this.input, + this.fuel); } @Override @@ -119,7 +118,9 @@ public boolean canUndo() { @Override public void undo() { - CraftingManager.getInstance().getRecipeList().remove(recipe); + CraftingManager.getInstance() + .getRecipeList() + .remove(recipe); } @Override @@ -146,7 +147,8 @@ private static class RemoveRecipeAction implements IUndoableAction { public RemoveRecipeAction(IItemStack rem) { remove = MineTweakerMC.getItemStack(rem); - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { if (irecipe instanceof RecipeShapelessHidden) { if (remove.isItemEqual(irecipe.getRecipeOutput())) { @@ -158,7 +160,9 @@ public RemoveRecipeAction(IItemStack rem) { @Override public void apply() { - CraftingManager.getInstance().getRecipeList().remove(recipe); + CraftingManager.getInstance() + .getRecipeList() + .remove(recipe); } @Override @@ -168,17 +172,21 @@ public boolean canUndo() { @Override public void undo() { - CraftingManager.getInstance().getRecipeList().add(recipe); + CraftingManager.getInstance() + .getRecipeList() + .add(recipe); } @Override public String describe() { - return "Removing Philosopher's Stone Smelting Recipe for " + recipe.getRecipeOutput().getDisplayName(); + return "Removing Philosopher's Stone Smelting Recipe for " + recipe.getRecipeOutput() + .getDisplayName(); } @Override public String describeUndo() { - return "Un-removing Philosopher's Stone Smelting Recipe for " + recipe.getRecipeOutput().getDisplayName(); + return "Un-removing Philosopher's Stone Smelting Recipe for " + recipe.getRecipeOutput() + .getDisplayName(); } @Override @@ -219,12 +227,14 @@ public boolean canUndo() { @Override public void undo() { - Iterator> it = WorldTransmutations.MAP.entrySet().iterator(); + Iterator> it = WorldTransmutations.MAP.entrySet() + .iterator(); while (it.hasNext()) { Map.Entry entry = it.next(); - if (entry.getKey().equals(this.input) && entry.getValue()[0].equals(this.output)) { + if (entry.getKey() + .equals(this.input) && entry.getValue()[0].equals(this.output)) { if (entry.getValue().length > 1 && !entry.getValue()[1].equals(this.sneakOutput)) { continue; } else { @@ -272,12 +282,14 @@ public RemoveWorldTransmutationAction(IItemStack output, IItemStack sneakOutput, @Override public void apply() { - Iterator> it = WorldTransmutations.MAP.entrySet().iterator(); + Iterator> it = WorldTransmutations.MAP.entrySet() + .iterator(); while (it.hasNext()) { Map.Entry entry = it.next(); - if (entry.getKey().equals(this.input) && entry.getValue()[0].equals(this.output)) { + if (entry.getKey() + .equals(this.input) && entry.getValue()[0].equals(this.output)) { if (entry.getValue().length > 1 && !entry.getValue()[1].equals(this.sneakOutput)) { continue; } else { diff --git a/src/main/java/moze_intel/projecte/integration/MineTweaker/TweakInit.java b/src/main/java/moze_intel/projecte/integration/MineTweaker/TweakInit.java index f460559d4..08f9e5471 100644 --- a/src/main/java/moze_intel/projecte/integration/MineTweaker/TweakInit.java +++ b/src/main/java/moze_intel/projecte/integration/MineTweaker/TweakInit.java @@ -25,27 +25,27 @@ private static List generateLines() { defaultLines.add(""); defaultLines.add("#addPhiloSmelting(output, input, (optional) fuel), fuel can be any item. Defaults to coal"); defaultLines.add("#PhiloStone.addPhiloSmelting(, );"); - defaultLines.add( - "#PhiloStone.addPhiloSmelting(, , );"); - defaultLines.add( - "#PhiloStone.addPhiloSmelting(, , );"); + defaultLines + .add("#PhiloStone.addPhiloSmelting(, , );"); + defaultLines + .add("#PhiloStone.addPhiloSmelting(, , );"); defaultLines.add(""); defaultLines.add("#removePhiloSmelting(output)"); defaultLines.add("#PhiloStone.removePhiloSmelting();"); defaultLines.add(""); defaultLines.add("#addWorldTransmutation(output,(optional)sneakOutput, input), two or three parameters"); + defaultLines + .add("#PhiloStone.removeWorldTransmutation(, , );"); defaultLines.add( - "#PhiloStone.removeWorldTransmutation(, , );"); - defaultLines.add( - "#PhiloStone.addWorldTransmutation(, , );"); + "#PhiloStone.addWorldTransmutation(, , );"); defaultLines.add("# or"); defaultLines.add("#PhiloStone.addWorldTransmutation(, );"); defaultLines.add(""); defaultLines.add(""); defaultLines.add( - "#KleinStar.addShaped(, [[, , ], [, , ], [, , ]]);"); + "#KleinStar.addShaped(, [[, , ], [, , ], [, , ]]);"); defaultLines.add( - "#KleinStar.addShapeless(, [, ]);"); + "#KleinStar.addShapeless(, [, ]);"); defaultLines.add(""); defaultLines.add("#KleinStar.removeRecipe();"); defaultLines.add(""); diff --git a/src/main/java/moze_intel/projecte/integration/NEI/NEIAlchBagHandler.java b/src/main/java/moze_intel/projecte/integration/NEI/NEIAlchBagHandler.java index 120869bb2..5f9987c93 100644 --- a/src/main/java/moze_intel/projecte/integration/NEI/NEIAlchBagHandler.java +++ b/src/main/java/moze_intel/projecte/integration/NEI/NEIAlchBagHandler.java @@ -5,9 +5,6 @@ import java.util.Arrays; import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.customRecipes.RecipeAlchemyBag; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -17,13 +14,15 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.ShapedRecipeHandler; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.customRecipes.RecipeAlchemyBag; public class NEIAlchBagHandler extends ShapedRecipeHandler { private static String id = "crafting"; public int[][] stackorder = new int[][] { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 1, 2 }, { 2, 0 }, - { 2, 1 }, { 2, 2 } }; + { 2, 1 }, { 2, 2 } }; public class CachedAlchBagRecipe extends CachedRecipe { @@ -49,9 +48,9 @@ public void setIngredients(List items) { ingredients.clear(); for (int ingred = 0; ingred < items.size(); ingred++) { PositionedStack stack = new PositionedStack( - items.get(ingred), - 25 + stackorder[ingred][0] * 18, - 6 + stackorder[ingred][1] * 18); + items.get(ingred), + 25 + stackorder[ingred][0] * 18, + 6 + stackorder[ingred][1] * 18); stack.setMaxSize(1); ingredients.add(stack); } @@ -82,12 +81,14 @@ public String getRecipeName() { @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals("crafting") && getClass() == NEIAlchBagHandler.class) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { if (irecipe instanceof RecipeAlchemyBag) { List ingList = new ArrayList<>(); - if (irecipe.getRecipeOutput().getItemDamage() == 0) { + if (irecipe.getRecipeOutput() + .getItemDamage() == 0) { ingList.add(new ItemStack(ObjHandler.alchBag, 1, OreDictionary.WILDCARD_VALUE)); ingList.add(((RecipeAlchemyBag) irecipe).getRecipeInputDye()); arecipes.add(new CachedAlchBagRecipe(ingList, irecipe.getRecipeOutput())); @@ -106,13 +107,15 @@ public void loadCraftingRecipes(String outputId, Object... results) { @Override public void loadCraftingRecipes(ItemStack result) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) { if (irecipe instanceof RecipeAlchemyBag) { List ingList = new ArrayList<>(); - if (irecipe.getRecipeOutput().getItemDamage() == 0) { + if (irecipe.getRecipeOutput() + .getItemDamage() == 0) { ingList.add(new ItemStack(ObjHandler.alchBag, 1, OreDictionary.WILDCARD_VALUE)); ingList.add(((RecipeAlchemyBag) irecipe).getRecipeInputDye()); arecipes.add(new CachedAlchBagRecipe(ingList, irecipe.getRecipeOutput())); @@ -129,18 +132,19 @@ public void loadCraftingRecipes(ItemStack result) { @Override public void loadUsageRecipes(ItemStack ingredient) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { if (irecipe instanceof RecipeAlchemyBag) { if (NEIServerUtils - .areStacksSameTypeCrafting(((RecipeAlchemyBag) irecipe).getRecipeInputDye(), ingredient) - || NEIServerUtils.areStacksSameTypeCrafting( - ((RecipeAlchemyBag) irecipe).getRecipeInputBag(), - ingredient)) { + .areStacksSameTypeCrafting(((RecipeAlchemyBag) irecipe).getRecipeInputDye(), ingredient) + || NEIServerUtils + .areStacksSameTypeCrafting(((RecipeAlchemyBag) irecipe).getRecipeInputBag(), ingredient)) { List ingList = new ArrayList<>(); - if (irecipe.getRecipeOutput().getItemDamage() == 0) { + if (irecipe.getRecipeOutput() + .getItemDamage() == 0) { ingList.add(new ItemStack(ObjHandler.alchBag, 1, OreDictionary.WILDCARD_VALUE)); ingList.add(((RecipeAlchemyBag) irecipe).getRecipeInputDye()); arecipes.add(new CachedAlchBagRecipe(ingList, irecipe.getRecipeOutput())); diff --git a/src/main/java/moze_intel/projecte/integration/NEI/NEIKleinStarHandler.java b/src/main/java/moze_intel/projecte/integration/NEI/NEIKleinStarHandler.java index a9b5ffde9..88b8b7463 100644 --- a/src/main/java/moze_intel/projecte/integration/NEI/NEIKleinStarHandler.java +++ b/src/main/java/moze_intel/projecte/integration/NEI/NEIKleinStarHandler.java @@ -5,9 +5,6 @@ import java.util.Arrays; import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -17,13 +14,15 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.ShapedRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; public class NEIKleinStarHandler extends ShapedRecipeHandler { private static String id = "crafting"; public int[][] stackorder = new int[][] { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 1, 2 }, { 2, 0 }, - { 2, 1 }, { 2, 2 } }; + { 2, 1 }, { 2, 2 } }; public class CachedKleinStarRecipe extends CachedRecipe { @@ -49,9 +48,9 @@ public void setIngredients(List items) { ingredients.clear(); for (int ingred = 0; ingred < items.size(); ingred++) { PositionedStack stack = new PositionedStack( - items.get(ingred), - 25 + stackorder[ingred][0] * 18, - 6 + stackorder[ingred][1] * 18); + items.get(ingred), + 25 + stackorder[ingred][0] * 18, + 6 + stackorder[ingred][1] * 18); stack.setMaxSize(1); ingredients.add(stack); } @@ -82,14 +81,15 @@ public String getRecipeName() { @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals(id) && getClass() == NEIKleinStarHandler.class) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { - if (irecipe instanceof RecipeShapelessHidden - && irecipe.getRecipeOutput().getItem() == ObjHandler.kleinStars) { + if (irecipe instanceof RecipeShapelessHidden && irecipe.getRecipeOutput() + .getItem() == ObjHandler.kleinStars) { arecipes.add( - new CachedKleinStarRecipe( - ((RecipeShapelessHidden) irecipe).getInput(), - irecipe.getRecipeOutput())); + new CachedKleinStarRecipe( + ((RecipeShapelessHidden) irecipe).getInput(), + irecipe.getRecipeOutput())); } } } else { @@ -99,15 +99,16 @@ public void loadCraftingRecipes(String outputId, Object... results) { @Override public void loadCraftingRecipes(ItemStack result) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) { - if (irecipe instanceof RecipeShapelessHidden - && irecipe.getRecipeOutput().getItem() == ObjHandler.kleinStars) { + if (irecipe instanceof RecipeShapelessHidden && irecipe.getRecipeOutput() + .getItem() == ObjHandler.kleinStars) { arecipes.add( - new CachedKleinStarRecipe( - ((RecipeShapelessHidden) irecipe).getInput(), - irecipe.getRecipeOutput())); + new CachedKleinStarRecipe( + ((RecipeShapelessHidden) irecipe).getInput(), + irecipe.getRecipeOutput())); } } } @@ -115,16 +116,17 @@ public void loadCraftingRecipes(ItemStack result) { @Override public void loadUsageRecipes(ItemStack ingredient) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { - if (irecipe instanceof RecipeShapelessHidden - && irecipe.getRecipeOutput().getItem() == ObjHandler.kleinStars) { + if (irecipe instanceof RecipeShapelessHidden && irecipe.getRecipeOutput() + .getItem() == ObjHandler.kleinStars) { for (Object is : ((RecipeShapelessHidden) irecipe).getInput()) { if (NEIServerUtils.areStacksSameTypeCrafting((ItemStack) is, ingredient)) { arecipes.add( - new CachedKleinStarRecipe( - ((RecipeShapelessHidden) irecipe).getInput(), - irecipe.getRecipeOutput())); + new CachedKleinStarRecipe( + ((RecipeShapelessHidden) irecipe).getInput(), + irecipe.getRecipeOutput())); break; } } diff --git a/src/main/java/moze_intel/projecte/integration/NEI/NEIPhiloSmeltingHandler.java b/src/main/java/moze_intel/projecte/integration/NEI/NEIPhiloSmeltingHandler.java index 3ea9f99f8..dc92d8655 100644 --- a/src/main/java/moze_intel/projecte/integration/NEI/NEIPhiloSmeltingHandler.java +++ b/src/main/java/moze_intel/projecte/integration/NEI/NEIPhiloSmeltingHandler.java @@ -5,9 +5,6 @@ import java.util.Arrays; import java.util.List; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -17,6 +14,8 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.ShapedRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.customRecipes.RecipeShapelessHidden; public class NEIPhiloSmeltingHandler extends ShapedRecipeHandler { @@ -25,7 +24,7 @@ public class NEIPhiloSmeltingHandler extends ShapedRecipeHandler { private static String id = "philoSmelting"; public int[][] stackorder = new int[][] { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 1, 2 }, { 2, 0 }, - { 2, 1 }, { 2, 2 } }; + { 2, 1 }, { 2, 2 } }; public class CachedPhiloSmelting extends CachedRecipe { @@ -51,9 +50,9 @@ public void setIngredients(List items) { ingredients.clear(); for (int ingred = 0; ingred < items.size(); ingred++) { PositionedStack stack = new PositionedStack( - items.get(ingred), - 25 + stackorder[ingred][0] * 18, - 6 + stackorder[ingred][1] * 18); + items.get(ingred), + 25 + stackorder[ingred][0] * 18, + 6 + stackorder[ingred][1] * 18); stack.setMaxSize(1); ingredients.add(stack); } @@ -84,14 +83,15 @@ public String getRecipeName() { @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals(id) && getClass() == NEIPhiloSmeltingHandler.class) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { - if (irecipe instanceof RecipeShapelessHidden - && irecipe.getRecipeOutput().getItem() != ObjHandler.kleinStars) { + if (irecipe instanceof RecipeShapelessHidden && irecipe.getRecipeOutput() + .getItem() != ObjHandler.kleinStars) { arecipes.add( - new CachedPhiloSmelting( - ((RecipeShapelessHidden) irecipe).getInput(), - irecipe.getRecipeOutput())); + new CachedPhiloSmelting( + ((RecipeShapelessHidden) irecipe).getInput(), + irecipe.getRecipeOutput())); } } } else { @@ -101,15 +101,16 @@ public void loadCraftingRecipes(String outputId, Object... results) { @Override public void loadCraftingRecipes(ItemStack result) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) { - if (irecipe instanceof RecipeShapelessHidden - && irecipe.getRecipeOutput().getItem() != ObjHandler.kleinStars) { + if (irecipe instanceof RecipeShapelessHidden && irecipe.getRecipeOutput() + .getItem() != ObjHandler.kleinStars) { arecipes.add( - new CachedPhiloSmelting( - ((RecipeShapelessHidden) irecipe).getInput(), - irecipe.getRecipeOutput())); + new CachedPhiloSmelting( + ((RecipeShapelessHidden) irecipe).getInput(), + irecipe.getRecipeOutput())); } } } @@ -117,16 +118,17 @@ public void loadCraftingRecipes(ItemStack result) { @Override public void loadUsageRecipes(ItemStack ingredient) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); + List allrecipes = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe irecipe : allrecipes) { - if (irecipe instanceof RecipeShapelessHidden - && irecipe.getRecipeOutput().getItem() != ObjHandler.kleinStars) { + if (irecipe instanceof RecipeShapelessHidden && irecipe.getRecipeOutput() + .getItem() != ObjHandler.kleinStars) { for (Object is : ((RecipeShapelessHidden) irecipe).getInput()) { if (NEIServerUtils.areStacksSameTypeCrafting((ItemStack) is, ingredient)) { arecipes.add( - new CachedPhiloSmelting( - ((RecipeShapelessHidden) irecipe).getInput(), - irecipe.getRecipeOutput())); + new CachedPhiloSmelting( + ((RecipeShapelessHidden) irecipe).getInput(), + irecipe.getRecipeOutput())); break; } } diff --git a/src/main/java/moze_intel/projecte/integration/NEI/NEIWorldTransmuteHandler.java b/src/main/java/moze_intel/projecte/integration/NEI/NEIWorldTransmuteHandler.java index 7811eacb4..383f0fce0 100644 --- a/src/main/java/moze_intel/projecte/integration/NEI/NEIWorldTransmuteHandler.java +++ b/src/main/java/moze_intel/projecte/integration/NEI/NEIWorldTransmuteHandler.java @@ -3,10 +3,6 @@ import java.awt.*; import java.util.Map.Entry; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.utils.MetaBlock; -import moze_intel.projecte.utils.WorldTransmutations; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; @@ -15,6 +11,9 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.utils.MetaBlock; +import moze_intel.projecte.utils.WorldTransmutations; public class NEIWorldTransmuteHandler extends TemplateRecipeHandler { @@ -96,7 +95,10 @@ public void loadCraftingRecipes(ItemStack result) { @Override public void loadUsageRecipes(ItemStack ingredient) { for (Entry entry : WorldTransmutations.MAP.entrySet()) { - if (NEIServerUtils.areStacksSameTypeCrafting(entry.getKey().toItemStack(), ingredient)) { + if (NEIServerUtils.areStacksSameTypeCrafting( + entry.getKey() + .toItemStack(), + ingredient)) { if (entry != null) { if (entry.getValue()[0] != null) arecipes.add(new CachedTransmutationRecipe(entry.getKey(), false)); if (entry.getValue()[1] != null) arecipes.add(new CachedTransmutationRecipe(entry.getKey(), true)); diff --git a/src/main/java/moze_intel/projecte/manual/AbstractPage.java b/src/main/java/moze_intel/projecte/manual/AbstractPage.java index 7ac4c0378..f85d6cce1 100644 --- a/src/main/java/moze_intel/projecte/manual/AbstractPage.java +++ b/src/main/java/moze_intel/projecte/manual/AbstractPage.java @@ -2,9 +2,6 @@ import java.util.List; -import moze_intel.projecte.gameObjs.gui.GUIManual; -import moze_intel.projecte.utils.CollectionHelper; - import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -15,6 +12,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.gui.GUIManual; +import moze_intel.projecte.utils.CollectionHelper; @SideOnly(Side.CLIENT) public abstract class AbstractPage { @@ -50,9 +49,11 @@ public void addSubPage(AbstractPage page) { } public static AbstractPage createItemPage(ItemStack stack, PageCategory category) { - String body = StatCollector.translateToLocal("pe.manual." + stack.getUnlocalizedName().substring(5)); + String body = StatCollector.translateToLocal( + "pe.manual." + stack.getUnlocalizedName() + .substring(5)); List> parts = CollectionHelper - .splitToLength(GUIManual.splitBody(body), GUIManual.TEXT_HEIGHT / GUIManual.TEXT_Y_OFFSET); + .splitToLength(GUIManual.splitBody(body), GUIManual.TEXT_HEIGHT / GUIManual.TEXT_Y_OFFSET); AbstractPage ret = new ItemPage(stack.copy(), category, StringUtils.join(parts.get(0), "")); for (int i = 1; i < parts.size(); i++) { ret.addSubPage(new ItemPage(stack.copy(), category, StringUtils.join(parts.get(i), "")).setIndexed(false)); @@ -63,7 +64,7 @@ public static AbstractPage createItemPage(ItemStack stack, PageCategory category public static AbstractPage createTextPages(String identifier, PageCategory category) { String body = StatCollector.translateToLocal("pe.manual." + identifier); List> parts = CollectionHelper - .splitToLength(GUIManual.splitBody(body), GUIManual.TEXT_HEIGHT / GUIManual.TEXT_Y_OFFSET); + .splitToLength(GUIManual.splitBody(body), GUIManual.TEXT_HEIGHT / GUIManual.TEXT_Y_OFFSET); AbstractPage ret = new TextPage(identifier, category, StringUtils.join(parts.get(0), "")); for (int i = 1; i < parts.size(); i++) { ret.addSubPage(new TextPage(identifier, category, StringUtils.join(parts.get(i), "")).setIndexed(false)); diff --git a/src/main/java/moze_intel/projecte/manual/ManualFontRenderer.java b/src/main/java/moze_intel/projecte/manual/ManualFontRenderer.java index 47f83d4d7..1cd4e0637 100644 --- a/src/main/java/moze_intel/projecte/manual/ManualFontRenderer.java +++ b/src/main/java/moze_intel/projecte/manual/ManualFontRenderer.java @@ -19,15 +19,17 @@ public class ManualFontRenderer extends FontRenderer { public ManualFontRenderer() { super( - Minecraft.getMinecraft().gameSettings, - new ResourceLocation("textures/font/ascii.png"), - Minecraft.getMinecraft().renderEngine, - false); + Minecraft.getMinecraft().gameSettings, + new ResourceLocation("textures/font/ascii.png"), + Minecraft.getMinecraft().renderEngine, + false); } @Override public List listFormattedStringToWidth(String string, int width) { - return Arrays.asList(this.wrapFormStringToWidth(string, width).split("\n")); + return Arrays.asList( + this.wrapFormStringToWidth(string, width) + .split("\n")); } String wrapFormStringToWidth(String str, int width) { @@ -122,13 +124,13 @@ private static String getFormatFromString(String p_78282_0_) { private static boolean isFormatColor(char p_78272_0_) { return p_78272_0_ >= 48 && p_78272_0_ <= 57 || p_78272_0_ >= 97 && p_78272_0_ <= 102 - || p_78272_0_ >= 65 && p_78272_0_ <= 70; + || p_78272_0_ >= 65 && p_78272_0_ <= 70; } private static boolean isFormatSpecial(char p_78270_0_) { return p_78270_0_ >= 107 && p_78270_0_ <= 111 || p_78270_0_ >= 75 && p_78270_0_ <= 79 - || p_78270_0_ == 114 - || p_78270_0_ == 82; + || p_78270_0_ == 114 + || p_78270_0_ == 82; } } diff --git a/src/main/java/moze_intel/projecte/manual/ManualPageHandler.java b/src/main/java/moze_intel/projecte/manual/ManualPageHandler.java index e1b5b2135..d4a4d42b9 100644 --- a/src/main/java/moze_intel/projecte/manual/ManualPageHandler.java +++ b/src/main/java/moze_intel/projecte/manual/ManualPageHandler.java @@ -4,11 +4,6 @@ import java.util.List; import java.util.Map; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.gui.GUIManual; -import moze_intel.projecte.utils.Comparators; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IReloadableResourceManager; @@ -26,6 +21,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.gui.GUIManual; +import moze_intel.projecte.utils.Comparators; +import moze_intel.projecte.utils.PELogger; @SideOnly(Side.CLIENT) public class ManualPageHandler { @@ -36,7 +35,8 @@ public class ManualPageHandler { public static final List> spreads = Lists.newArrayList(); public static void init() { - IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager(); + IResourceManager resourceManager = Minecraft.getMinecraft() + .getResourceManager(); if (resourceManager instanceof IReloadableResourceManager) { ((IReloadableResourceManager) resourceManager).registerReloadListener(new IResourceManagerReloadListener() { @@ -206,13 +206,15 @@ private static void doBuildSpread(List list) { private static void addItem(Item item, PageCategory category) { // Manually exclude alchBag from having 16 of the same entry List list = (item == ObjHandler.alchBag || !item.getHasSubtypes()) - ? Collections.singletonList(new ItemStack(item)) - : getSubItems(item); + ? Collections.singletonList(new ItemStack(item)) + : getSubItems(item); for (ItemStack s : list) { AbstractPage page = AbstractPage.createItemPage(s, category); - categoryMap.get(category).add(page); - categoryMap.get(category).addAll(page.subPages); + categoryMap.get(category) + .add(page); + categoryMap.get(category) + .addAll(page.subPages); PELogger.logDebug("Added %d item pages for stack %s", page.subPages.size() + 1, s.toString()); } } @@ -223,14 +225,17 @@ private static void addBlock(Block block, PageCategory category) { private static void addTextPage(String identifier, PageCategory category) { AbstractPage page = AbstractPage.createTextPages(identifier, category); - categoryMap.get(category).add(page); - categoryMap.get(category).addAll(page.subPages); + categoryMap.get(category) + .add(page); + categoryMap.get(category) + .addAll(page.subPages); PELogger.logDebug("Added %d text pages for identifier %s", page.subPages.size() + 1, identifier); } private static void addImagePage(String identifier, ResourceLocation resource, PageCategory category) { AbstractPage page = AbstractPage.createImagePage(identifier, resource, category); - categoryMap.get(category).add(page); + categoryMap.get(category) + .add(page); } private static List getSubItems(Item i) { diff --git a/src/main/java/moze_intel/projecte/network/PacketHandler.java b/src/main/java/moze_intel/projecte/network/PacketHandler.java index 094f15f1a..8c93c8833 100644 --- a/src/main/java/moze_intel/projecte/network/PacketHandler.java +++ b/src/main/java/moze_intel/projecte/network/PacketHandler.java @@ -3,6 +3,18 @@ import java.util.ArrayList; import java.util.Map; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.Packet; +import net.minecraftforge.common.util.FakePlayer; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; import moze_intel.projecte.emc.EMCMapper; import moze_intel.projecte.emc.SimpleStack; import moze_intel.projecte.network.packets.CheckUpdatePKT; @@ -24,19 +36,6 @@ import moze_intel.projecte.network.packets.UpdateGemModePKT; import moze_intel.projecte.utils.PELogger; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.Packet; -import net.minecraftforge.common.util.FakePlayer; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; - public final class PacketHandler { private static final int MAX_PKT_SIZE = 256; @@ -70,10 +69,11 @@ public static void sendFragmentedEmcPacket(EntityPlayerMP player) { ArrayList list = Lists.newArrayList(); int counter = 0; - for (Map.Entry entry : Maps.newLinkedHashMap(EMCMapper.emc).entrySet()) // Copy constructor - // to prevent race - // condition CME in - // SP + for (Map.Entry entry : Maps.newLinkedHashMap(EMCMapper.emc) + .entrySet()) // Copy constructor + // to prevent race + // condition CME in + // SP { SimpleStack stack = entry.getKey(); @@ -110,10 +110,11 @@ public static void sendFragmentedEmcPacketToAll() { ArrayList list = Lists.newArrayList(); int counter = 0; - for (Map.Entry entry : Maps.newLinkedHashMap(EMCMapper.emc).entrySet()) // Copy constructor - // to prevent race - // condition CME in - // SP + for (Map.Entry entry : Maps.newLinkedHashMap(EMCMapper.emc) + .entrySet()) // Copy constructor + // to prevent race + // condition CME in + // SP { SimpleStack stack = entry.getKey(); diff --git a/src/main/java/moze_intel/projecte/network/ThreadCheckUUID.java b/src/main/java/moze_intel/projecte/network/ThreadCheckUUID.java index 005108b8a..7cd8d7e76 100644 --- a/src/main/java/moze_intel/projecte/network/ThreadCheckUUID.java +++ b/src/main/java/moze_intel/projecte/network/ThreadCheckUUID.java @@ -7,11 +7,11 @@ import java.net.URL; import java.util.List; +import com.google.common.collect.Lists; + import moze_intel.projecte.PECore; import moze_intel.projecte.utils.PELogger; -import com.google.common.collect.Lists; - public class ThreadCheckUUID extends Thread { private static boolean hasRunServer = false; diff --git a/src/main/java/moze_intel/projecte/network/ThreadCheckUpdate.java b/src/main/java/moze_intel/projecte/network/ThreadCheckUpdate.java index 29c0eabab..8384d60d2 100644 --- a/src/main/java/moze_intel/projecte/network/ThreadCheckUpdate.java +++ b/src/main/java/moze_intel/projecte/network/ThreadCheckUpdate.java @@ -7,9 +7,6 @@ import java.net.URL; import java.util.List; -import moze_intel.projecte.network.commands.ChangelogCMD; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.client.Minecraft; import net.minecraft.event.ClickEvent; import net.minecraft.util.ChatComponentText; @@ -17,10 +14,12 @@ import net.minecraft.util.IChatComponent; import net.minecraft.util.StatCollector; -import xyz.akirin.fmpe.FMPEMain; - import com.google.common.collect.Lists; +import moze_intel.projecte.network.commands.ChangelogCMD; +import moze_intel.projecte.utils.PELogger; +import xyz.akirin.fmpe.FMPEMain; + public class ThreadCheckUpdate extends Thread { private static boolean hasRunServer = false; @@ -67,14 +66,15 @@ public void run() { } if (!line.isEmpty()) { - line = line.substring(1).trim(); + line = line.substring(1) + .trim(); changes.add(line); } } if (!FMPEMain.RVersion.equals(latestVersion)) { PELogger.logInfo( - "Mod is outdated! Check " + curseURL + " to get the latest version (" + latestVersion + ")."); + "Mod is outdated! Check " + curseURL + " to get the latest version (" + latestVersion + ")."); for (String s : changes) { PELogger.logInfo(s); @@ -84,22 +84,22 @@ public void run() { ChangelogCMD.changelog.addAll(changes); } else { Minecraft.getMinecraft().thePlayer.addChatMessage( - new ChatComponentText( - String.format( - EnumChatFormatting.GOLD - + StatCollector.translateToLocal("pe.update.available"), - latestVersion))); + new ChatComponentText( + String.format( + EnumChatFormatting.GOLD + StatCollector.translateToLocal("pe.update.available"), + latestVersion))); Minecraft.getMinecraft().thePlayer.addChatMessage( - new ChatComponentText( - EnumChatFormatting.GREEN + StatCollector.translateToLocal("pe.update.getit"))); + new ChatComponentText( + EnumChatFormatting.GREEN + StatCollector.translateToLocal("pe.update.getit"))); IChatComponent link = new ChatComponentText(EnumChatFormatting.AQUA + curseURL); - link.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, curseURL)); + link.getChatStyle() + .setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, curseURL)); Minecraft.getMinecraft().thePlayer.addChatMessage(link); Minecraft.getMinecraft().thePlayer.addChatMessage( - new ChatComponentText( - EnumChatFormatting.GREEN + StatCollector.translateToLocal("pe.update.changelog"))); + new ChatComponentText( + EnumChatFormatting.GREEN + StatCollector.translateToLocal("pe.update.changelog"))); } } else { PELogger.logInfo("Mod is updated."); diff --git a/src/main/java/moze_intel/projecte/network/commands/ClearKnowledgeCMD.java b/src/main/java/moze_intel/projecte/network/commands/ClearKnowledgeCMD.java index a98e00497..92bf9f7bc 100644 --- a/src/main/java/moze_intel/projecte/network/commands/ClearKnowledgeCMD.java +++ b/src/main/java/moze_intel/projecte/network/commands/ClearKnowledgeCMD.java @@ -1,16 +1,16 @@ package moze_intel.projecte.network.commands; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.KnowledgeClearPKT; -import moze_intel.projecte.playerData.Transmutation; -import moze_intel.projecte.utils.ChatHelper; - import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.KnowledgeClearPKT; +import moze_intel.projecte.playerData.Transmutation; +import moze_intel.projecte.utils.ChatHelper; + public class ClearKnowledgeCMD extends ProjectEBaseCMD { @Override @@ -30,35 +30,35 @@ public void processCommand(ICommandSender sender, String[] params) { Transmutation.clearKnowledge(((EntityPlayerMP) sender)); PacketHandler.sendTo(new KnowledgeClearPKT(), (EntityPlayerMP) sender); sendSuccess( - sender, - new ChatComponentTranslation( - "pe.command.clearknowledge.success", - sender.getCommandSenderName())); + sender, + new ChatComponentTranslation("pe.command.clearknowledge.success", sender.getCommandSenderName())); } else { sendError( - sender, - new ChatComponentTranslation("pe.command.clearknowledge.error", sender.getCommandSenderName())); + sender, + new ChatComponentTranslation("pe.command.clearknowledge.error", sender.getCommandSenderName())); } } else { for (Object obj : sender.getEntityWorld().playerEntities) { EntityPlayer player = (EntityPlayer) obj; - if (player.getCommandSenderName().equalsIgnoreCase(params[0])) { + if (player.getCommandSenderName() + .equalsIgnoreCase(params[0])) { Transmutation.clearKnowledge(player); PacketHandler.sendTo(new KnowledgeClearPKT(), (EntityPlayerMP) player); sendSuccess( - sender, - new ChatComponentTranslation( - "pe.command.clearknowledge.success", - player.getCommandSenderName())); + sender, + new ChatComponentTranslation( + "pe.command.clearknowledge.success", + player.getCommandSenderName())); - if (!player.getCommandSenderName().equals(sender.getCommandSenderName())) { + if (!player.getCommandSenderName() + .equals(sender.getCommandSenderName())) { player.addChatComponentMessage( - ChatHelper.modifyColor( - new ChatComponentTranslation( - "pe.command.clearknowledge.notify", - sender.getCommandSenderName()), - EnumChatFormatting.RED)); + ChatHelper.modifyColor( + new ChatComponentTranslation( + "pe.command.clearknowledge.notify", + sender.getCommandSenderName()), + EnumChatFormatting.RED)); } return; diff --git a/src/main/java/moze_intel/projecte/network/commands/ProjectEBaseCMD.java b/src/main/java/moze_intel/projecte/network/commands/ProjectEBaseCMD.java index 34b6aab38..e2b23ddaa 100644 --- a/src/main/java/moze_intel/projecte/network/commands/ProjectEBaseCMD.java +++ b/src/main/java/moze_intel/projecte/network/commands/ProjectEBaseCMD.java @@ -1,12 +1,12 @@ package moze_intel.projecte.network.commands; -import moze_intel.projecte.utils.ChatHelper; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; +import moze_intel.projecte.utils.ChatHelper; + public abstract class ProjectEBaseCMD extends CommandBase { @Override diff --git a/src/main/java/moze_intel/projecte/network/commands/ProjectECMD.java b/src/main/java/moze_intel/projecte/network/commands/ProjectECMD.java index bf2c0d450..73de40e4c 100644 --- a/src/main/java/moze_intel/projecte/network/commands/ProjectECMD.java +++ b/src/main/java/moze_intel/projecte/network/commands/ProjectECMD.java @@ -14,7 +14,7 @@ public class ProjectECMD extends ProjectEBaseCMD { private static final List commands = Lists - .newArrayList("changelog", "clearKnowledge", "setEMC", "reloadEMC", "removeEMC", "resetEMC"); + .newArrayList("changelog", "clearKnowledge", "setEMC", "reloadEMC", "removeEMC", "resetEMC"); ChangelogCMD changelogcmd = new ChangelogCMD(); ReloadEmcCMD reloademccmd = new ReloadEmcCMD(); @@ -112,7 +112,8 @@ public LowerCasePrefixPredicate(String prefix) { @Override public boolean apply(String input) { - return input.toLowerCase(Locale.ROOT).startsWith(prefix.toLowerCase(Locale.ROOT)); + return input.toLowerCase(Locale.ROOT) + .startsWith(prefix.toLowerCase(Locale.ROOT)); } } } diff --git a/src/main/java/moze_intel/projecte/network/commands/ReloadEmcCMD.java b/src/main/java/moze_intel/projecte/network/commands/ReloadEmcCMD.java index ab1dd38a3..6ffb8b6f7 100644 --- a/src/main/java/moze_intel/projecte/network/commands/ReloadEmcCMD.java +++ b/src/main/java/moze_intel/projecte/network/commands/ReloadEmcCMD.java @@ -1,13 +1,13 @@ package moze_intel.projecte.network.commands; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentTranslation; + import moze_intel.projecte.config.CustomEMCParser; import moze_intel.projecte.emc.EMCMapper; import moze_intel.projecte.handlers.TileEntityHandler; import moze_intel.projecte.network.PacketHandler; -import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentTranslation; - public class ReloadEmcCMD extends ProjectEBaseCMD { @Override diff --git a/src/main/java/moze_intel/projecte/network/commands/RemoveEmcCMD.java b/src/main/java/moze_intel/projecte/network/commands/RemoveEmcCMD.java index 96e8fbd8e..53a5739c0 100644 --- a/src/main/java/moze_intel/projecte/network/commands/RemoveEmcCMD.java +++ b/src/main/java/moze_intel/projecte/network/commands/RemoveEmcCMD.java @@ -1,13 +1,13 @@ package moze_intel.projecte.network.commands; -import moze_intel.projecte.config.CustomEMCParser; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.command.ICommandSender; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; +import moze_intel.projecte.config.CustomEMCParser; +import moze_intel.projecte.utils.MathUtils; + public class RemoveEmcCMD extends ProjectEBaseCMD { @Override diff --git a/src/main/java/moze_intel/projecte/network/commands/ResetEmcCMD.java b/src/main/java/moze_intel/projecte/network/commands/ResetEmcCMD.java index 35bd252dc..315d58786 100644 --- a/src/main/java/moze_intel/projecte/network/commands/ResetEmcCMD.java +++ b/src/main/java/moze_intel/projecte/network/commands/ResetEmcCMD.java @@ -1,13 +1,13 @@ package moze_intel.projecte.network.commands; -import moze_intel.projecte.config.CustomEMCParser; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.command.ICommandSender; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; +import moze_intel.projecte.config.CustomEMCParser; +import moze_intel.projecte.utils.MathUtils; + public class ResetEmcCMD extends ProjectEBaseCMD { @Override diff --git a/src/main/java/moze_intel/projecte/network/commands/SetEmcCMD.java b/src/main/java/moze_intel/projecte/network/commands/SetEmcCMD.java index ae4c364e7..4101821d5 100644 --- a/src/main/java/moze_intel/projecte/network/commands/SetEmcCMD.java +++ b/src/main/java/moze_intel/projecte/network/commands/SetEmcCMD.java @@ -1,13 +1,13 @@ package moze_intel.projecte.network.commands; -import moze_intel.projecte.config.CustomEMCParser; -import moze_intel.projecte.utils.MathUtils; - import net.minecraft.command.ICommandSender; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; +import moze_intel.projecte.config.CustomEMCParser; +import moze_intel.projecte.utils.MathUtils; + public class SetEmcCMD extends ProjectEBaseCMD { @Override diff --git a/src/main/java/moze_intel/projecte/network/packets/CheckUpdatePKT.java b/src/main/java/moze_intel/projecte/network/packets/CheckUpdatePKT.java index bb18c993e..387fd7a63 100644 --- a/src/main/java/moze_intel/projecte/network/packets/CheckUpdatePKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/CheckUpdatePKT.java @@ -1,10 +1,10 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.network.ThreadCheckUpdate; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.network.ThreadCheckUpdate; public class CheckUpdatePKT implements IMessage { diff --git a/src/main/java/moze_intel/projecte/network/packets/CollectorSyncPKT.java b/src/main/java/moze_intel/projecte/network/packets/CollectorSyncPKT.java index a8249faf1..2886e3616 100644 --- a/src/main/java/moze_intel/projecte/network/packets/CollectorSyncPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/CollectorSyncPKT.java @@ -1,8 +1,5 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; @@ -10,6 +7,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; +import moze_intel.projecte.utils.PELogger; public class CollectorSyncPKT implements IMessage { diff --git a/src/main/java/moze_intel/projecte/network/packets/CondenserSyncPKT.java b/src/main/java/moze_intel/projecte/network/packets/CondenserSyncPKT.java index 938408d25..f363c5d1f 100644 --- a/src/main/java/moze_intel/projecte/network/packets/CondenserSyncPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/CondenserSyncPKT.java @@ -1,8 +1,5 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.gameObjs.tiles.CondenserTile; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; @@ -10,6 +7,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.gameObjs.tiles.CondenserTile; +import moze_intel.projecte.utils.PELogger; public class CondenserSyncPKT implements IMessage { diff --git a/src/main/java/moze_intel/projecte/network/packets/KeyPressPKT.java b/src/main/java/moze_intel/projecte/network/packets/KeyPressPKT.java index cc08cf5e5..3ea6aee74 100644 --- a/src/main/java/moze_intel/projecte/network/packets/KeyPressPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/KeyPressPKT.java @@ -1,5 +1,13 @@ package moze_intel.projecte.network.packets; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; import moze_intel.projecte.api.item.IExtraFunction; import moze_intel.projecte.api.item.IItemCharge; import moze_intel.projecte.api.item.IModeChanger; @@ -14,15 +22,6 @@ import moze_intel.projecte.utils.PEKeybind; import moze_intel.projecte.utils.PlayerHelper; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class KeyPressPKT implements IMessage { private PEKeybind key; @@ -73,9 +72,8 @@ public IMessage onMessage(final KeyPressPKT message, final MessageContext ctx) { if (GemArmorBase.hasAnyPiece(player)) { PlayerChecks.setGemState(player, !PlayerChecks.getGemState(player)); player.addChatMessage( - new ChatComponentTranslation( - PlayerChecks.getGemState(player) ? "pe.gem.activate" - : "pe.gem.deactivate")); + new ChatComponentTranslation( + PlayerChecks.getGemState(player) ? "pe.gem.activate" : "pe.gem.deactivate")); } } break; @@ -84,7 +82,7 @@ public IMessage onMessage(final KeyPressPKT message, final MessageContext ctx) { ((IExtraFunction) stack.getItem()).doExtraFunction(stack, player); } else if (stack == null || ProjectEConfig.unsafeKeyBinds) { if (PlayerChecks.getGemState(player) && player.inventory.armorInventory[2] != null - && player.inventory.armorInventory[2].getItem() == ObjHandler.gemChest) { + && player.inventory.armorInventory[2].getItem() == ObjHandler.gemChest) { if (PlayerChecks.getGemCooldown(player) <= 0) { ((GemChest) ObjHandler.gemChest).doExplode(player); PlayerChecks.resetGemCooldown(player); @@ -102,7 +100,7 @@ public IMessage onMessage(final KeyPressPKT message, final MessageContext ctx) { } } else if (stack == null || ProjectEConfig.unsafeKeyBinds) { if (PlayerChecks.getGemState(player) && player.inventory.armorInventory[3] != null - && player.inventory.armorInventory[3].getItem() == ObjHandler.gemHelmet) { + && player.inventory.armorInventory[3].getItem() == ObjHandler.gemHelmet) { ((GemHelmet) ObjHandler.gemHelmet).doZap(player); } } diff --git a/src/main/java/moze_intel/projecte/network/packets/KnowledgeClearPKT.java b/src/main/java/moze_intel/projecte/network/packets/KnowledgeClearPKT.java index 4c7cea15b..387efbdb1 100644 --- a/src/main/java/moze_intel/projecte/network/packets/KnowledgeClearPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/KnowledgeClearPKT.java @@ -1,10 +1,10 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.PECore; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.PECore; public class KnowledgeClearPKT implements IMessage { diff --git a/src/main/java/moze_intel/projecte/network/packets/KnowledgeSyncPKT.java b/src/main/java/moze_intel/projecte/network/packets/KnowledgeSyncPKT.java index ed8117f69..00928c3ad 100644 --- a/src/main/java/moze_intel/projecte/network/packets/KnowledgeSyncPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/KnowledgeSyncPKT.java @@ -1,8 +1,5 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.PECore; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.ByteBufUtils; @@ -10,6 +7,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.PECore; +import moze_intel.projecte.utils.PELogger; public class KnowledgeSyncPKT implements IMessage { @@ -35,7 +34,8 @@ public static class Handler implements IMessageHandler { @Override public IMessage onMessage(final ParticlePKT message, MessageContext ctx) { Minecraft.getMinecraft().theWorld.spawnParticle( - message.particleName, - message.x, - message.y, - message.z, - message.velX, - message.velY, - message.velZ); + message.particleName, + message.x, + message.y, + message.z, + message.velX, + message.velY, + message.velZ); return null; } } diff --git a/src/main/java/moze_intel/projecte/network/packets/RelaySyncPKT.java b/src/main/java/moze_intel/projecte/network/packets/RelaySyncPKT.java index 1907419e9..6f3ad3ebb 100644 --- a/src/main/java/moze_intel/projecte/network/packets/RelaySyncPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/RelaySyncPKT.java @@ -1,8 +1,5 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; @@ -10,6 +7,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; +import moze_intel.projecte.utils.PELogger; public class RelaySyncPKT implements IMessage { diff --git a/src/main/java/moze_intel/projecte/network/packets/SearchUpdatePKT.java b/src/main/java/moze_intel/projecte/network/packets/SearchUpdatePKT.java index 25e5f3068..ccd7ef8c9 100644 --- a/src/main/java/moze_intel/projecte/network/packets/SearchUpdatePKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/SearchUpdatePKT.java @@ -1,7 +1,5 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.gameObjs.container.TransmutationContainer; - import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; @@ -9,6 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.gameObjs.container.TransmutationContainer; public class SearchUpdatePKT implements IMessage { @@ -40,7 +39,7 @@ public static class Handler implements IMessageHandler @Override public IMessage onMessage(final SyncBagDataPKT message, MessageContext ctx) { - PECore.proxy.getClientBagProps().readFromPacket(message.nbt); + PECore.proxy.getClientBagProps() + .readFromPacket(message.nbt); PELogger.logDebug("** RECEIVED BAGS CLIENTSIDE **"); return null; diff --git a/src/main/java/moze_intel/projecte/network/packets/SyncEmcPKT.java b/src/main/java/moze_intel/projecte/network/packets/SyncEmcPKT.java index c7948792e..40e6a025b 100644 --- a/src/main/java/moze_intel/projecte/network/packets/SyncEmcPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/SyncEmcPKT.java @@ -2,18 +2,17 @@ import java.util.List; -import moze_intel.projecte.emc.EMCMapper; -import moze_intel.projecte.emc.FuelMapper; -import moze_intel.projecte.emc.SimpleStack; -import moze_intel.projecte.playerData.Transmutation; -import moze_intel.projecte.utils.PELogger; - import com.google.common.collect.Maps; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.emc.EMCMapper; +import moze_intel.projecte.emc.FuelMapper; +import moze_intel.projecte.emc.SimpleStack; +import moze_intel.projecte.playerData.Transmutation; +import moze_intel.projecte.utils.PELogger; public class SyncEmcPKT implements IMessage { diff --git a/src/main/java/moze_intel/projecte/network/packets/SyncPedestalPKT.java b/src/main/java/moze_intel/projecte/network/packets/SyncPedestalPKT.java index 193c992a0..73d94a5d2 100644 --- a/src/main/java/moze_intel/projecte/network/packets/SyncPedestalPKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/SyncPedestalPKT.java @@ -1,7 +1,5 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; - import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -11,6 +9,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; public class SyncPedestalPKT implements IMessage { diff --git a/src/main/java/moze_intel/projecte/network/packets/UpdateGemModePKT.java b/src/main/java/moze_intel/projecte/network/packets/UpdateGemModePKT.java index fa6db586c..a2ac52b1e 100644 --- a/src/main/java/moze_intel/projecte/network/packets/UpdateGemModePKT.java +++ b/src/main/java/moze_intel/projecte/network/packets/UpdateGemModePKT.java @@ -1,13 +1,12 @@ package moze_intel.projecte.network.packets; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import moze_intel.projecte.gameObjs.ObjHandler; public class UpdateGemModePKT implements IMessage { @@ -36,8 +35,9 @@ public IMessage onMessage(final UpdateGemModePKT pkt, final MessageContext ctx) ItemStack stack = ctx.getServerHandler().playerEntity.getHeldItem(); if (stack != null - && (stack.getItem() == ObjHandler.eternalDensity || stack.getItem() == ObjHandler.voidRing)) { - stack.getTagCompound().setBoolean("Whitelist", pkt.mode); + && (stack.getItem() == ObjHandler.eternalDensity || stack.getItem() == ObjHandler.voidRing)) { + stack.getTagCompound() + .setBoolean("Whitelist", pkt.mode); } return null; diff --git a/src/main/java/moze_intel/projecte/playerData/AlchBagProps.java b/src/main/java/moze_intel/projecte/playerData/AlchBagProps.java index dbe224ab6..cfa99227d 100644 --- a/src/main/java/moze_intel/projecte/playerData/AlchBagProps.java +++ b/src/main/java/moze_intel/projecte/playerData/AlchBagProps.java @@ -3,9 +3,6 @@ import java.util.Arrays; import java.util.Map; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -17,6 +14,9 @@ import com.google.common.collect.Maps; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.PELogger; + public class AlchBagProps implements IExtendedEntityProperties { public static final String PROP_NAME = "ProjectEAlchBag"; @@ -40,7 +40,7 @@ protected ItemStack[] getInv(int color) { if (bagData.get(color) == null) { bagData.put(color, new ItemStack[104]); PELogger.logInfo( - "Created new inventory array for color " + color + " and player " + player.getCommandSenderName()); + "Created new inventory array for color " + color + " and player " + player.getCommandSenderName()); } ItemStack[] inv = bagData.get(color); return Arrays.copyOf(inv, inv.length); @@ -88,10 +88,10 @@ public void readFromPacket(NBTTagCompound compound) { for (int i = 0; i < listOfInventoies.tagCount(); i++) { NBTTagCompound inventory = listOfInventoies.getCompoundTagAt(i); bagData.put( - inventory.getInteger("color"), - ItemHelper.copyIndexedNBTToArray( - inventory.getTagList("inv", Constants.NBT.TAG_COMPOUND), - new ItemStack[104])); + inventory.getInteger("color"), + ItemHelper.copyIndexedNBTToArray( + inventory.getTagList("inv", Constants.NBT.TAG_COMPOUND), + new ItemStack[104])); } } @@ -122,10 +122,10 @@ public void loadNBTData(NBTTagCompound compound) { for (int i = 0; i < listOfInventoies.tagCount(); i++) { NBTTagCompound inventory = listOfInventoies.getCompoundTagAt(i); bagData.put( - inventory.getInteger("color"), - ItemHelper.copyIndexedNBTToArray( - inventory.getTagList("inv", Constants.NBT.TAG_COMPOUND), - new ItemStack[104])); + inventory.getInteger("color"), + ItemHelper.copyIndexedNBTToArray( + inventory.getTagList("inv", Constants.NBT.TAG_COMPOUND), + new ItemStack[104])); } } diff --git a/src/main/java/moze_intel/projecte/playerData/AlchemicalBags.java b/src/main/java/moze_intel/projecte/playerData/AlchemicalBags.java index 52edab148..3430d32a0 100644 --- a/src/main/java/moze_intel/projecte/playerData/AlchemicalBags.java +++ b/src/main/java/moze_intel/projecte/playerData/AlchemicalBags.java @@ -1,33 +1,40 @@ package moze_intel.projecte.playerData; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.SyncBagDataPKT; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.SyncBagDataPKT; +import moze_intel.projecte.utils.PELogger; + public final class AlchemicalBags { public static ItemStack[] get(EntityPlayer player, byte color) { - return AlchBagProps.getDataFor(player).getInv(color); + return AlchBagProps.getDataFor(player) + .getInv(color); } public static void set(EntityPlayer player, byte color, ItemStack[] inv) { - AlchBagProps.getDataFor(player).setInv(color, inv); + AlchBagProps.getDataFor(player) + .setInv(color, inv); } public static void syncFull(EntityPlayer player) { - PacketHandler - .sendTo(new SyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPacket()), (EntityPlayerMP) player); + PacketHandler.sendTo( + new SyncBagDataPKT( + AlchBagProps.getDataFor(player) + .saveForPacket()), + (EntityPlayerMP) player); PELogger.logDebug("** SENT FULL BAG DATA **"); } public static void syncPartial(EntityPlayer player, int color) { PacketHandler.sendTo( - new SyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPartialPacket(color)), - (EntityPlayerMP) player); + new SyncBagDataPKT( + AlchBagProps.getDataFor(player) + .saveForPartialPacket(color)), + (EntityPlayerMP) player); PELogger.logDebug("** SENT PARTIAL BAG DATA **"); } } diff --git a/src/main/java/moze_intel/projecte/playerData/Transmutation.java b/src/main/java/moze_intel/projecte/playerData/Transmutation.java index cd78664e0..403d1b754 100644 --- a/src/main/java/moze_intel/projecte/playerData/Transmutation.java +++ b/src/main/java/moze_intel/projecte/playerData/Transmutation.java @@ -4,6 +4,13 @@ import java.util.Iterator; import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; + +import com.google.common.collect.Lists; + import moze_intel.projecte.api.event.PlayerKnowledgeChangeEvent; import moze_intel.projecte.emc.EMCMapper; import moze_intel.projecte.emc.SimpleStack; @@ -13,13 +20,6 @@ import moze_intel.projecte.utils.ItemHelper; import moze_intel.projecte.utils.PELogger; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; - -import com.google.common.collect.Lists; - public final class Transmutation { private static final List CACHED_TOME_KNOWLEDGE = Lists.newArrayList(); @@ -40,7 +40,7 @@ public static void cacheFullKnowledge() { // Apparently items can still not have EMC if they are in the EMC map. if (EMCHelper.doesItemHaveEmc(s) && EMCHelper.getEmcValue(s) > 0 - && !ItemHelper.containsItemStack(CACHED_TOME_KNOWLEDGE, s)) { + && !ItemHelper.containsItemStack(CACHED_TOME_KNOWLEDGE, s)) { CACHED_TOME_KNOWLEDGE.add(s); } } catch (Exception e) { @@ -58,7 +58,8 @@ public static List getKnowledge(EntityPlayer player) { public static void addKnowledge(ItemStack stack, EntityPlayer player) { TransmutationProps data = TransmutationProps.getDataFor(player); if (!hasKnowledgeForStack(stack, player)) { - data.getKnowledge().add(stack); + data.getKnowledge() + .add(stack); if (!player.worldObj.isRemote) { MinecraftForge.EVENT_BUS.post(new PlayerKnowledgeChangeEvent(player)); } @@ -68,7 +69,8 @@ public static void addKnowledge(ItemStack stack, EntityPlayer player) { public static void removeKnowledge(ItemStack stack, EntityPlayer player) { TransmutationProps data = TransmutationProps.getDataFor(player); if (hasKnowledgeForStack(stack, player)) { - Iterator iter = data.getKnowledge().iterator(); + Iterator iter = data.getKnowledge() + .iterator(); while (iter.hasNext()) { if (ItemStack.areItemStacksEqual(stack, iter.next())) { @@ -88,7 +90,8 @@ public static void setInputsAndLocks(ItemStack[] stacks, EntityPlayer player) { } public static ItemStack[] getInputsAndLock(EntityPlayer player) { - ItemStack[] locks = TransmutationProps.getDataFor(player).getInputLocks(); + ItemStack[] locks = TransmutationProps.getDataFor(player) + .getInputLocks(); return Arrays.copyOf(locks, locks.length); } @@ -103,8 +106,12 @@ public static boolean hasKnowledgeForStack(ItemStack stack, EntityPlayer player) } public static void setFullKnowledge(EntityPlayer player) { - TransmutationProps.getDataFor(player).getKnowledge().clear(); - TransmutationProps.getDataFor(player).getKnowledge().addAll(CACHED_TOME_KNOWLEDGE); + TransmutationProps.getDataFor(player) + .getKnowledge() + .clear(); + TransmutationProps.getDataFor(player) + .getKnowledge() + .addAll(CACHED_TOME_KNOWLEDGE); if (!player.worldObj.isRemote) { MinecraftForge.EVENT_BUS.post(new PlayerKnowledgeChangeEvent(player)); } @@ -112,24 +119,29 @@ public static void setFullKnowledge(EntityPlayer player) { public static void clearKnowledge(EntityPlayer player) { TransmutationProps data = TransmutationProps.getDataFor(player); - data.getKnowledge().clear(); + data.getKnowledge() + .clear(); if (!player.worldObj.isRemote) { MinecraftForge.EVENT_BUS.post(new PlayerKnowledgeChangeEvent(player)); } } public static double getEmc(EntityPlayer player) { - return TransmutationProps.getDataFor(player).getTransmutationEmc(); + return TransmutationProps.getDataFor(player) + .getTransmutationEmc(); } public static void setEmc(EntityPlayer player, double emc) { - TransmutationProps.getDataFor(player).setTransmutationEmc(emc); + TransmutationProps.getDataFor(player) + .setTransmutationEmc(emc); } public static void sync(EntityPlayer player) { PacketHandler.sendTo( - new KnowledgeSyncPKT(TransmutationProps.getDataFor(player).saveForPacket()), - (EntityPlayerMP) player); + new KnowledgeSyncPKT( + TransmutationProps.getDataFor(player) + .saveForPacket()), + (EntityPlayerMP) player); PELogger.logDebug("** SENT TRANSMUTATION DATA **"); } } diff --git a/src/main/java/moze_intel/projecte/playerData/TransmutationOffline.java b/src/main/java/moze_intel/projecte/playerData/TransmutationOffline.java index 9b61ee7aa..5042f9c4d 100644 --- a/src/main/java/moze_intel/projecte/playerData/TransmutationOffline.java +++ b/src/main/java/moze_intel/projecte/playerData/TransmutationOffline.java @@ -7,9 +7,6 @@ import java.util.Map; import java.util.UUID; -import moze_intel.projecte.utils.ItemHelper; -import moze_intel.projecte.utils.PELogger; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -20,7 +17,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import cpw.mods.fml.common.FMLCommonHandler; +import moze_intel.projecte.utils.ItemHelper; +import moze_intel.projecte.utils.PELogger; public class TransmutationOffline { @@ -68,15 +68,17 @@ public static double getEmc(UUID playerUUID) { private static void cacheOfflineData(UUID playerUUID) { Preconditions.checkState( - FMLCommonHandler.instance().getEffectiveSide().isServer(), - "CRITICAL: Trying to read filesystem on client!!"); + FMLCommonHandler.instance() + .getEffectiveSide() + .isServer(), + "CRITICAL: Trying to read filesystem on client!!"); File playerData = new File(DimensionManager.getCurrentSaveRootDirectory(), "playerdata"); if (playerData.exists()) { File player = new File(playerData, playerUUID.toString() + ".dat"); if (player.exists() && player.isFile()) { try { NBTTagCompound props = CompressedStreamTools.readCompressed(new FileInputStream(player)) - .getCompoundTag(TransmutationProps.PROP_NAME); + .getCompoundTag(TransmutationProps.PROP_NAME); cachedEmc.put(playerUUID, props.getDouble("transmutationEmc")); cachedFullKnowledge.put(playerUUID, props.getBoolean("tome")); diff --git a/src/main/java/moze_intel/projecte/playerData/TransmutationProps.java b/src/main/java/moze_intel/projecte/playerData/TransmutationProps.java index d0442ef29..86a14db40 100644 --- a/src/main/java/moze_intel/projecte/playerData/TransmutationProps.java +++ b/src/main/java/moze_intel/projecte/playerData/TransmutationProps.java @@ -3,9 +3,6 @@ import java.util.Iterator; import java.util.List; -import moze_intel.projecte.utils.EMCHelper; -import moze_intel.projecte.utils.ItemHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -17,6 +14,9 @@ import com.google.common.collect.Lists; +import moze_intel.projecte.utils.EMCHelper; +import moze_intel.projecte.utils.ItemHelper; + public class TransmutationProps implements IExtendedEntityProperties { private final EntityPlayer player; diff --git a/src/main/java/moze_intel/projecte/proxies/ClientProxy.java b/src/main/java/moze_intel/projecte/proxies/ClientProxy.java index db9808edd..29e5d4ab0 100644 --- a/src/main/java/moze_intel/projecte/proxies/ClientProxy.java +++ b/src/main/java/moze_intel/projecte/proxies/ClientProxy.java @@ -1,5 +1,15 @@ package moze_intel.projecte.proxies; +import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; + +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; import moze_intel.projecte.events.KeyPressEvent; import moze_intel.projecte.events.PlayerRender; import moze_intel.projecte.events.ToolTipEvent; @@ -34,17 +44,6 @@ import moze_intel.projecte.rendering.PedestalRenderer; import moze_intel.projecte.utils.ClientKeyHelper; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; - public class ClientProxy implements IProxy { // These three following methods are here to prevent a strange crash in the dedicated server whenever packets are // received @@ -52,17 +51,23 @@ public class ClientProxy implements IProxy { @Override public void clearClientKnowledge() { - Transmutation.clearKnowledge(FMLClientHandler.instance().getClientPlayerEntity()); + Transmutation.clearKnowledge( + FMLClientHandler.instance() + .getClientPlayerEntity()); } @Override public TransmutationProps getClientTransmutationProps() { - return TransmutationProps.getDataFor(FMLClientHandler.instance().getClientPlayerEntity()); + return TransmutationProps.getDataFor( + FMLClientHandler.instance() + .getClientPlayerEntity()); } @Override public AlchBagProps getClientBagProps() { - return AlchBagProps.getDataFor(FMLClientHandler.instance().getClientPlayerEntity()); + return AlchBagProps.getDataFor( + FMLClientHandler.instance() + .getClientPlayerEntity()); } @Override @@ -75,11 +80,11 @@ public void registerRenderers() { // Items MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ObjHandler.alchChest), new ChestItemRenderer()); MinecraftForgeClient - .registerItemRenderer(Item.getItemFromBlock(ObjHandler.condenser), new CondenserItemRenderer()); + .registerItemRenderer(Item.getItemFromBlock(ObjHandler.condenser), new CondenserItemRenderer()); MinecraftForgeClient - .registerItemRenderer(Item.getItemFromBlock(ObjHandler.condenserMk2), new CondenserMK2ItemRenderer()); + .registerItemRenderer(Item.getItemFromBlock(ObjHandler.condenserMk2), new CondenserMK2ItemRenderer()); MinecraftForgeClient - .registerItemRenderer(Item.getItemFromBlock(ObjHandler.dmPedestal), new PedestalItemRenderer()); + .registerItemRenderer(Item.getItemFromBlock(ObjHandler.dmPedestal), new PedestalItemRenderer()); // Blocks ClientRegistry.bindTileEntitySpecialRenderer(AlchChestTile.class, new ChestRenderer()); @@ -89,35 +94,35 @@ public void registerRenderers() { // Entities RenderingRegistry - .registerEntityRenderingHandler(EntityWaterProjectile.class, new RenderSnowball(ObjHandler.waterOrb)); + .registerEntityRenderingHandler(EntityWaterProjectile.class, new RenderSnowball(ObjHandler.waterOrb)); RenderingRegistry - .registerEntityRenderingHandler(EntityLavaProjectile.class, new RenderSnowball(ObjHandler.lavaOrb)); + .registerEntityRenderingHandler(EntityLavaProjectile.class, new RenderSnowball(ObjHandler.lavaOrb)); RenderingRegistry.registerEntityRenderingHandler(EntityLootBall.class, new RenderSnowball(ObjHandler.lootBall)); - RenderingRegistry.registerEntityRenderingHandler( - EntityMobRandomizer.class, - new RenderSnowball(ObjHandler.mobRandomizer)); - RenderingRegistry.registerEntityRenderingHandler( - EntityLensProjectile.class, - new RenderSnowball(ObjHandler.lensExplosive)); + RenderingRegistry + .registerEntityRenderingHandler(EntityMobRandomizer.class, new RenderSnowball(ObjHandler.mobRandomizer)); + RenderingRegistry + .registerEntityRenderingHandler(EntityLensProjectile.class, new RenderSnowball(ObjHandler.lensExplosive)); RenderingRegistry.registerEntityRenderingHandler(EntityNovaCatalystPrimed.class, new NovaCatalystRenderer()); RenderingRegistry.registerEntityRenderingHandler(EntityNovaCataclysmPrimed.class, new NovaCataclysmRenderer()); - RenderingRegistry.registerEntityRenderingHandler( - EntityFireProjectile.class, - new RenderSnowball(ObjHandler.fireProjectile)); - RenderingRegistry.registerEntityRenderingHandler( - EntitySWRGProjectile.class, - new RenderSnowball(ObjHandler.windProjectile)); + RenderingRegistry + .registerEntityRenderingHandler(EntityFireProjectile.class, new RenderSnowball(ObjHandler.fireProjectile)); + RenderingRegistry + .registerEntityRenderingHandler(EntitySWRGProjectile.class, new RenderSnowball(ObjHandler.windProjectile)); } @Override public void registerClientOnlyEvents() { MinecraftForge.EVENT_BUS.register(new ToolTipEvent()); MinecraftForge.EVENT_BUS.register(new TransmutationRenderingEvent()); - FMLCommonHandler.instance().bus().register(new KeyPressEvent()); + FMLCommonHandler.instance() + .bus() + .register(new KeyPressEvent()); PlayerRender pr = new PlayerRender(); MinecraftForge.EVENT_BUS.register(pr); - FMLCommonHandler.instance().bus().register(pr); + FMLCommonHandler.instance() + .bus() + .register(pr); } @Override @@ -127,11 +132,13 @@ public void initializeManual() { @Override public EntityPlayer getClientPlayer() { - return FMLClientHandler.instance().getClientPlayerEntity(); + return FMLClientHandler.instance() + .getClientPlayerEntity(); } @Override public boolean isJumpPressed() { - return FMLClientHandler.instance().getClient().gameSettings.keyBindJump.getIsKeyPressed(); + return FMLClientHandler.instance() + .getClient().gameSettings.keyBindJump.getIsKeyPressed(); } } diff --git a/src/main/java/moze_intel/projecte/proxies/IProxy.java b/src/main/java/moze_intel/projecte/proxies/IProxy.java index 818bbdf58..bef861e54 100644 --- a/src/main/java/moze_intel/projecte/proxies/IProxy.java +++ b/src/main/java/moze_intel/projecte/proxies/IProxy.java @@ -1,10 +1,10 @@ package moze_intel.projecte.proxies; +import net.minecraft.entity.player.EntityPlayer; + import moze_intel.projecte.playerData.AlchBagProps; import moze_intel.projecte.playerData.TransmutationProps; -import net.minecraft.entity.player.EntityPlayer; - public interface IProxy { void registerKeyBinds(); diff --git a/src/main/java/moze_intel/projecte/proxies/ServerProxy.java b/src/main/java/moze_intel/projecte/proxies/ServerProxy.java index 7e7bda2ff..93751bf35 100644 --- a/src/main/java/moze_intel/projecte/proxies/ServerProxy.java +++ b/src/main/java/moze_intel/projecte/proxies/ServerProxy.java @@ -1,10 +1,10 @@ package moze_intel.projecte.proxies; +import net.minecraft.entity.player.EntityPlayer; + import moze_intel.projecte.playerData.AlchBagProps; import moze_intel.projecte.playerData.TransmutationProps; -import net.minecraft.entity.player.EntityPlayer; - public class ServerProxy implements IProxy { public void registerKeyBinds() {} diff --git a/src/main/java/moze_intel/projecte/rendering/ChestItemRenderer.java b/src/main/java/moze_intel/projecte/rendering/ChestItemRenderer.java index 373b02317..e69e4b40e 100644 --- a/src/main/java/moze_intel/projecte/rendering/ChestItemRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/ChestItemRenderer.java @@ -1,7 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.PECore; - import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -12,13 +10,14 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; @SideOnly(Side.CLIENT) public class ChestItemRenderer implements IItemRenderer { private final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/blocks/alchemy_chest.png"); + PECore.MODID.toLowerCase(), + "textures/blocks/alchemy_chest.png"); private final ModelChest model = new ModelChest(); @Override @@ -52,7 +51,8 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { } private void renderChest(float x, float y, float z, int metaData) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); + FMLClientHandler.instance() + .getClient().renderEngine.bindTexture(texture); GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); GL11.glRotatef(180, 1, 0, 0); diff --git a/src/main/java/moze_intel/projecte/rendering/ChestRenderer.java b/src/main/java/moze_intel/projecte/rendering/ChestRenderer.java index 36d2bdccf..c9e1ad2c6 100644 --- a/src/main/java/moze_intel/projecte/rendering/ChestRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/ChestRenderer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.tiles.AlchChestTile; - import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -14,13 +11,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.tiles.AlchChestTile; @SideOnly(Side.CLIENT) public class ChestRenderer extends TileEntitySpecialRenderer { private final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/blocks/alchemy_chest.png"); + PECore.MODID.toLowerCase(), + "textures/blocks/alchemy_chest.png"); private final ModelChest model = new ModelChest(); @Override diff --git a/src/main/java/moze_intel/projecte/rendering/CondenserItemRenderer.java b/src/main/java/moze_intel/projecte/rendering/CondenserItemRenderer.java index 0b85ed442..98ea61cfb 100644 --- a/src/main/java/moze_intel/projecte/rendering/CondenserItemRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/CondenserItemRenderer.java @@ -1,7 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.PECore; - import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -12,13 +10,14 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; @SideOnly(Side.CLIENT) public class CondenserItemRenderer implements IItemRenderer { private final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/blocks/condenser.png"); + PECore.MODID.toLowerCase(), + "textures/blocks/condenser.png"); private final ModelChest model = new ModelChest(); @Override @@ -52,7 +51,8 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { } private void renderCondenser(float x, float y, float z, int metaData) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); + FMLClientHandler.instance() + .getClient().renderEngine.bindTexture(texture); GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); GL11.glRotatef(180, 1, 0, 0); diff --git a/src/main/java/moze_intel/projecte/rendering/CondenserMK2ItemRenderer.java b/src/main/java/moze_intel/projecte/rendering/CondenserMK2ItemRenderer.java index 07248e095..4f0db780d 100644 --- a/src/main/java/moze_intel/projecte/rendering/CondenserMK2ItemRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/CondenserMK2ItemRenderer.java @@ -1,7 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.PECore; - import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -12,13 +10,14 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; @SideOnly(Side.CLIENT) public class CondenserMK2ItemRenderer implements IItemRenderer { private final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/blocks/condenser_mk2.png"); + PECore.MODID.toLowerCase(), + "textures/blocks/condenser_mk2.png"); private final ModelChest model = new ModelChest(); @Override @@ -28,7 +27,7 @@ public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType typ @Override public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, - IItemRenderer.ItemRendererHelper helper) { + IItemRenderer.ItemRendererHelper helper) { return true; } @@ -53,7 +52,8 @@ public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object } private void renderCondenser(float x, float y, float z, int metaData) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); + FMLClientHandler.instance() + .getClient().renderEngine.bindTexture(texture); GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); GL11.glRotatef(180, 1, 0, 0); diff --git a/src/main/java/moze_intel/projecte/rendering/CondenserMK2Renderer.java b/src/main/java/moze_intel/projecte/rendering/CondenserMK2Renderer.java index 0e82bac0c..f5f54c984 100644 --- a/src/main/java/moze_intel/projecte/rendering/CondenserMK2Renderer.java +++ b/src/main/java/moze_intel/projecte/rendering/CondenserMK2Renderer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.tiles.CondenserTile; - import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -14,13 +11,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.tiles.CondenserTile; @SideOnly(Side.CLIENT) public class CondenserMK2Renderer extends TileEntitySpecialRenderer { private final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/blocks/condenser_mk2.png"); + PECore.MODID.toLowerCase(), + "textures/blocks/condenser_mk2.png"); private final ModelChest model = new ModelChest(); @Override diff --git a/src/main/java/moze_intel/projecte/rendering/CondenserRenderer.java b/src/main/java/moze_intel/projecte/rendering/CondenserRenderer.java index dcb7a820c..00672b2ed 100644 --- a/src/main/java/moze_intel/projecte/rendering/CondenserRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/CondenserRenderer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.PECore; -import moze_intel.projecte.gameObjs.tiles.CondenserTile; - import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -14,13 +11,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; +import moze_intel.projecte.gameObjs.tiles.CondenserTile; @SideOnly(Side.CLIENT) public class CondenserRenderer extends TileEntitySpecialRenderer { private final ResourceLocation texture = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/blocks/condenser.png"); + PECore.MODID.toLowerCase(), + "textures/blocks/condenser.png"); private final ModelChest model = new ModelChest(); @Override diff --git a/src/main/java/moze_intel/projecte/rendering/NovaCataclysmRenderer.java b/src/main/java/moze_intel/projecte/rendering/NovaCataclysmRenderer.java index 7125a613a..db6d7bfaf 100644 --- a/src/main/java/moze_intel/projecte/rendering/NovaCataclysmRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/NovaCataclysmRenderer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.entity.EntityNovaCataclysmPrimed; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; @@ -13,6 +10,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.entity.EntityNovaCataclysmPrimed; @SideOnly(Side.CLIENT) public class NovaCataclysmRenderer extends Render { diff --git a/src/main/java/moze_intel/projecte/rendering/NovaCatalystRenderer.java b/src/main/java/moze_intel/projecte/rendering/NovaCatalystRenderer.java index c1b69c3df..5105bccc1 100644 --- a/src/main/java/moze_intel/projecte/rendering/NovaCatalystRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/NovaCatalystRenderer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.gameObjs.ObjHandler; -import moze_intel.projecte.gameObjs.entity.EntityNovaCatalystPrimed; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; @@ -13,6 +10,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.gameObjs.ObjHandler; +import moze_intel.projecte.gameObjs.entity.EntityNovaCatalystPrimed; @SideOnly(Side.CLIENT) public class NovaCatalystRenderer extends Render { diff --git a/src/main/java/moze_intel/projecte/rendering/PedestalItemRenderer.java b/src/main/java/moze_intel/projecte/rendering/PedestalItemRenderer.java index 8a43239f4..ba865941c 100644 --- a/src/main/java/moze_intel/projecte/rendering/PedestalItemRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/PedestalItemRenderer.java @@ -1,8 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.rendering.model.ModelPedestal; -import moze_intel.projecte.utils.Constants; - import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; @@ -10,6 +7,8 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; +import moze_intel.projecte.rendering.model.ModelPedestal; +import moze_intel.projecte.utils.Constants; public class PedestalItemRenderer implements IItemRenderer { @@ -47,7 +46,8 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { } private void renderPedestal(float x, float y, float z, int meta) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); + FMLClientHandler.instance() + .getClient().renderEngine.bindTexture(texture); GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); GL11.glRotatef(180, 1, 0, 0); diff --git a/src/main/java/moze_intel/projecte/rendering/PedestalRenderer.java b/src/main/java/moze_intel/projecte/rendering/PedestalRenderer.java index 446baed41..9f5d009e9 100644 --- a/src/main/java/moze_intel/projecte/rendering/PedestalRenderer.java +++ b/src/main/java/moze_intel/projecte/rendering/PedestalRenderer.java @@ -1,9 +1,5 @@ package moze_intel.projecte.rendering; -import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; -import moze_intel.projecte.rendering.model.ModelPedestal; -import moze_intel.projecte.utils.Constants; - import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -12,6 +8,10 @@ import org.lwjgl.opengl.GL11; +import moze_intel.projecte.gameObjs.tiles.DMPedestalTile; +import moze_intel.projecte.rendering.model.ModelPedestal; +import moze_intel.projecte.utils.Constants; + public class PedestalRenderer extends TileEntitySpecialRenderer { private final ModelPedestal model = new ModelPedestal(); diff --git a/src/main/java/moze_intel/projecte/utils/AchievementHandler.java b/src/main/java/moze_intel/projecte/utils/AchievementHandler.java index 8f727161a..c588fc177 100644 --- a/src/main/java/moze_intel/projecte/utils/AchievementHandler.java +++ b/src/main/java/moze_intel/projecte/utils/AchievementHandler.java @@ -1,155 +1,169 @@ package moze_intel.projecte.utils; -import moze_intel.projecte.gameObjs.ObjHandler; - import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; import com.google.common.collect.ImmutableList; +import moze_intel.projecte.gameObjs.ObjHandler; + public final class AchievementHandler { public final static Achievement PHIL_STONE = new Achievement( - "phil_stone", - "phil_stone", - 0, - 2, - ObjHandler.philosStone, - null).initIndependentStat().registerStat(); + "phil_stone", + "phil_stone", + 0, + 2, + ObjHandler.philosStone, + null).initIndependentStat() + .registerStat(); public final static Achievement ALCH_CHEST = new Achievement( - "alch_chest", - "alch_chest", - 0, - -2, - ObjHandler.alchChest, - null).initIndependentStat().registerStat(); + "alch_chest", + "alch_chest", + 0, + -2, + ObjHandler.alchChest, + null).initIndependentStat() + .registerStat(); public final static Achievement ALCH_BAG = new Achievement( - "alch_bag", - "alch_bag", - 0, - -4, - ObjHandler.alchBag, - ALCH_CHEST).registerStat(); + "alch_bag", + "alch_bag", + 0, + -4, + ObjHandler.alchBag, + ALCH_CHEST).registerStat(); public final static Achievement TRANSMUTATION = new Achievement( - "transmutation", - "transmutation", - 0, - 0, - ObjHandler.transmuteStone, - PHIL_STONE).registerStat(); + "transmutation", + "transmutation", + 0, + 0, + ObjHandler.transmuteStone, + PHIL_STONE).registerStat(); public final static Achievement CONDENSER = new Achievement( - "condenser", - "condenser", - -2, - -2, - ObjHandler.condenser, - ALCH_CHEST).setSpecial().registerStat(); + "condenser", + "condenser", + -2, + -2, + ObjHandler.condenser, + ALCH_CHEST).setSpecial() + .registerStat(); public final static Achievement COLLECTOR = new Achievement( - "collector", - "collector", - -2, - -4, - ObjHandler.energyCollector, - CONDENSER).setSpecial().registerStat(); + "collector", + "collector", + -2, + -4, + ObjHandler.energyCollector, + CONDENSER).setSpecial() + .registerStat(); public final static Achievement RELAY = new Achievement("relay", "relay", -4, -4, ObjHandler.relay, COLLECTOR) - .setSpecial().registerStat(); + .setSpecial() + .registerStat(); public final static Achievement PORTABLE_TRANSMUTATION = new Achievement( - "portable_transmutation", - "portable_transmutation", - -2, - 0, - ObjHandler.transmutationTablet, - TRANSMUTATION).setSpecial().registerStat(); + "portable_transmutation", + "portable_transmutation", + -2, + 0, + ObjHandler.transmutationTablet, + TRANSMUTATION).setSpecial() + .registerStat(); public final static Achievement DARK_MATTER = new Achievement( - "dark_matter", - "dark_matter", - 2, - 0, - new ItemStack(ObjHandler.matter, 1, 0), - null).initIndependentStat().registerStat(); + "dark_matter", + "dark_matter", + 2, + 0, + new ItemStack(ObjHandler.matter, 1, 0), + null).initIndependentStat() + .registerStat(); public final static Achievement RED_MATTER = new Achievement( - "red_matter", - "red_matter", - 2, - -2, - new ItemStack(ObjHandler.matter, 1, 1), - DARK_MATTER).setSpecial().registerStat(); + "red_matter", + "red_matter", + 2, + -2, + new ItemStack(ObjHandler.matter, 1, 1), + DARK_MATTER).setSpecial() + .registerStat(); public final static Achievement DM_BLOCK = new Achievement( - "dm_block", - "dm_block", - 4, - 0, - new ItemStack(ObjHandler.matterBlock, 1, 0), - DARK_MATTER).setSpecial().registerStat(); + "dm_block", + "dm_block", + 4, + 0, + new ItemStack(ObjHandler.matterBlock, 1, 0), + DARK_MATTER).setSpecial() + .registerStat(); public final static Achievement RM_BLOCK = new Achievement( - "rm_block", - "rm_block", - 4, - -2, - new ItemStack(ObjHandler.matterBlock, 1, 1), - RED_MATTER).setSpecial().registerStat(); + "rm_block", + "rm_block", + 4, + -2, + new ItemStack(ObjHandler.matterBlock, 1, 1), + RED_MATTER).setSpecial() + .registerStat(); public final static Achievement DM_FURNACE = new Achievement( - "dm_furnace", - "dm_furnace", - 6, - 0, - ObjHandler.dmFurnaceOff, - DM_BLOCK).setSpecial().registerStat(); + "dm_furnace", + "dm_furnace", + 6, + 0, + ObjHandler.dmFurnaceOff, + DM_BLOCK).setSpecial() + .registerStat(); public final static Achievement RM_FURNACE = new Achievement( - "rm_furnace", - "rm_furnace", - 6, - -2, - ObjHandler.rmFurnaceOff, - RM_BLOCK).setSpecial().registerStat(); + "rm_furnace", + "rm_furnace", + 6, + -2, + ObjHandler.rmFurnaceOff, + RM_BLOCK).setSpecial() + .registerStat(); public final static Achievement DM_PICK = new Achievement( - "dm_pick", - "dm_pick", - 2, - 2, - ObjHandler.dmPick, - DARK_MATTER).registerStat(); + "dm_pick", + "dm_pick", + 2, + 2, + ObjHandler.dmPick, + DARK_MATTER).registerStat(); public final static Achievement RM_PICK = new Achievement("rm_pick", "rm_pick", 2, 4, ObjHandler.rmPick, DM_PICK) - .setSpecial().registerStat(); + .setSpecial() + .registerStat(); public final static Achievement KLEIN_BASIC = new Achievement( - "klein", - "klein", - 0, - 4, - new ItemStack(ObjHandler.kleinStars, 1, 0), - PHIL_STONE).registerStat(); + "klein", + "klein", + 0, + 4, + new ItemStack(ObjHandler.kleinStars, 1, 0), + PHIL_STONE).registerStat(); public final static Achievement KLEIN_MASTER = new Achievement( - "klein_big", - "klein_big", - -2, - 4, - new ItemStack(ObjHandler.kleinStars, 1, 5), - KLEIN_BASIC).setSpecial().registerStat(); + "klein_big", + "klein_big", + -2, + 4, + new ItemStack(ObjHandler.kleinStars, 1, 5), + KLEIN_BASIC).setSpecial() + .registerStat(); public static ImmutableList list = ImmutableList.of( - PHIL_STONE, - ALCH_CHEST, - ALCH_BAG, - TRANSMUTATION, - CONDENSER, - COLLECTOR, - RELAY, - PORTABLE_TRANSMUTATION, - DARK_MATTER, - RED_MATTER, - DM_BLOCK, - RM_BLOCK, - DM_FURNACE, - RM_FURNACE, - DM_PICK, - RM_PICK, - KLEIN_BASIC, - KLEIN_MASTER); + PHIL_STONE, + ALCH_CHEST, + ALCH_BAG, + TRANSMUTATION, + CONDENSER, + COLLECTOR, + RELAY, + PORTABLE_TRANSMUTATION, + DARK_MATTER, + RED_MATTER, + DM_BLOCK, + RM_BLOCK, + DM_FURNACE, + RM_FURNACE, + DM_PICK, + RM_PICK, + KLEIN_BASIC, + KLEIN_MASTER); public static void init() { AchievementPage - .registerAchievementPage(new AchievementPage("ProjectE", list.toArray(new Achievement[list.size()]))); + .registerAchievementPage(new AchievementPage("ProjectE", list.toArray(new Achievement[list.size()]))); } public static Achievement getAchievementForItem(ItemStack stack) { diff --git a/src/main/java/moze_intel/projecte/utils/ChatHelper.java b/src/main/java/moze_intel/projecte/utils/ChatHelper.java index 7dc7f6c8f..5468f22ee 100644 --- a/src/main/java/moze_intel/projecte/utils/ChatHelper.java +++ b/src/main/java/moze_intel/projecte/utils/ChatHelper.java @@ -15,7 +15,8 @@ public final class ChatHelper { */ public static IChatComponent modifyColor(IChatComponent chat, EnumChatFormatting format) { if (format.isColor()) { - chat.getChatStyle().setColor(format); + chat.getChatStyle() + .setColor(format); } return chat; } diff --git a/src/main/java/moze_intel/projecte/utils/ClientKeyHelper.java b/src/main/java/moze_intel/projecte/utils/ClientKeyHelper.java index f7eb6dc31..2effcd02e 100644 --- a/src/main/java/moze_intel/projecte/utils/ClientKeyHelper.java +++ b/src/main/java/moze_intel/projecte/utils/ClientKeyHelper.java @@ -1,7 +1,5 @@ package moze_intel.projecte.utils; -import moze_intel.projecte.PECore; - import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; @@ -11,6 +9,7 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import moze_intel.projecte.PECore; /** * Clientside key helper - because PEKeybind cannot touch client classes or it will crash dedicated servers @@ -36,7 +35,8 @@ public static void registerMCBindings() { * Get the key name this PEKeybind is bound to. */ public static String getKeyName(PEKeybind k) { - int keyCode = peToMc.get(k).getKeyCode(); + int keyCode = peToMc.get(k) + .getKeyCode(); if (keyCode > Keyboard.getKeyCount() || keyCode < 0) { return "INVALID KEY"; } diff --git a/src/main/java/moze_intel/projecte/utils/ComparatorHelper.java b/src/main/java/moze_intel/projecte/utils/ComparatorHelper.java index 60e0e0397..26f7fbb7a 100644 --- a/src/main/java/moze_intel/projecte/utils/ComparatorHelper.java +++ b/src/main/java/moze_intel/projecte/utils/ComparatorHelper.java @@ -1,5 +1,9 @@ package moze_intel.projecte.utils; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import moze_intel.projecte.api.item.IItemEmc; import moze_intel.projecte.gameObjs.tiles.AlchChestTile; import moze_intel.projecte.gameObjs.tiles.CollectorMK1Tile; @@ -7,10 +11,6 @@ import moze_intel.projecte.gameObjs.tiles.RMFurnaceTile; import moze_intel.projecte.gameObjs.tiles.RelayMK1Tile; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - /** * Utility class to get comparator outputs for a block */ diff --git a/src/main/java/moze_intel/projecte/utils/Comparators.java b/src/main/java/moze_intel/projecte/utils/Comparators.java index 32055069a..01629dfad 100644 --- a/src/main/java/moze_intel/projecte/utils/Comparators.java +++ b/src/main/java/moze_intel/projecte/utils/Comparators.java @@ -2,14 +2,14 @@ import java.util.Comparator; -import moze_intel.projecte.emc.EMCMapper; -import moze_intel.projecte.emc.SimpleStack; -import moze_intel.projecte.manual.AbstractPage; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import moze_intel.projecte.emc.EMCMapper; +import moze_intel.projecte.emc.SimpleStack; +import moze_intel.projecte.manual.AbstractPage; + public final class Comparators { public static final Comparator ITEMSTACK_EMC_DESCENDING = new Comparator() { @@ -117,7 +117,7 @@ public int compare(Long i1, Long i2) { @Override public int compare(AbstractPage o1, AbstractPage o2) { return StatCollector.translateToLocal(o1.getHeaderText()) - .compareToIgnoreCase(StatCollector.translateToLocal(o2.getHeaderText())); + .compareToIgnoreCase(StatCollector.translateToLocal(o2.getHeaderText())); } }; } diff --git a/src/main/java/moze_intel/projecte/utils/Constants.java b/src/main/java/moze_intel/projecte/utils/Constants.java index 64e6b54e5..74330c93b 100644 --- a/src/main/java/moze_intel/projecte/utils/Constants.java +++ b/src/main/java/moze_intel/projecte/utils/Constants.java @@ -2,12 +2,12 @@ import java.text.DecimalFormat; -import moze_intel.projecte.PECore; - import net.minecraft.util.ResourceLocation; import com.google.common.collect.ImmutableMap; + import cpw.mods.fml.client.registry.RenderingRegistry; +import moze_intel.projecte.PECore; public final class Constants { @@ -20,7 +20,7 @@ public final class Constants { public static final float[] COLLECTOR_LIGHT_VALS = new float[] { 0.4375F, 0.6875F, 1.0F }; public static final float[] EXPLOSIVE_LENS_RADIUS = new float[] { 4.0F, 8.0F, 12.0F, 16.0F, 16.0F, 16.0F, 16.0F, - 16.0F }; + 16.0F }; public static final int[] EXPLOSIVE_LENS_COST = new int[] { 384, 768, 1536, 2304, 2304, 2304, 2304, 2304 }; public static final long TILE_MAX_EMC = Long.MAX_VALUE; @@ -72,8 +72,8 @@ public final class Constants { public static final int CONDENSER_MK2_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); public static final int PEDESTAL_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); public static final ResourceLocation PEDESTAL_MODELTEX_LOCATION = new ResourceLocation( - PECore.MODID.toLowerCase(), - "textures/models/pedestaltexmap.png"); + PECore.MODID.toLowerCase(), + "textures/models/pedestaltexmap.png"); public static final int MAX_VEIN_SIZE = 250; diff --git a/src/main/java/moze_intel/projecte/utils/EMCHelper.java b/src/main/java/moze_intel/projecte/utils/EMCHelper.java index 27518777e..ddc78eecd 100644 --- a/src/main/java/moze_intel/projecte/utils/EMCHelper.java +++ b/src/main/java/moze_intel/projecte/utils/EMCHelper.java @@ -3,11 +3,6 @@ import java.util.LinkedHashMap; import java.util.Map; -import moze_intel.projecte.api.item.IItemEmc; -import moze_intel.projecte.emc.EMCMapper; -import moze_intel.projecte.emc.FuelMapper; -import moze_intel.projecte.emc.SimpleStack; - import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -18,6 +13,11 @@ import com.google.common.collect.Maps; +import moze_intel.projecte.api.item.IItemEmc; +import moze_intel.projecte.emc.EMCMapper; +import moze_intel.projecte.emc.FuelMapper; +import moze_intel.projecte.emc.SimpleStack; + /** * Helper class for EMC. Notice: Please try to keep methods tidy and alphabetically ordered. Thanks! */ diff --git a/src/main/java/moze_intel/projecte/utils/GuiHandler.java b/src/main/java/moze_intel/projecte/utils/GuiHandler.java index 675ef503d..137689677 100644 --- a/src/main/java/moze_intel/projecte/utils/GuiHandler.java +++ b/src/main/java/moze_intel/projecte/utils/GuiHandler.java @@ -1,5 +1,10 @@ package moze_intel.projecte.utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import cpw.mods.fml.common.network.IGuiHandler; import moze_intel.projecte.gameObjs.container.AlchBagContainer; import moze_intel.projecte.gameObjs.container.AlchBagInventory; import moze_intel.projecte.gameObjs.container.AlchChestContainer; @@ -50,12 +55,6 @@ import moze_intel.projecte.gameObjs.tiles.RelayMK2Tile; import moze_intel.projecte.gameObjs.tiles.RelayMK3Tile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import cpw.mods.fml.common.network.IGuiHandler; - public class GuiHandler implements IGuiHandler { @Override @@ -113,8 +112,8 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int return new TransmutationContainer(player.inventory, new TransmutationInventory(player)); case Constants.ETERNAL_DENSITY_GUI: return new EternalDensityContainer( - player.inventory, - new EternalDensityInventory(player.getHeldItem(), player)); + player.inventory, + new EternalDensityInventory(player.getHeldItem(), player)); case Constants.CONDENSER_MK2_GUI: return new CondenserMK2Container(player.inventory, (CondenserMK2Tile) tile); case Constants.PEDESTAL_GUI: @@ -180,8 +179,8 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int case Constants.ETERNAL_DENSITY_GUI: player.getHeldItem(); return new GUIEternalDensity( - player.inventory, - new EternalDensityInventory(player.getHeldItem(), player)); + player.inventory, + new EternalDensityInventory(player.getHeldItem(), player)); case Constants.CONDENSER_MK2_GUI: return new GUICondenserMK2(player.inventory, (CondenserMK2Tile) tile); case Constants.PEDESTAL_GUI: diff --git a/src/main/java/moze_intel/projecte/utils/ItemHelper.java b/src/main/java/moze_intel/projecte/utils/ItemHelper.java index 0e160fef8..9f1852157 100644 --- a/src/main/java/moze_intel/projecte/utils/ItemHelper.java +++ b/src/main/java/moze_intel/projecte/utils/ItemHelper.java @@ -4,8 +4,6 @@ import java.util.Iterator; import java.util.List; -import moze_intel.projecte.gameObjs.entity.EntityLootBall; - import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; @@ -18,6 +16,8 @@ import com.google.common.collect.Lists; +import moze_intel.projecte.gameObjs.entity.EntityLootBall; + /** * Helpers for Inventories, ItemStacks, Items, and the Ore Dictionary Notice: Please try to keep methods tidy and * alphabetically ordered. Thanks! @@ -37,7 +37,7 @@ public static boolean areItemStacksEqualIgnoreNBT(ItemStack stack1, ItemStack st } if (stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE - || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE) { + || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE) { return true; } @@ -94,7 +94,8 @@ public static boolean containsItemStack(List list, ItemStack toSearch continue; } - if (stack.getItem().equals(toSearch.getItem())) { + if (stack.getItem() + .equals(toSearch.getItem())) { if (!stack.getHasSubtypes() || stack.getItemDamage() == toSearch.getItemDamage()) { return true; } @@ -164,7 +165,8 @@ public static List getODItems(String oreName) { try { copy.setItemDamage(i); - if (copy.getUnlocalizedName() == null || copy.getUnlocalizedName().equals(startName)) { + if (copy.getUnlocalizedName() == null || copy.getUnlocalizedName() + .equals(startName)) { result.addAll(list); break; } @@ -352,7 +354,7 @@ public static ItemStack pushStackInInv(IInventory inv, ItemStack stack) { } if (inv.isItemValidForSlot(i, stack) && areItemStacksEqual(stack, invStack) - && invStack.stackSize < invStack.getMaxStackSize()) { + && invStack.stackSize < invStack.getMaxStackSize()) { int remaining = invStack.getMaxStackSize() - invStack.stackSize; if (remaining >= stack.stackSize) { diff --git a/src/main/java/moze_intel/projecte/utils/ItemSearchHelper.java b/src/main/java/moze_intel/projecte/utils/ItemSearchHelper.java index f3d01fe45..3200b772e 100644 --- a/src/main/java/moze_intel/projecte/utils/ItemSearchHelper.java +++ b/src/main/java/moze_intel/projecte/utils/ItemSearchHelper.java @@ -43,7 +43,8 @@ public boolean doesItemMatchFilter_(ItemStack stack) { String displayName; try { - displayName = stack.getDisplayName().toLowerCase(Locale.ROOT); + displayName = stack.getDisplayName() + .toLowerCase(Locale.ROOT); } catch (Exception e) { e.printStackTrace(); // From old code... Not sure if intended to not remove items that crash on getDisplayName diff --git a/src/main/java/moze_intel/projecte/utils/ItemSearchHelperNEI.java b/src/main/java/moze_intel/projecte/utils/ItemSearchHelperNEI.java index d4689f70c..41c4cc233 100644 --- a/src/main/java/moze_intel/projecte/utils/ItemSearchHelperNEI.java +++ b/src/main/java/moze_intel/projecte/utils/ItemSearchHelperNEI.java @@ -1,11 +1,7 @@ package moze_intel.projecte.utils; -import java.util.LinkedList; -import java.util.List; - import net.minecraft.item.ItemStack; -import codechicken.nei.ItemList; import codechicken.nei.SearchField; import codechicken.nei.api.ItemFilter; @@ -21,7 +17,8 @@ public ItemSearchHelperNEI(String searchString) { public ItemFilter getFilter(String s_filter) { // based on // https://github.com/Chicken-Bones/NotEnoughItems/blob/a1879a96548d17f5c4d95b40956d68f6f9db82f8/src/codechicken/nei/SearchField.java#L124-L139 - // update https://github.com/GTNewHorizons/NotEnoughItems/compare/2.6.8-GTNH...2.6.11-GTNH#diff-225658e5eb6bea123b279ea478ad7bd18a6ba63448b58ba53aa774272496e701L162-L181 + // update + // https://github.com/GTNewHorizons/NotEnoughItems/compare/2.6.8-GTNH...2.6.11-GTNH#diff-225658e5eb6bea123b279ea478ad7bd18a6ba63448b58ba53aa774272496e701L162-L181 return SearchField.searchParser.getFilter(s_filter); } diff --git a/src/main/java/moze_intel/projecte/utils/MathUtils.java b/src/main/java/moze_intel/projecte/utils/MathUtils.java index 0aac46590..8c59ad00e 100644 --- a/src/main/java/moze_intel/projecte/utils/MathUtils.java +++ b/src/main/java/moze_intel/projecte/utils/MathUtils.java @@ -53,10 +53,10 @@ public static String tickToSecFormatted(int ticks) { double result = tickToSec(ticks); if (result == 0.0D) { return result + " " - + StatCollector.translateToLocal("pe.misc.seconds") - + " (" - + StatCollector.translateToLocal("pe.misc.every_tick") - + ")"; + + StatCollector.translateToLocal("pe.misc.seconds") + + " (" + + StatCollector.translateToLocal("pe.misc.every_tick") + + ")"; } else { return result + " " + StatCollector.translateToLocal("pe.misc.seconds"); } diff --git a/src/main/java/moze_intel/projecte/utils/MetaBlock.java b/src/main/java/moze_intel/projecte/utils/MetaBlock.java index 8f199b385..500bb3bfd 100644 --- a/src/main/java/moze_intel/projecte/utils/MetaBlock.java +++ b/src/main/java/moze_intel/projecte/utils/MetaBlock.java @@ -70,7 +70,7 @@ public boolean equals(Object obj) { if (this.block == block.getBlock()) { return this.meta == block.meta - || this.block.damageDropped(this.meta) == block.block.damageDropped(block.meta); + || this.block.damageDropped(this.meta) == block.block.damageDropped(block.meta); } } diff --git a/src/main/java/moze_intel/projecte/utils/NBTWhitelist.java b/src/main/java/moze_intel/projecte/utils/NBTWhitelist.java index f8ba4dfd3..9c85ec17f 100644 --- a/src/main/java/moze_intel/projecte/utils/NBTWhitelist.java +++ b/src/main/java/moze_intel/projecte/utils/NBTWhitelist.java @@ -2,13 +2,13 @@ import java.util.List; -import moze_intel.projecte.emc.SimpleStack; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import com.google.common.collect.Lists; +import moze_intel.projecte.emc.SimpleStack; + public final class NBTWhitelist { private static final List LIST = Lists.newArrayList(); diff --git a/src/main/java/moze_intel/projecte/utils/NovaExplosion.java b/src/main/java/moze_intel/projecte/utils/NovaExplosion.java index 6d486b1be..06cc21083 100644 --- a/src/main/java/moze_intel/projecte/utils/NovaExplosion.java +++ b/src/main/java/moze_intel/projecte/utils/NovaExplosion.java @@ -62,21 +62,21 @@ public void doExplosionA() { if (block.getMaterial() != Material.air) { float f3 = this.exploder != null - ? this.exploder.func_145772_a(this, this.worldObj, j1, k1, l1, block) - : block.getExplosionResistance( - this.exploder, - worldObj, - j1, - k1, - l1, - explosionX, - explosionY, - explosionZ); + ? this.exploder.func_145772_a(this, this.worldObj, j1, k1, l1, block) + : block.getExplosionResistance( + this.exploder, + worldObj, + j1, + k1, + l1, + explosionX, + explosionY, + explosionZ); f1 -= (f3 + 0.3F) * f2; } if (f1 > 0.0F && (this.exploder == null - || this.exploder.func_145774_a(this, this.worldObj, j1, k1, l1, block, f1))) + || this.exploder.func_145774_a(this, this.worldObj, j1, k1, l1, block, f1))) hashset.add(new ChunkPosition(j1, k1, l1)); d5 += d0 * (double) f2; @@ -88,23 +88,23 @@ public void doExplosionA() { this.affectedBlockPositions.addAll(hashset); this.explosionSize = f; net.minecraftforge.event.ForgeEventFactory - .onExplosionDetonate(this.worldObj, this, Collections.emptyList(), this.explosionSize); + .onExplosionDetonate(this.worldObj, this, Collections.emptyList(), this.explosionSize); } @Override public void doExplosionB(boolean spawnParticles) { worldObj.playSoundEffect( - this.explosionX, - this.explosionY, - this.explosionZ, - "random.explode", - 4.0F, - (1.0F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); + this.explosionX, + this.explosionY, + this.explosionZ, + "random.explode", + 4.0F, + (1.0F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); if (this.explosionSize >= 2.0F && this.isSmoking) worldObj - .spawnParticle("hugeexplosion", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); + .spawnParticle("hugeexplosion", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); else worldObj - .spawnParticle("largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); + .spawnParticle("largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); Iterator iterator; ChunkPosition chunkposition; @@ -141,19 +141,19 @@ public void doExplosionB(boolean spawnParticles) { d4 *= d7; d5 *= d7; worldObj.spawnParticle( - "explode", - (d0 + this.explosionX * 1.0D) / 2.0D, - (d1 + this.explosionY * 1.0D) / 2.0D, - (d2 + this.explosionZ * 1.0D) / 2.0D, - d3, - d4, - d5); + "explode", + (d0 + this.explosionX * 1.0D) / 2.0D, + (d1 + this.explosionY * 1.0D) / 2.0D, + (d2 + this.explosionZ * 1.0D) / 2.0D, + d3, + d4, + d5); worldObj.spawnParticle("smoke", d0, d1, d2, d3, d4, d5); } if (block.getMaterial() != Material.air) { ArrayList drops = block - .getDrops(worldObj, i, j, k, worldObj.getBlockMetadata(i, j, k), 0); + .getDrops(worldObj, i, j, k, worldObj.getBlockMetadata(i, j, k), 0); if (drops != null && drops.size() > 0) list.addAll(drops); block.onBlockExploded(worldObj, i, j, k, this); diff --git a/src/main/java/moze_intel/projecte/utils/PELogger.java b/src/main/java/moze_intel/projecte/utils/PELogger.java index 646d3ff41..8e17b6870 100644 --- a/src/main/java/moze_intel/projecte/utils/PELogger.java +++ b/src/main/java/moze_intel/projecte/utils/PELogger.java @@ -1,12 +1,12 @@ package moze_intel.projecte.utils; -import moze_intel.projecte.PECore; -import moze_intel.projecte.config.ProjectEConfig; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import moze_intel.projecte.PECore; +import moze_intel.projecte.config.ProjectEConfig; + public final class PELogger { private static Logger logger = LogManager.getLogger(PECore.MODID); diff --git a/src/main/java/moze_intel/projecte/utils/PlayerHelper.java b/src/main/java/moze_intel/projecte/utils/PlayerHelper.java index 6ab0e82f0..69c5cf7d1 100644 --- a/src/main/java/moze_intel/projecte/utils/PlayerHelper.java +++ b/src/main/java/moze_intel/projecte/utils/PlayerHelper.java @@ -1,11 +1,5 @@ package moze_intel.projecte.utils; -import moze_intel.projecte.gameObjs.items.ItemPE; -import moze_intel.projecte.network.PacketHandler; -import moze_intel.projecte.network.packets.SetFlyPKT; -import moze_intel.projecte.network.packets.StepHeightPKT; -import moze_intel.projecte.network.packets.SwingItemPKT; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -27,6 +21,11 @@ import baubles.api.BaublesApi; import cpw.mods.fml.common.Loader; +import moze_intel.projecte.gameObjs.items.ItemPE; +import moze_intel.projecte.network.PacketHandler; +import moze_intel.projecte.network.packets.SetFlyPKT; +import moze_intel.projecte.network.packets.StepHeightPKT; +import moze_intel.projecte.network.packets.SwingItemPKT; /** * Helper class for player-related methods. Notice: Please try to keep methods tidy and alphabetically ordered. Thanks! @@ -39,7 +38,7 @@ public final class PlayerHelper { * @return Whether the block was successfully placed */ public static boolean checkedPlaceBlock(EntityPlayerMP player, int x, int y, int z, Block toPlace, - int toPlaceMeta) { + int toPlaceMeta) { if (!hasEditPermission(player, x, y, z)) { return false; } @@ -62,7 +61,7 @@ public static boolean checkedPlaceBlock(EntityPlayerMP player, int x, int y, int } public static boolean checkedReplaceBlock(EntityPlayerMP player, int x, int y, int z, Block toPlace, - int toPlaceMeta) { + int toPlaceMeta) { return hasBreakPermission(player, x, y, z) && checkedPlaceBlock(player, x, y, z, toPlace, toPlaceMeta); } @@ -89,9 +88,9 @@ public static Vec3 getBlockLookingAt(EntityPlayer player, double maxDistance) { if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { ForgeDirection dir = ForgeDirection.getOrientation(mop.sideHit); return Vec3.createVectorHelper( - mop.blockX + dir.offsetX * 1.1, - mop.blockY + dir.offsetY * 1.1, - mop.blockZ + dir.offsetZ * 1.1); + mop.blockX + dir.offsetX * 1.1, + mop.blockY + dir.offsetY * 1.1, + mop.blockZ + dir.offsetZ * 1.1); } return null; } @@ -103,9 +102,9 @@ public static Pair getLookVec(EntityPlayer player, double maxDistanc // Thank you ForgeEssentials Vec3 look = player.getLook(1.0F); Vec3 playerPos = Vec3.createVectorHelper( - player.posX, - player.posY + (player.getEyeHeight() - player.getDefaultEyeHeight()), - player.posZ); + player.posX, + player.posY + (player.getEyeHeight() - player.getDefaultEyeHeight()), + player.posZ); Vec3 src = playerPos.addVector(0, player.getEyeHeight(), 0); Vec3 dest = src.addVector(look.xCoord * maxDistance, look.yCoord * maxDistance, look.zCoord * maxDistance); return ImmutablePair.of(src, dest); @@ -113,13 +112,14 @@ public static Pair getLookVec(EntityPlayer player, double maxDistanc public static boolean hasBreakPermission(EntityPlayerMP player, int x, int y, int z) { return hasEditPermission(player, x, y, z) && !ForgeHooks - .onBlockBreakEvent(player.worldObj, player.theItemInWorldManager.getGameType(), player, x, y, z) - .isCanceled(); + .onBlockBreakEvent(player.worldObj, player.theItemInWorldManager.getGameType(), player, x, y, z) + .isCanceled(); } public static boolean hasEditPermission(EntityPlayerMP player, int x, int y, int z) { return player.canPlayerEdit(x, y, z, player.worldObj.getBlockMetadata(x, y, z), null) - && !MinecraftServer.getServer().isBlockProtected(player.worldObj, x, y, z, player); + && !MinecraftServer.getServer() + .isBlockProtected(player.worldObj, x, y, z, player); } public static void setPlayerFireImmunity(EntityPlayer player, boolean value) { diff --git a/src/main/java/moze_intel/projecte/utils/ReflectionHelper.java b/src/main/java/moze_intel/projecte/utils/ReflectionHelper.java index 0b5f771d1..31ef77fe0 100644 --- a/src/main/java/moze_intel/projecte/utils/ReflectionHelper.java +++ b/src/main/java/moze_intel/projecte/utils/ReflectionHelper.java @@ -17,7 +17,7 @@ public final class ReflectionHelper { protected static boolean getArrowInGround(EntityArrow instance) { return cpw.mods.fml.relauncher.ReflectionHelper - .getPrivateValue(EntityArrow.class, instance, arrowInGroundNames); + .getPrivateValue(EntityArrow.class, instance, arrowInGroundNames); } protected static void setEntityFireImmunity(Entity instance, boolean value) { @@ -26,6 +26,6 @@ protected static void setEntityFireImmunity(Entity instance, boolean value) { protected static void setPlayerCapabilityWalkspeed(PlayerCapabilities instance, float value) { cpw.mods.fml.relauncher.ReflectionHelper - .setPrivateValue(PlayerCapabilities.class, instance, value, playerCapaWalkSpeedNames); + .setPrivateValue(PlayerCapabilities.class, instance, value, playerCapaWalkSpeedNames); } } diff --git a/src/main/java/moze_intel/projecte/utils/WorldHelper.java b/src/main/java/moze_intel/projecte/utils/WorldHelper.java index cf4cb33cb..859e15207 100644 --- a/src/main/java/moze_intel/projecte/utils/WorldHelper.java +++ b/src/main/java/moze_intel/projecte/utils/WorldHelper.java @@ -3,9 +3,6 @@ import java.lang.reflect.Constructor; import java.util.*; -import moze_intel.projecte.config.ProjectEConfig; -import moze_intel.projecte.gameObjs.entity.EntityLootBall; - import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.IGrowable; @@ -59,6 +56,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import moze_intel.projecte.config.ProjectEConfig; +import moze_intel.projecte.gameObjs.entity.EntityLootBall; + /** * Helper class for anything that touches a World. Notice: Please try to keep methods tidy and alphabetically ordered. * Thanks! @@ -66,31 +66,31 @@ public final class WorldHelper { public static final ImmutableList> peacefuls = ImmutableList - .>of( - EntitySheep.class, - EntityPig.class, - EntityCow.class, - EntityMooshroom.class, - EntityChicken.class, - EntityBat.class, - EntityVillager.class, - EntitySquid.class, - EntityOcelot.class, - EntityWolf.class, - EntityHorse.class); + .>of( + EntitySheep.class, + EntityPig.class, + EntityCow.class, + EntityMooshroom.class, + EntityChicken.class, + EntityBat.class, + EntityVillager.class, + EntitySquid.class, + EntityOcelot.class, + EntityWolf.class, + EntityHorse.class); public static final ImmutableList> mobs = ImmutableList - .>of( - EntityZombie.class, - EntitySkeleton.class, - EntityCreeper.class, - EntitySpider.class, - EntityEnderman.class, - EntitySilverfish.class, - EntityPigZombie.class, - EntityGhast.class, - EntityBlaze.class, - EntitySlime.class, - EntityWitch.class); + .>of( + EntityZombie.class, + EntitySkeleton.class, + EntityCreeper.class, + EntitySpider.class, + EntityEnderman.class, + EntitySilverfish.class, + EntityPigZombie.class, + EntityGhast.class, + EntityBlaze.class, + EntitySlime.class, + EntityWitch.class); public static Set> interdictionBlacklist = Sets.newHashSet(); @@ -141,11 +141,11 @@ public static void createNovaExplosion(World world, Entity exploder, double x, d public static void extinguishNearby(World world, EntityPlayer player) { for (int x = (int) (player.posX - 1); x <= player.posX + 1; x++) for (int y = (int) (player.posY - 1); y - <= player.posY + 1; y++) + <= player.posY + 1; y++) for (int z = (int) (player.posZ - 1); z <= player.posZ + 1; z++) if (world.getBlock(x, y, z) == Blocks.fire - && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z)) { - world.setBlockToAir(x, y, z); - } + && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z)) { + world.setBlockToAir(x, y, z); + } } public static void freezeInBoundingBox(World world, AxisAlignedBB box, EntityPlayer player, boolean random) { @@ -165,13 +165,8 @@ public static void freezeInBoundingBox(World world, AxisAlignedBB box, EntityPla if (b2 == Blocks.air && (!random || world.rand.nextInt(128) == 0)) { if (player != null) { - PlayerHelper.checkedReplaceBlock( - ((EntityPlayerMP) player), - x, - y + 1, - z, - Blocks.snow_layer, - 0); + PlayerHelper + .checkedReplaceBlock(((EntityPlayerMP) player), x, y + 1, z, Blocks.snow_layer, 0); } else { world.setBlock(x, y + 1, z, Blocks.snow_layer); } @@ -187,12 +182,12 @@ public static List getAdjacentTileEntities(World world, TileEntity t } public static Map getAdjacentTileEntitiesMapped(final World world, - final TileEntity tile) { + final TileEntity tile) { Map ret = new EnumMap<>(ForgeDirection.class); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { TileEntity candidate = world - .getTileEntity(tile.xCoord + dir.offsetX, tile.yCoord + dir.offsetY, tile.zCoord + dir.offsetZ); + .getTileEntity(tile.xCoord + dir.offsetX, tile.yCoord + dir.offsetY, tile.zCoord + dir.offsetZ); if (candidate != null) { ret.put(dir, candidate); } @@ -202,21 +197,16 @@ public static Map getAdjacentTileEntitiesMapped(fina } public static ArrayList getBlockDrops(World world, EntityPlayer player, Block block, ItemStack stack, - int x, int y, int z) { + int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0 - && block.canSilkHarvest(world, player, x, y, z, meta)) { + && block.canSilkHarvest(world, player, x, y, z, meta)) { return Lists.newArrayList(new ItemStack(block, 1, meta)); } - return block.getDrops( - world, - x, - y, - z, - meta, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + return block + .getDrops(world, x, y, z, meta, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); } /** @@ -225,52 +215,52 @@ public static ArrayList getBlockDrops(World world, EntityPlayer playe public static AxisAlignedBB getBroadDeepBox(Coordinates coords, ForgeDirection direction, int offset) { if (direction.offsetX > 0) { return AxisAlignedBB.getBoundingBox( - coords.x - offset, - coords.y - offset, - coords.z - offset, - coords.x, - coords.y + offset, - coords.z + offset); + coords.x - offset, + coords.y - offset, + coords.z - offset, + coords.x, + coords.y + offset, + coords.z + offset); } else if (direction.offsetX < 0) { return AxisAlignedBB.getBoundingBox( - coords.x, - coords.y - offset, - coords.z - offset, - coords.x + offset, - coords.y + offset, - coords.z + offset); + coords.x, + coords.y - offset, + coords.z - offset, + coords.x + offset, + coords.y + offset, + coords.z + offset); } else if (direction.offsetY > 0) { return AxisAlignedBB.getBoundingBox( - coords.x - offset, - coords.y - offset, - coords.z - offset, - coords.x + offset, - coords.y, - coords.z + offset); + coords.x - offset, + coords.y - offset, + coords.z - offset, + coords.x + offset, + coords.y, + coords.z + offset); } else if (direction.offsetY < 0) { return AxisAlignedBB.getBoundingBox( - coords.x - offset, - coords.y, - coords.z - offset, - coords.x + offset, - coords.y + offset, - coords.z + offset); + coords.x - offset, + coords.y, + coords.z - offset, + coords.x + offset, + coords.y + offset, + coords.z + offset); } else if (direction.offsetZ > 0) { return AxisAlignedBB.getBoundingBox( - coords.x - offset, - coords.y - offset, - coords.z - offset, - coords.x + offset, - coords.y + offset, - coords.z); + coords.x - offset, + coords.y - offset, + coords.z - offset, + coords.x + offset, + coords.y + offset, + coords.z); } else if (direction.offsetZ < 0) { return AxisAlignedBB.getBoundingBox( - coords.x - offset, - coords.y - offset, - coords.z, - coords.x + offset, - coords.y + offset, - coords.z + offset); + coords.x - offset, + coords.y - offset, + coords.z, + coords.x + offset, + coords.y + offset, + coords.z + offset); } return AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); } @@ -282,37 +272,22 @@ public static AxisAlignedBB getBroadDeepBox(Coordinates coords, ForgeDirection d public static AxisAlignedBB getDeepBox(Coordinates coords, ForgeDirection direction, int depth) { if (direction.offsetX != 0) { if (direction.offsetX > 0) { - return AxisAlignedBB.getBoundingBox( - coords.x - depth, - coords.y - 1, - coords.z - 1, - coords.x, - coords.y + 1, - coords.z + 1); + return AxisAlignedBB + .getBoundingBox(coords.x - depth, coords.y - 1, coords.z - 1, coords.x, coords.y + 1, coords.z + 1); } else return AxisAlignedBB - .getBoundingBox(coords.x, coords.y - 1, coords.z - 1, coords.x + depth, coords.y + 1, coords.z + 1); + .getBoundingBox(coords.x, coords.y - 1, coords.z - 1, coords.x + depth, coords.y + 1, coords.z + 1); } else if (direction.offsetY != 0) { if (direction.offsetY > 0) { - return AxisAlignedBB.getBoundingBox( - coords.x - 1, - coords.y - depth, - coords.z - 1, - coords.x + 1, - coords.y, - coords.z + 1); + return AxisAlignedBB + .getBoundingBox(coords.x - 1, coords.y - depth, coords.z - 1, coords.x + 1, coords.y, coords.z + 1); } else return AxisAlignedBB - .getBoundingBox(coords.x - 1, coords.y, coords.z - 1, coords.x + 1, coords.y + depth, coords.z + 1); + .getBoundingBox(coords.x - 1, coords.y, coords.z - 1, coords.x + 1, coords.y + depth, coords.z + 1); } else { if (direction.offsetZ > 0) { - return AxisAlignedBB.getBoundingBox( - coords.x - 1, - coords.y - 1, - coords.z - depth, - coords.x + 1, - coords.y + 1, - coords.z); + return AxisAlignedBB + .getBoundingBox(coords.x - 1, coords.y - 1, coords.z - depth, coords.x + 1, coords.y + 1, coords.z); } else return AxisAlignedBB - .getBoundingBox(coords.x - 1, coords.y - 1, coords.z, coords.x + 1, coords.y + 1, coords.z + depth); + .getBoundingBox(coords.x - 1, coords.y - 1, coords.z, coords.x + 1, coords.y + 1, coords.z + depth); } } @@ -322,12 +297,12 @@ public static AxisAlignedBB getDeepBox(Coordinates coords, ForgeDirection direct */ public static AxisAlignedBB getFlatYBox(Coordinates coords, int offset) { return AxisAlignedBB.getBoundingBox( - coords.x - offset, - coords.y, - coords.z - offset, - coords.x + offset, - coords.y, - coords.z + offset); + coords.x - offset, + coords.y, + coords.z - offset, + coords.x + offset, + coords.y, + coords.z + offset); } public static T getNewEntityInstance(Class c, World world) { @@ -404,7 +379,7 @@ public static void gravitateEntityTowards(Entity ent, double x, double y, double } public static void growNearbyRandomly(boolean harvest, World world, double xCoord, double yCoord, double zCoord, - EntityPlayer player) { + EntityPlayer player) { int chance = harvest ? 16 : 32; for (int x = (int) (xCoord - 5); x <= xCoord + 5; x++) for (int y = (int) (yCoord - 3); y <= yCoord + 3; y++) @@ -432,8 +407,9 @@ else if (crop instanceof IGrowable) { world.func_147480_a(x, y, z, true); } } else if (world.rand.nextInt(chance) == 0) { - if (ProjectEConfig.harvBandGrass - || !crop.getUnlocalizedName().toLowerCase(Locale.ROOT).contains("grass")) { + if (ProjectEConfig.harvBandGrass || !crop.getUnlocalizedName() + .toLowerCase(Locale.ROOT) + .contains("grass")) { growable.func_149853_b(world, world.rand, x, y, z); } } @@ -467,8 +443,8 @@ else if (crop instanceof IPlantable) { if (shouldHarvest) { for (int i = crop == Blocks.reeds ? 1 : 0; i < 3; i++) { - if (player != null && PlayerHelper - .hasBreakPermission(((EntityPlayerMP) player), x, y + i, z)) { + if (player != null + && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y + i, z)) { world.func_147480_a(x, y + i, z, true); } else if (player == null) { world.func_147480_a(x, y + i, z, true); @@ -480,7 +456,7 @@ else if (crop instanceof IPlantable) { int meta = ((IPlantable) crop).getPlantMetadata(world, x, y, z); if (meta == 3) { if (player != null - && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z)) { + && PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z)) { world.func_147480_a(x, y, z, true); } else if (player == null) { world.func_147480_a(x, y, z, true); @@ -496,13 +472,13 @@ else if (crop instanceof IPlantable) { * Recursively mines out a vein of the given Block, starting from the provided coordinates */ public static void harvestVein(World world, EntityPlayer player, ItemStack stack, Coordinates coords, Block target, - List currentDrops, int numMined) { + List currentDrops, int numMined) { if (numMined >= Constants.MAX_VEIN_SIZE) { return; } AxisAlignedBB b = AxisAlignedBB - .getBoundingBox(coords.x - 1, coords.y - 1, coords.z - 1, coords.x + 1, coords.y + 1, coords.z + 1); + .getBoundingBox(coords.x - 1, coords.y - 1, coords.z - 1, coords.x + 1, coords.y + 1, coords.z + 1); for (int x = (int) b.minX; x <= b.maxX; x++) for (int y = (int) b.minY; y <= b.maxY; y++) for (int z = (int) b.minZ; z <= b.maxZ; z++) { @@ -536,15 +512,15 @@ public static boolean isArrowInGround(EntityArrow arrow) { * Repels projectiles and mobs in the given AABB away from a given point */ public static void repelEntitiesInAABBFromPoint(World world, AxisAlignedBB effectBounds, double x, double y, - double z, boolean isSWRG) { + double z, boolean isSWRG) { List list = world.getEntitiesWithinAABB(Entity.class, effectBounds); for (Entity ent : list) { if ((isSWRG && !swrgBlacklist.contains(ent.getClass())) - || (!isSWRG && !interdictionBlacklist.contains(ent.getClass()))) { + || (!isSWRG && !interdictionBlacklist.contains(ent.getClass()))) { if ((ent instanceof EntityLiving) || (ent instanceof IProjectile)) { if (!isSWRG && ProjectEConfig.interdictionMode - && !(ent instanceof IMob || ent instanceof IProjectile)) { + && !(ent instanceof IMob || ent instanceof IProjectile)) { continue; } else { if (ent instanceof EntityArrow && ((EntityArrow) ent).onGround) { @@ -571,25 +547,28 @@ public static void spawnEntityItem(World world, ItemStack stack, double x, doubl EntityItem entityitem; for (float f2 = world.rand.nextFloat() * 0.8F + 0.1F; stack.stackSize > 0; world - .spawnEntityInWorld(entityitem)) { + .spawnEntityInWorld(entityitem)) { int j1 = world.rand.nextInt(21) + 10; if (j1 > stack.stackSize) j1 = stack.stackSize; stack.stackSize -= j1; entityitem = new EntityItem( - world, - (double) ((float) x + f), - (double) ((float) y + f1), - (double) ((float) z + f2), - new ItemStack(stack.getItem(), j1, stack.getItemDamage())); + world, + (double) ((float) x + f), + (double) ((float) y + f1), + (double) ((float) z + f2), + new ItemStack(stack.getItem(), j1, stack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (double) ((float) world.rand.nextGaussian() * f3); entityitem.motionY = (double) ((float) world.rand.nextGaussian() * f3 + 0.2F); entityitem.motionZ = (double) ((float) world.rand.nextGaussian() * f3); if (stack.hasTagCompound()) { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + entityitem.getEntityItem() + .setTagCompound( + (NBTTagCompound) stack.getTagCompound() + .copy()); } } diff --git a/src/main/java/moze_intel/projecte/utils/WorldTransmutations.java b/src/main/java/moze_intel/projecte/utils/WorldTransmutations.java index e045538e9..0c09af24e 100644 --- a/src/main/java/moze_intel/projecte/utils/WorldTransmutations.java +++ b/src/main/java/moze_intel/projecte/utils/WorldTransmutations.java @@ -24,67 +24,67 @@ public final class WorldTransmutations { register(Blocks.melon_block, Blocks.pumpkin); register( - new MetaBlock(Blocks.log, 0), - new MetaBlock[] { new MetaBlock(Blocks.log, 1), new MetaBlock(Blocks.log2, 1) }); + new MetaBlock(Blocks.log, 0), + new MetaBlock[] { new MetaBlock(Blocks.log, 1), new MetaBlock(Blocks.log2, 1) }); register( - new MetaBlock(Blocks.leaves, 0), - new MetaBlock[] { new MetaBlock(Blocks.leaves, 1), new MetaBlock(Blocks.leaves, 1) }); + new MetaBlock(Blocks.leaves, 0), + new MetaBlock[] { new MetaBlock(Blocks.leaves, 1), new MetaBlock(Blocks.leaves, 1) }); for (int i = 1; i < 3; i++) { register( - new MetaBlock(Blocks.log, i), - new MetaBlock[] { new MetaBlock(Blocks.log, i + 1), new MetaBlock(Blocks.log, i - 1) }); + new MetaBlock(Blocks.log, i), + new MetaBlock[] { new MetaBlock(Blocks.log, i + 1), new MetaBlock(Blocks.log, i - 1) }); register( - new MetaBlock(Blocks.leaves, i), - new MetaBlock[] { new MetaBlock(Blocks.leaves, i + 1), new MetaBlock(Blocks.leaves, i - 1) }); + new MetaBlock(Blocks.leaves, i), + new MetaBlock[] { new MetaBlock(Blocks.leaves, i + 1), new MetaBlock(Blocks.leaves, i - 1) }); } register( - new MetaBlock(Blocks.log, 3), - new MetaBlock[] { new MetaBlock(Blocks.log2, 0), new MetaBlock(Blocks.log, 2) }); + new MetaBlock(Blocks.log, 3), + new MetaBlock[] { new MetaBlock(Blocks.log2, 0), new MetaBlock(Blocks.log, 2) }); register( - new MetaBlock(Blocks.leaves, 3), - new MetaBlock[] { new MetaBlock(Blocks.leaves2, 0), new MetaBlock(Blocks.leaves, 2) }); + new MetaBlock(Blocks.leaves, 3), + new MetaBlock[] { new MetaBlock(Blocks.leaves2, 0), new MetaBlock(Blocks.leaves, 2) }); register( - new MetaBlock(Blocks.log2, 0), - new MetaBlock[] { new MetaBlock(Blocks.log2, 1), new MetaBlock(Blocks.log, 3) }); + new MetaBlock(Blocks.log2, 0), + new MetaBlock[] { new MetaBlock(Blocks.log2, 1), new MetaBlock(Blocks.log, 3) }); register( - new MetaBlock(Blocks.leaves2, 0), - new MetaBlock[] { new MetaBlock(Blocks.leaves2, 1), new MetaBlock(Blocks.leaves, 3) }); + new MetaBlock(Blocks.leaves2, 0), + new MetaBlock[] { new MetaBlock(Blocks.leaves2, 1), new MetaBlock(Blocks.leaves, 3) }); register( - new MetaBlock(Blocks.log2, 1), - new MetaBlock[] { new MetaBlock(Blocks.log, 0), new MetaBlock(Blocks.log2, 0) }); + new MetaBlock(Blocks.log2, 1), + new MetaBlock[] { new MetaBlock(Blocks.log, 0), new MetaBlock(Blocks.log2, 0) }); register( - new MetaBlock(Blocks.leaves2, 1), - new MetaBlock[] { new MetaBlock(Blocks.leaves, 0), new MetaBlock(Blocks.leaves2, 0) }); + new MetaBlock(Blocks.leaves2, 1), + new MetaBlock[] { new MetaBlock(Blocks.leaves, 0), new MetaBlock(Blocks.leaves2, 0) }); register( - new MetaBlock(Blocks.sapling, 0), - new MetaBlock[] { new MetaBlock(Blocks.sapling, 1), new MetaBlock(Blocks.sapling, 5) }); + new MetaBlock(Blocks.sapling, 0), + new MetaBlock[] { new MetaBlock(Blocks.sapling, 1), new MetaBlock(Blocks.sapling, 5) }); for (int i = 1; i < 5; i++) { register( - new MetaBlock(Blocks.sapling, i), - new MetaBlock[] { new MetaBlock(Blocks.sapling, i + 1), new MetaBlock(Blocks.sapling, i - 1) }); + new MetaBlock(Blocks.sapling, i), + new MetaBlock[] { new MetaBlock(Blocks.sapling, i + 1), new MetaBlock(Blocks.sapling, i - 1) }); } register( - new MetaBlock(Blocks.sapling, 5), - new MetaBlock[] { new MetaBlock(Blocks.sapling, 0), new MetaBlock(Blocks.sapling, 4) }); + new MetaBlock(Blocks.sapling, 5), + new MetaBlock[] { new MetaBlock(Blocks.sapling, 0), new MetaBlock(Blocks.sapling, 4) }); register( - new MetaBlock(Blocks.wool, 0), - new MetaBlock[] { new MetaBlock(Blocks.wool, 1), new MetaBlock(Blocks.wool, 15) }); + new MetaBlock(Blocks.wool, 0), + new MetaBlock[] { new MetaBlock(Blocks.wool, 1), new MetaBlock(Blocks.wool, 15) }); for (int i = 1; i < 15; i++) { register( - new MetaBlock(Blocks.wool, i), - new MetaBlock[] { new MetaBlock(Blocks.wool, i + 1), new MetaBlock(Blocks.wool, i - 1) }); + new MetaBlock(Blocks.wool, i), + new MetaBlock[] { new MetaBlock(Blocks.wool, i + 1), new MetaBlock(Blocks.wool, i - 1) }); } register( - new MetaBlock(Blocks.wool, 15), - new MetaBlock[] { new MetaBlock(Blocks.wool, 0), new MetaBlock(Blocks.wool, 14) }); + new MetaBlock(Blocks.wool, 15), + new MetaBlock[] { new MetaBlock(Blocks.wool, 0), new MetaBlock(Blocks.wool, 14) }); } public static MetaBlock getWorldTransmutation(World world, int x, int y, int z, boolean isSneaking) { diff --git a/src/main/java/xyz/akirin/fmpe/FMPELogger.java b/src/main/java/xyz/akirin/fmpe/FMPELogger.java index 35047d19a..4cdc72667 100644 --- a/src/main/java/xyz/akirin/fmpe/FMPELogger.java +++ b/src/main/java/xyz/akirin/fmpe/FMPELogger.java @@ -1,11 +1,11 @@ package xyz.akirin.fmpe; -import moze_intel.projecte.config.ProjectEConfig; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import moze_intel.projecte.config.ProjectEConfig; + public class FMPELogger { private static Logger logger = LogManager.getLogger(FMPEMain.ID);