diff --git a/.classpath b/.classpath
index 645d6c4..4c28397 100644
--- a/.classpath
+++ b/.classpath
@@ -1,17 +1,71 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.gradle/2.4/taskArtifacts/cache.properties b/.gradle/2.4/taskArtifacts/cache.properties
new file mode 100644
index 0000000..19b435d
--- /dev/null
+++ b/.gradle/2.4/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Wed Sep 28 22:20:01 EDT 2016
diff --git a/.gradle/2.4/taskArtifacts/cache.properties.lock b/.gradle/2.4/taskArtifacts/cache.properties.lock
new file mode 100644
index 0000000..5daa8b3
Binary files /dev/null and b/.gradle/2.4/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.4/taskArtifacts/fileHashes.bin b/.gradle/2.4/taskArtifacts/fileHashes.bin
new file mode 100644
index 0000000..9676b0d
Binary files /dev/null and b/.gradle/2.4/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.4/taskArtifacts/fileSnapshots.bin b/.gradle/2.4/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 0000000..f348002
Binary files /dev/null and b/.gradle/2.4/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.4/taskArtifacts/outputFileStates.bin b/.gradle/2.4/taskArtifacts/outputFileStates.bin
new file mode 100644
index 0000000..20dabd4
Binary files /dev/null and b/.gradle/2.4/taskArtifacts/outputFileStates.bin differ
diff --git a/.gradle/2.4/taskArtifacts/taskArtifacts.bin b/.gradle/2.4/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 0000000..7d60477
Binary files /dev/null and b/.gradle/2.4/taskArtifacts/taskArtifacts.bin differ
diff --git a/.gradle/gradle.log b/.gradle/gradle.log
new file mode 100644
index 0000000..f958d52
--- /dev/null
+++ b/.gradle/gradle.log
@@ -0,0 +1,38 @@
+****************************
+ Powered By MCP:
+ http://modcoderpack.com/
+ Searge, ProfMobius, Fesh0r,
+ R4wk, ZeuX, IngisKahn, bspkrs
+ MCP Data version : unknown
+****************************
+:extractMcpData UP-TO-DATE
+:getVersionJson
+:extractUserDev UP-TO-DATE
+:genSrgs SKIPPED
+:extractNatives UP-TO-DATE
+:getAssetsIndex
+:getAssets
+:makeStart
+[ant:javac] warning: [options] bootstrap class path not set in conjunction with -source 1.6
+[ant:javac] 1 warning
+:downloadMcpTools SKIPPED
+:downloadClient SKIPPED
+:downloadServer SKIPPED
+:mergeJars SKIPPED
+:deobfuscateJar SKIPPED
+:decompile SKIPPED
+:processSources SKIPPED
+:remapJar SKIPPED
+:extractMinecraftSrc SKIPPED
+:recompMinecraft SKIPPED
+:repackMinecraft SKIPPED
+:setupDecompWorkspace
+:eclipseClasspath
+Download http://chickenbones.net/maven/codechicken/NotEnoughItems/1.7.10-1.0.5.120/NotEnoughItems-1.7.10-1.0.5.120-dev.jar
+:eclipseJdt
+:eclipseProject
+:eclipse
+
+BUILD SUCCESSFUL
+
+Total time: 16.307 secs
diff --git a/.project b/.project
index 2020904..74fafa7 100644
--- a/.project
+++ b/.project
@@ -1,19 +1,19 @@
WirelessCraftingTerminal
-
+
Minecraft
RemoteSystemsTempFiles
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
org.eclipse.jdt.core.javanature
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index d17b672..a874c41 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,14 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+#
+#Fri Dec 16 11:10:09 EST 2016
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/bin/CoFH_at.cfg b/bin/CoFH_at.cfg
new file mode 100644
index 0000000..b1cf76f
--- /dev/null
+++ b/bin/CoFH_at.cfg
@@ -0,0 +1,66 @@
+# NetherOres
+public net.minecraft.entity.monster.EntityPigZombie func_70835_c(Lnet/minecraft/entity/Entity;)V # becomeAngryAt
+public net.minecraft.entity.monster.EntitySilverfish field_70843_d # allySummonCooldown
+public-f net.minecraft.init.Blocks field_150449_bY # oreNetherQuartz
+
+# MineFactory Reloaded
+protected net.minecraft.util.WeightedRandomFishable * # need it all
+public net.minecraft.entity.EntityList field_75624_e # classToIDMapping
+public net.minecraft.entity.EntityList field_75622_f # stringToIDMapping
+public net.minecraft.entity.monster.EntitySlime func_70799_a(I)V # setSlimeSize
+public net.minecraft.entity.monster.EntityZombie func_82228_a(I)V # startConversion
+public net.minecraft.entity.EntityLivingBase field_70718_bc # recentlyHit
+public-f net.minecraft.init.Blocks field_150432_aD # ice
+public-f net.minecraft.init.Blocks field_150410_aZ # glass_pane
+public-f net.minecraft.init.Items field_151117_aB # milkBucket
+protected net.minecraft.block.Block field_149770_b # unlocalizedName
+public net.minecraft.server.management.PlayerManager func_72690_a(IIZ)Lnet/minecraft/server/management/PlayerManager$PlayerInstance; # getOrCreateChunkWatcher
+public net.minecraft.server.management.PlayerManager$PlayerInstance
+public net.minecraft.server.management.PlayerManager$PlayerInstance field_73263_b # playersWatchingChunk
+public net.minecraft.entity.EntityLiving field_70728_aV # experienceValue
+public net.minecraft.entity.EntityLiving field_82174_bp # equipmentDropChances
+
+# ThermalFoundation
+public net.minecraft.entity.Entity field_70171_ac # inWater
+
+# ThermalDynamics
+public net.minecraft.client.renderer.Tessellator field_147569_p # rawBufferIndex
+public net.minecraft.client.renderer.Tessellator field_78408_v # xOffset
+public net.minecraft.client.renderer.Tessellator field_78407_w # yOffset
+public net.minecraft.client.renderer.Tessellator field_78417_x # zOffset
+public net.minecraft.client.renderer.Tessellator field_78406_i # rawBuffer
+public net.minecraft.client.renderer.Tessellator field_78405_h # vertexCount
+
+# Thermal Expansion
+public net.minecraft.entity.Entity field_83001_bt # invulnerable
+public net.minecraft.entity.Entity field_70178_ae # isImmuneToFire
+public net.minecraft.entity.player.EntityPlayer field_71074_e # itemInUse
+public net.minecraft.server.management.ItemInWorldManager field_73094_o #durabilityRemainingOnBlock
+protected net.minecraft.client.particle.EntityFireworkSparkFX * # everything
+
+# PC Core
+public net.minecraft.client.gui.GuiScreen field_146289_q # fontRenderer
+public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft
+public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop
+public net.minecraft.world.WorldServer field_73068_P # allPlayersSleeping
+
+# CoFH Core
+protected net.minecraft.inventory.Container * # senseless to have private stuff here
+protected net.minecraft.client.gui.inventory.GuiContainer * # senseless to have private stuff here
+protected net.minecraft.client.gui.FontRenderer *()V # all of it
+protected net.minecraft.client.gui.FontRenderer * # all of it
+public net.minecraft.entity.projectile.EntityFishHook * # (nearly) literally everything is private
+
+public net.minecraft.nbt.NBTTagByteArray func_74734_a(Ljava/io/DataOutput;)V # write
+
+protected net.minecraft.entity.player.EntityPlayer field_71072_f # itemInUseCount
+public net.minecraft.item.ItemPickaxe field_150915_c # blocksEffectiveAgainst
+public net.minecraft.item.ItemSpade field_150916_c # blocksEffectiveAgainst
+public net.minecraft.item.ItemAxe field_150917_c # blocksEffectiveAgainst
+public net.minecraft.util.RegistrySimple field_82596_a # registryObjects
+public-f net.minecraft.util.RegistryNamespaced field_148759_a # underlyingIntegerMap
+public net.minecraft.world.World field_72998_d # collidingBoundingBoxes
+
+# WorldProxy
+public-f net.minecraft.world.World *()V # Doesn't matter what it is, we need it public
+public-f net.minecraft.world.WorldServer *()V # Doesn't matter what it is, we need it public
diff --git a/bin/assets/ae2wct/lang/de_DE.lang b/bin/assets/ae2wct/lang/de_DE.lang
new file mode 100644
index 0000000..a646cff
--- /dev/null
+++ b/bin/assets/ae2wct/lang/de_DE.lang
@@ -0,0 +1,77 @@
+//**************************//
+//WIRELESS CRAFTING TEMRINAL//
+//**************************//
+
+//Items
+item.wirelessCraftingTerminal.name=Drahtlose Fertigungskonsole
+item.infinityBoosterCard.name=Unendliche Drahtlosverstärkerkarte
+item.magnetCard.name=Magnetkarte
+itemGroup.ae2wct=§9AE2 Wireless Crafting Terminal
+
+//Tooltips
+gui.tooltips.ae2wct.PressShift=Infos via Shiftklick
+gui.tooltips.ae2wct.OnlyWorks=Funktioniert nur im Slot der drahtlosen Fertigungskonsole
+gui.tooltips.ae2wct.TitleDesc=Beschreibung
+gui.tooltips.ae2wct.InfinityBoosterDesc=Ermöglicht es, eine verbundene AE2 Drahtlosfertigungskonsole über Dimensionen hinweg in jeder Distanz zu nutzen.
+gui.tooltips.ae2wct.MagnetDesc=Eine Magnetkarte, die automagisch Items in das AE-Netzwerk insertiert
+gui.tooltips.ae2wct.MagnetDesc2=Rechtsklick, um den Filter zu setzen
+gui.tooltips.ae2wct.LinkStatus=Verbindungsstatus
+gui.tooltips.ae2wct.Installed=Installiert
+gui.tooltips.ae2wct.NotInstalled=Nicht installiert
+gui.tooltips.ae2wct.Active=Aktiv
+gui.tooltips.ae2wct.Inactive=Inaktiv
+gui.tooltips.ae2wct.Status=Status
+gui.tooltips.ae2wct.EmptyTrash=Lösche Müll
+gui.tooltips.ae2wct.EmptyTrashDesc=Leere den Müll-Slot
+gui.tooltips.ae2wct.MagnetFilterTitle=Magnetfilter
+gui.tooltips.ae2wct.FilterMode=Filter-Modus
+gui.tooltips.ae2wct.Whitelisting=Erlauben
+gui.tooltips.ae2wct.Blacklisting=Verbieten
+gui.tooltips.ae2wct.MagnetActiveDesc1=Zusätzliche Items im Inventar platzieren
+gui.tooltips.ae2wct.MagnetActiveDesc2=Zusätzliche Items auf dem Boden liegen lassen
+gui.tooltips.ae2wct.Not=Not
+gui.tooltips.ae2wct.Using=Using
+gui.tooltips.ae2wct.Ignore=Ignore
+gui.tooltips.ae2wct.Ignoring=Ignoring
+gui.tooltips.ae2wct.NBTData=NBT Data
+gui.tooltips.ae2wct.MetaData=Meta Data
+gui.tooltips.ae2wct.OreDict=Ore Dictionary
+gui.tooltips.ae2wct.FilteredItems=Filtered Items
+gui.tooltips.ae2wct.OrPress=or press
+gui.tooltips.ae2wct.Press=Press
+gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode
+
+//Labels
+gui.labels.ae2wct.WirelessTermLabel=Drahtloskonsole
+
+//Config Descriptions
+config.ae2wct.MaxPowerDesc=In der Drahtloskonsole maximal speicherbare Energie in AE
+config.ae2wct.InfinityBoosterCfgDesc=Erlaube das unendliche Drahtlosverstärkerupgrade
+config.ae2wct.EasyModeDesc=Aktiviere den "Einfachen Modus" (Einfachere Rezepte + Rezept für unendlichen Drahtlosverstärker)
+config.ae2wct.BoosterDropChance=Wahrscheinlichkeit, dass ein Wither eine unendliche Drahtlosverstärkerkarte dropt (in % - 100=immer)
+config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled)
+config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes)
+config.ae2wct.DoVersionCheck=Check for updates
+config.ae2wct.NewVersionAvailable=New version of Wireless Crafting Terminal is available!
+config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"]
+
+//Achievements
+achievement.wctAchievement=Digitales Fertigen über WLAN
+achievement.wctAchievement.desc=Fertige eine drahtlose Fertigungskonsole
+achievement.boosterAchievement=Interdimensionales Fertigen
+achievement.boosterAchievement.desc=Erwerbe eine unendliche Drahtlosverstärkerkarte
+achievement.magnetAchievement=Digitales Staubsaugen!
+achievement.magnetAchievement.desc=Fertige eine Magnetkarte
+
+//Chat Messages
+chatmessages.ae2wct.NoNetworkPower=Netzwerk hat keine Energie!
+chatmessages.ae2wct.MagnetMode1=Magnetkarte deaktiviert
+chatmessages.ae2wct.MagnetMode2=Magnetkarte aktiviert - Items, die nicht im AE-Netzwerk gespeichert sind, werden im Inventar platziert
+chatmessages.ae2wct.MagnetMode3=Magnetkarte aktiviert - Items, die nicht im AE-Netzwerk gespeichert sind, werden auf dem Boden liegen gelassen
+chatmessages.ae2wct.InitializeMagnet=Vor dem Benutzen des Tastenkürzels muss zuerst mit der Magnetkarte in der Hand ein Rechtsklick ausgeführt werden!
+
+//Keybindings
+key.OpenTerminal=Öffne drahtlose Fertigungskonsole
+key.OpenMagnetFilter=Öffne Magnetkartenfilter-GUI
+key.SwitchMagnetMode=Aktiviere/Deaktiviere Magnetkarte
+key.categories.ae2wct=Wireless Crafting Terminal
diff --git a/bin/assets/ae2wct/lang/en_CA.lang b/bin/assets/ae2wct/lang/en_CA.lang
new file mode 100644
index 0000000..2e37cc6
--- /dev/null
+++ b/bin/assets/ae2wct/lang/en_CA.lang
@@ -0,0 +1,76 @@
+//**************************//
+//WIRELESS CRAFTING TEMRINAL//
+//**************************//
+
+//Items
+item.wirelessCraftingTerminal.name=Wireless Crafting Terminal
+item.infinityBoosterCard.name=Infinity Booster Card
+item.magnetCard.name=Magnet Card
+itemGroup.ae2wct=§9AE2 Wireless Crafting Terminal
+
+//Tooltips
+gui.tooltips.ae2wct.PressShift=Hold Shift for Info
+gui.tooltips.ae2wct.OnlyWorks=Only works when in Wireless Crafting Terminal slot!
+gui.tooltips.ae2wct.TitleDesc=Description
+gui.tooltips.ae2wct.InfinityBoosterDesc=Allows a linked AE2 Wireless Crafting Terminal to be used at any distance and across dimensions.
+gui.tooltips.ae2wct.MagnetDesc=A magnet that automagically inserts items into the AE network.
+gui.tooltips.ae2wct.MagnetDesc2=Right-click to set filter
+gui.tooltips.ae2wct.LinkStatus=Link Status
+gui.tooltips.ae2wct.Installed=Installed
+gui.tooltips.ae2wct.NotInstalled=Not Installed
+gui.tooltips.ae2wct.Active=Active
+gui.tooltips.ae2wct.Inactive=Inactive
+gui.tooltips.ae2wct.Status=Status
+gui.tooltips.ae2wct.EmptyTrash=Empty Trash
+gui.tooltips.ae2wct.EmptyTrashDesc=Delete contents of the Trash slot
+gui.tooltips.ae2wct.MagnetFilterTitle=Magnet Filter
+gui.tooltips.ae2wct.FilterMode=Filter Mode
+gui.tooltips.ae2wct.Whitelisting=Whitelisting
+gui.tooltips.ae2wct.Blacklisting=Blacklisting
+gui.tooltips.ae2wct.MagnetActiveDesc1=Extra items added to inventory
+gui.tooltips.ae2wct.MagnetActiveDesc2=Extra items left on ground
+gui.tooltips.ae2wct.Not=Not
+gui.tooltips.ae2wct.Using=Using
+gui.tooltips.ae2wct.Ignore=Ignore
+gui.tooltips.ae2wct.Ignoring=Ignoring
+gui.tooltips.ae2wct.NBTData=NBT Data
+gui.tooltips.ae2wct.MetaData=Meta Data
+gui.tooltips.ae2wct.OreDict=Ore Dictionary
+gui.tooltips.ae2wct.FilteredItems=Filtered Items
+gui.tooltips.ae2wct.OrPress=or press
+gui.tooltips.ae2wct.Press=Press
+gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode
+
+//Labels
+gui.labels.ae2wct.WirelessTermLabel=Wireless Term
+
+//Config Descriptions
+config.ae2wct.MaxPowerDesc=Maximum Power in AE units the wireless terminal can hold
+config.ae2wct.InfinityBoosterCfgDesc=Enable Infinite Range Booster Upgrade
+config.ae2wct.EasyModeDesc=Enable Easy Mode (Easier Recipes+Infinity Booster Recipe)
+config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop)
+config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled)
+config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes)
+config.ae2wct.DoVersionCheck=Check for updates
+config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"]
+
+//Achievements
+achievement.wctAchievement=Digital Crafting Over WiFi
+achievement.wctAchievement.desc=Craft a Wireless Crafting Terminal
+achievement.boosterAchievement=Interdimensional Crafting Sack
+achievement.boosterAchievement.desc=Aquire an Infinity Booster Card
+achievement.magnetAchievement=Digital Hoover
+achievement.magnetAchievement.desc=Craft a Magnet Card
+
+//Chat Messages
+chatmessages.ae2wct.NoNetworkPower=Network has no power!
+chatmessages.ae2wct.MagnetMode1=Magnet Card Deactivated
+chatmessages.ae2wct.MagnetMode2=Magnet Card Activated - Items not stored in AE network will be placed in inventory
+chatmessages.ae2wct.MagnetMode3=Magnet Card Activated - Items not stored in AE network will be left on ground
+chatmessages.ae2wct.InitializeMagnet=You must first right-click with the Magnet Card in hand before using the keybind!
+
+//Keybindings
+key.OpenTerminal=Open Wireless Crafting Terminal
+key.OpenMagnetFilter=Open Magnet Card Filter GUI
+key.SwitchMagnetMode=Activate/Deactivate Magnet Card
+key.categories.ae2wct=Wireless Crafting Terminal
\ No newline at end of file
diff --git a/bin/assets/ae2wct/lang/en_GB.lang b/bin/assets/ae2wct/lang/en_GB.lang
new file mode 100644
index 0000000..2e37cc6
--- /dev/null
+++ b/bin/assets/ae2wct/lang/en_GB.lang
@@ -0,0 +1,76 @@
+//**************************//
+//WIRELESS CRAFTING TEMRINAL//
+//**************************//
+
+//Items
+item.wirelessCraftingTerminal.name=Wireless Crafting Terminal
+item.infinityBoosterCard.name=Infinity Booster Card
+item.magnetCard.name=Magnet Card
+itemGroup.ae2wct=§9AE2 Wireless Crafting Terminal
+
+//Tooltips
+gui.tooltips.ae2wct.PressShift=Hold Shift for Info
+gui.tooltips.ae2wct.OnlyWorks=Only works when in Wireless Crafting Terminal slot!
+gui.tooltips.ae2wct.TitleDesc=Description
+gui.tooltips.ae2wct.InfinityBoosterDesc=Allows a linked AE2 Wireless Crafting Terminal to be used at any distance and across dimensions.
+gui.tooltips.ae2wct.MagnetDesc=A magnet that automagically inserts items into the AE network.
+gui.tooltips.ae2wct.MagnetDesc2=Right-click to set filter
+gui.tooltips.ae2wct.LinkStatus=Link Status
+gui.tooltips.ae2wct.Installed=Installed
+gui.tooltips.ae2wct.NotInstalled=Not Installed
+gui.tooltips.ae2wct.Active=Active
+gui.tooltips.ae2wct.Inactive=Inactive
+gui.tooltips.ae2wct.Status=Status
+gui.tooltips.ae2wct.EmptyTrash=Empty Trash
+gui.tooltips.ae2wct.EmptyTrashDesc=Delete contents of the Trash slot
+gui.tooltips.ae2wct.MagnetFilterTitle=Magnet Filter
+gui.tooltips.ae2wct.FilterMode=Filter Mode
+gui.tooltips.ae2wct.Whitelisting=Whitelisting
+gui.tooltips.ae2wct.Blacklisting=Blacklisting
+gui.tooltips.ae2wct.MagnetActiveDesc1=Extra items added to inventory
+gui.tooltips.ae2wct.MagnetActiveDesc2=Extra items left on ground
+gui.tooltips.ae2wct.Not=Not
+gui.tooltips.ae2wct.Using=Using
+gui.tooltips.ae2wct.Ignore=Ignore
+gui.tooltips.ae2wct.Ignoring=Ignoring
+gui.tooltips.ae2wct.NBTData=NBT Data
+gui.tooltips.ae2wct.MetaData=Meta Data
+gui.tooltips.ae2wct.OreDict=Ore Dictionary
+gui.tooltips.ae2wct.FilteredItems=Filtered Items
+gui.tooltips.ae2wct.OrPress=or press
+gui.tooltips.ae2wct.Press=Press
+gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode
+
+//Labels
+gui.labels.ae2wct.WirelessTermLabel=Wireless Term
+
+//Config Descriptions
+config.ae2wct.MaxPowerDesc=Maximum Power in AE units the wireless terminal can hold
+config.ae2wct.InfinityBoosterCfgDesc=Enable Infinite Range Booster Upgrade
+config.ae2wct.EasyModeDesc=Enable Easy Mode (Easier Recipes+Infinity Booster Recipe)
+config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop)
+config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled)
+config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes)
+config.ae2wct.DoVersionCheck=Check for updates
+config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"]
+
+//Achievements
+achievement.wctAchievement=Digital Crafting Over WiFi
+achievement.wctAchievement.desc=Craft a Wireless Crafting Terminal
+achievement.boosterAchievement=Interdimensional Crafting Sack
+achievement.boosterAchievement.desc=Aquire an Infinity Booster Card
+achievement.magnetAchievement=Digital Hoover
+achievement.magnetAchievement.desc=Craft a Magnet Card
+
+//Chat Messages
+chatmessages.ae2wct.NoNetworkPower=Network has no power!
+chatmessages.ae2wct.MagnetMode1=Magnet Card Deactivated
+chatmessages.ae2wct.MagnetMode2=Magnet Card Activated - Items not stored in AE network will be placed in inventory
+chatmessages.ae2wct.MagnetMode3=Magnet Card Activated - Items not stored in AE network will be left on ground
+chatmessages.ae2wct.InitializeMagnet=You must first right-click with the Magnet Card in hand before using the keybind!
+
+//Keybindings
+key.OpenTerminal=Open Wireless Crafting Terminal
+key.OpenMagnetFilter=Open Magnet Card Filter GUI
+key.SwitchMagnetMode=Activate/Deactivate Magnet Card
+key.categories.ae2wct=Wireless Crafting Terminal
\ No newline at end of file
diff --git a/bin/assets/ae2wct/lang/en_US.lang b/bin/assets/ae2wct/lang/en_US.lang
new file mode 100644
index 0000000..a79d102
--- /dev/null
+++ b/bin/assets/ae2wct/lang/en_US.lang
@@ -0,0 +1,77 @@
+//**************************//
+//WIRELESS CRAFTING TEMRINAL//
+//**************************//
+
+//Items
+item.wirelessCraftingTerminal.name=Wireless Crafting Terminal
+item.infinityBoosterCard.name=Infinity Booster Card
+item.magnetCard.name=Magnet Card
+itemGroup.ae2wct=§9AE2 Wireless Crafting Terminal
+
+//Tooltips
+gui.tooltips.ae2wct.PressShift=Hold Shift for Info
+gui.tooltips.ae2wct.OnlyWorks=Only works when in Wireless Crafting Terminal slot!
+gui.tooltips.ae2wct.TitleDesc=Description
+gui.tooltips.ae2wct.InfinityBoosterDesc=Allows a linked AE2 Wireless Crafting Terminal to be used at any distance and across dimensions.
+gui.tooltips.ae2wct.MagnetDesc=A magnet that automagically inserts items into the AE network.
+gui.tooltips.ae2wct.MagnetDesc2=Right-click to set filter
+gui.tooltips.ae2wct.LinkStatus=Link Status
+gui.tooltips.ae2wct.Installed=Installed
+gui.tooltips.ae2wct.NotInstalled=Not Installed
+gui.tooltips.ae2wct.Active=Active
+gui.tooltips.ae2wct.Inactive=Inactive
+gui.tooltips.ae2wct.Status=Status
+gui.tooltips.ae2wct.EmptyTrash=Empty Trash
+gui.tooltips.ae2wct.EmptyTrashDesc=Delete contents of the Trash slot
+gui.tooltips.ae2wct.MagnetFilterTitle=Magnet Filter
+gui.tooltips.ae2wct.FilterMode=Filter Mode
+gui.tooltips.ae2wct.Whitelisting=Whitelisting
+gui.tooltips.ae2wct.Blacklisting=Blacklisting
+gui.tooltips.ae2wct.MagnetActiveDesc1=Extra items added to inventory
+gui.tooltips.ae2wct.MagnetActiveDesc2=Extra items left on ground
+gui.tooltips.ae2wct.Not=Not
+gui.tooltips.ae2wct.Using=Using
+gui.tooltips.ae2wct.Ignore=Ignore
+gui.tooltips.ae2wct.Ignoring=Ignoring
+gui.tooltips.ae2wct.NBTData=NBT Data
+gui.tooltips.ae2wct.MetaData=Meta Data
+gui.tooltips.ae2wct.OreDict=Ore Dictionary
+gui.tooltips.ae2wct.FilteredItems=Filtered Items
+gui.tooltips.ae2wct.OrPress=or press
+gui.tooltips.ae2wct.Press=Press
+gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode
+
+//Labels
+gui.labels.ae2wct.WirelessTermLabel=Wireless Term
+
+//Config Descriptions
+config.ae2wct.MaxPowerDesc=Maximum Power in AE units the wireless terminal can hold
+config.ae2wct.InfinityBoosterCfgDesc=Enable Infinite Range Booster Upgrade
+config.ae2wct.EasyModeDesc=Enable Easy Mode (Easier Recipes+Infinity Booster Recipe)
+config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop)
+config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled)
+config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes)
+config.ae2wct.DoVersionCheck=Check for updates
+config.ae2wct.NewVersionAvailable=New version of Wireless Crafting Terminal is available!
+config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"]
+
+//Achievements
+achievement.wctAchievement=Digital Crafting Over WiFi
+achievement.wctAchievement.desc=Craft a Wireless Crafting Terminal
+achievement.boosterAchievement=Interdimensional Crafting Sack
+achievement.boosterAchievement.desc=Aquire an Infinity Booster Card
+achievement.magnetAchievement=Digital Hoover
+achievement.magnetAchievement.desc=Craft a Magnet Card
+
+//Chat Messages
+chatmessages.ae2wct.NoNetworkPower=Network has no power!
+chatmessages.ae2wct.MagnetMode1=Magnet Card Deactivated
+chatmessages.ae2wct.MagnetMode2=Magnet Card Activated - Items not stored in AE network will be placed in inventory
+chatmessages.ae2wct.MagnetMode3=Magnet Card Activated - Items not stored in AE network will be left on ground
+chatmessages.ae2wct.InitializeMagnet=You must first right-click with the Magnet Card in hand before using the keybind!
+
+//Keybindings
+key.OpenTerminal=Open Wireless Crafting Terminal
+key.OpenMagnetFilter=Open Magnet Card Filter GUI
+key.SwitchMagnetMode=Activate/Deactivate Magnet Card
+key.categories.ae2wct=Wireless Crafting Terminal
\ No newline at end of file
diff --git a/bin/assets/ae2wct/lang/es_ES.lang b/bin/assets/ae2wct/lang/es_ES.lang
new file mode 100644
index 0000000..c4c0168
--- /dev/null
+++ b/bin/assets/ae2wct/lang/es_ES.lang
@@ -0,0 +1,75 @@
+//**************************//
+//WIRELESS CRAFTING TEMRINAL//
+//**************************//
+
+//Items
+item.wirelessCraftingTerminal.name=Terminal Inal?mbrico de Fabricaci?n
+item.infinityBoosterCard.name=Tarjeta de Acelerador de Infinito
+item.magnetCard.name=Tarjeta de im?n
+itemGroup.ae2wct=§9AE2 Terminal Inal?mbrico de Fabricaci?n
+
+//Tooltips
+gui.tooltips.ae2wct.PressShift=Presionada la Tecla May?s para Informaci?n
+gui.tooltips.ae2wct.OnlyWorks=S?lo funciona cuando en la ranura de la Terminal de trabajo inal?mbrica!
+gui.tooltips.ae2wct.TitleDesc=la Descripci?n
+gui.tooltips.ae2wct.InfinityBoosterDesc=Permite un vinculado AE2 elaboraci?n Terminal inal?mbrica ser utilizado en cualquier distancia y a trav?s de dimensiones.
+gui.tooltips.ae2wct.MagnetDesc=Un im?n que autom?ticamente inserta elementos en la red AE.
+gui.tooltips.ae2wct.MagnetDesc2=Haga clic en establecer filtro
+gui.tooltips.ae2wct.LinkStatus=El estado de enlace
+gui.tooltips.ae2wct.Installed=Instalar
+gui.tooltips.ae2wct.NotInstalled=Instalado
+gui.tooltips.ae2wct.Active=Activo
+gui.tooltips.ae2wct.Inactive=Inactivo
+gui.tooltips.ae2wct.Status=Condici?n
+gui.tooltips.ae2wct.EmptyTrash=Vaciar Papelera
+gui.tooltips.ae2wct.EmptyTrashDesc=Elimine el contenido de la papelera de la ranura
+gui.tooltips.ae2wct.MagnetFilterTitle=Filtro de im?n
+gui.tooltips.ae2wct.FilterMode=Modo de filtro
+gui.tooltips.ae2wct.Whitelisting=Lista Blanca
+gui.tooltips.ae2wct.Blacklisting=Lista Negra
+gui.tooltips.ae2wct.MagnetActiveDesc1=Art?culos extra a?adidos en el inventario
+gui.tooltips.ae2wct.MagnetActiveDesc2=Art?culos adicionales dejados en suelo
+gui.tooltips.ae2wct.Not=Not
+gui.tooltips.ae2wct.Using=Using
+gui.tooltips.ae2wct.Ignore=Ignore
+gui.tooltips.ae2wct.Ignoring=Ignoring
+gui.tooltips.ae2wct.NBTData=NBT Data
+gui.tooltips.ae2wct.MetaData=Meta Data
+gui.tooltips.ae2wct.OreDict=Ore Dictionary
+gui.tooltips.ae2wct.FilteredItems=Filtered Items
+gui.tooltips.ae2wct.OrPress=or press
+gui.tooltips.ae2wct.Press=Press
+gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode
+
+//Labels
+gui.labels.ae2wct.WirelessTermLabel=T?rmino Inal?mbrico
+
+//Config Descriptions
+config.ae2wct.MaxPowerDesc=Potencia m?xima en unidades AE que puede sostener el terminal inal?mbrico
+config.ae2wct.InfinityBoosterCfgDesc=Activar infinita gama Booster mejora
+config.ae2wct.EasyModeDesc=Activar el modo f?cil (Recetas m?s f?ciles y Infinity Booster receta)
+config.ae2wct.BoosterDropChance=Oportunidad que marchitar caer? infinito Booster tarjeta (en %-100 = caer siempre)
+config.ae2wct.DisableBoosterDrop=Activado Booster Card cae en modo dif?cil (true=permitir)
+config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes)
+config.ae2wct.DoVersionCheck=Check for updates
+config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"]
+
+//Achievements
+achievement.wctAchievement=Digital elaboraci?n sobre WLAN
+achievement.wctAchievement.desc=Un Wireless Terminal de elaboraci?n del arte
+achievement.boosterAchievement=Saco de fabricaci?n interdimensional
+achievement.boosterAchievement.desc=Adquirir una tarjeta de acelerador de infinito
+achievement.magnetAchievement=Aspiradora digital
+achievement.magnetAchievement.desc=Elaborar una tarjeta de im?n
+
+//Chat Messages
+chatmessages.ae2wct.NoNetworkPower=Red no tiene poder!
+chatmessages.ae2wct.MagnetMode1=Imanes tarjeta desactivada
+chatmessages.ae2wct.MagnetMode2=Tarjeta im?n activado - Art?culos no almacenados en red AE se colocar? en el inventario
+chatmessages.ae2wct.MagnetMode3=Tarjeta im?n activado - Art?culos no almacenados en red AE se quedar?n en la tierra
+
+//Keybindings
+key.OpenTerminal=Abierto Terminal Inal?mbrico de Fabricaci?n
+key.OpenMagnetFilter=Filtro tarjeta de im?n abierto GUI
+key.SwitchMagnetMode=Activar/desactivar tarjeta im?n
+key.categories.ae2wct=Terminal Inal?mbrico de Fabricaci?n
\ No newline at end of file
diff --git a/bin/assets/ae2wct/textures/allyourbase.png b/bin/assets/ae2wct/textures/allyourbase.png
new file mode 100644
index 0000000..3ff1990
Binary files /dev/null and b/bin/assets/ae2wct/textures/allyourbase.png differ
diff --git a/bin/assets/ae2wct/textures/cape/p455cape.png b/bin/assets/ae2wct/textures/cape/p455cape.png
new file mode 100644
index 0000000..e4dafc3
Binary files /dev/null and b/bin/assets/ae2wct/textures/cape/p455cape.png differ
diff --git a/bin/assets/ae2wct/textures/gui/crafting.png b/bin/assets/ae2wct/textures/gui/crafting.png
new file mode 100644
index 0000000..e1dd789
Binary files /dev/null and b/bin/assets/ae2wct/textures/gui/crafting.png differ
diff --git a/bin/assets/ae2wct/textures/gui/crafting_old.png b/bin/assets/ae2wct/textures/gui/crafting_old.png
new file mode 100644
index 0000000..4c9c78c
Binary files /dev/null and b/bin/assets/ae2wct/textures/gui/crafting_old.png differ
diff --git a/bin/assets/ae2wct/textures/gui/magnetfilter.png b/bin/assets/ae2wct/textures/gui/magnetfilter.png
new file mode 100644
index 0000000..7312b62
Binary files /dev/null and b/bin/assets/ae2wct/textures/gui/magnetfilter.png differ
diff --git a/bin/assets/ae2wct/textures/gui/magnetfilter_old.png b/bin/assets/ae2wct/textures/gui/magnetfilter_old.png
new file mode 100644
index 0000000..978c164
Binary files /dev/null and b/bin/assets/ae2wct/textures/gui/magnetfilter_old.png differ
diff --git a/bin/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png b/bin/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png
new file mode 100644
index 0000000..1d4f199
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png differ
diff --git a/bin/assets/ae2wct/textures/items/boosterBG.png b/bin/assets/ae2wct/textures/items/boosterBG.png
new file mode 100644
index 0000000..83a8925
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/boosterBG.png differ
diff --git a/bin/assets/ae2wct/textures/items/boosterBG_old.png b/bin/assets/ae2wct/textures/items/boosterBG_old.png
new file mode 100644
index 0000000..d1d04a0
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/boosterBG_old.png differ
diff --git a/bin/assets/ae2wct/textures/items/infinityBoosterCard.png b/bin/assets/ae2wct/textures/items/infinityBoosterCard.png
new file mode 100644
index 0000000..2523795
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/infinityBoosterCard.png differ
diff --git a/bin/assets/ae2wct/textures/items/magnet.png b/bin/assets/ae2wct/textures/items/magnet.png
new file mode 100644
index 0000000..d6e9dc2
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/magnet.png differ
diff --git a/bin/assets/ae2wct/textures/items/magnetBG.png b/bin/assets/ae2wct/textures/items/magnetBG.png
new file mode 100644
index 0000000..57fe403
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/magnetBG.png differ
diff --git a/bin/assets/ae2wct/textures/items/magnetCard.png b/bin/assets/ae2wct/textures/items/magnetCard.png
new file mode 100644
index 0000000..221f149
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/magnetCard.png differ
diff --git a/bin/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png b/bin/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png
new file mode 100644
index 0000000..f6ede57
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png differ
diff --git a/bin/assets/ae2wct/textures/items/wirelessCraftingTerminal.png b/bin/assets/ae2wct/textures/items/wirelessCraftingTerminal.png
new file mode 100644
index 0000000..cfb7a72
Binary files /dev/null and b/bin/assets/ae2wct/textures/items/wirelessCraftingTerminal.png differ
diff --git a/bin/mcmod.info b/bin/mcmod.info
new file mode 100644
index 0000000..b25fac6
--- /dev/null
+++ b/bin/mcmod.info
@@ -0,0 +1,16 @@
+[
+{
+ "modid": "ae2wct",
+ "name": "AE2 Wireless Crafting Terminal",
+ "description": "Adds a wireless version of the AE2 Crafting Terminal",
+ "version": "${version}",
+ "mcversion": "${mcversion}",
+ "url": "http://p455w0rd.net/",
+ "updateUrl": "",
+ "authorList": ["TheRealp455w0rd"],
+ "credits": "TheRealp455w0rd",
+ "logoFile": "",
+ "screenshots": [],
+ "dependencies": ["Applied Energistics 2"]
+}
+]
diff --git a/bin/pack.mcmeta b/bin/pack.mcmeta
new file mode 100644
index 0000000..53220b6
--- /dev/null
+++ b/bin/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+ "pack": {
+ "pack_format": 1,
+ "description": "Resources used for AE2 Wireless Crafting Terminal"
+ }
+}
diff --git a/build.gradle b/build.gradle
index 56b9172..98a7b8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,10 +8,6 @@ buildscript {
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
- }
- maven {
- name "ChickenBones"
- url "http://chickenbones.net/maven/"
}
}
dependencies {
@@ -61,10 +57,18 @@ artifacts {
archives jar
}
+repositories {
+ maven {
+ name "ChickenBones"
+ url "http://chickenbones.net/maven/"
+ }
+}
+
dependencies {
compile("appeng:appliedenergistics2:rv3-beta-5:dev") {
transitive = false
}
+ compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
}
sourceSets {
diff --git a/src/java/cofh/api/CoFHAPIProps.java b/src/java/cofh/api/CoFHAPIProps.java
deleted file mode 100644
index 9b52830..0000000
--- a/src/java/cofh/api/CoFHAPIProps.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cofh.api;
-
-public class CoFHAPIProps {
-
- private CoFHAPIProps() {
-
- }
-
- public static final String VERSION = "1.7.10R1.0.2";
-
-}
diff --git a/src/java/cofh/api/energy/EnergyStorage.java b/src/java/cofh/api/energy/EnergyStorage.java
deleted file mode 100644
index 1674c18..0000000
--- a/src/java/cofh/api/energy/EnergyStorage.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own.
- *
- * @author King Lemming
- *
- */
-public class EnergyStorage implements IEnergyStorage {
-
- protected int energy;
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public EnergyStorage(int capacity) {
-
- this(capacity, capacity, capacity);
- }
-
- public EnergyStorage(int capacity, int maxTransfer) {
-
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
-
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public EnergyStorage readFromNBT(NBTTagCompound nbt) {
-
- this.energy = nbt.getInteger("Energy");
-
- if (energy > capacity) {
- energy = capacity;
- }
- return this;
- }
-
- public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
-
- if (energy < 0) {
- energy = 0;
- }
- nbt.setInteger("Energy", energy);
- return nbt;
- }
-
- public void setCapacity(int capacity) {
-
- this.capacity = capacity;
-
- if (energy > capacity) {
- energy = capacity;
- }
- }
-
- public void setMaxTransfer(int maxTransfer) {
-
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- }
-
- public void setMaxReceive(int maxReceive) {
-
- this.maxReceive = maxReceive;
- }
-
- public void setMaxExtract(int maxExtract) {
-
- this.maxExtract = maxExtract;
- }
-
- public int getMaxReceive() {
-
- return maxReceive;
- }
-
- public int getMaxExtract() {
-
- return maxExtract;
- }
-
- /**
- * This function is included to allow for server -> client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers
- * are guaranteed to have it.
- *
- * @param energy
- */
- public void setEnergyStored(int energy) {
-
- this.energy = energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /**
- * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this
- * externally, as not all IEnergyHandlers are guaranteed to have it.
- *
- * @param energy
- */
- public void modifyEnergyStored(int energy) {
-
- this.energy += energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /* IEnergyStorage */
- @Override
- public int receiveEnergy(int maxReceive, boolean simulate) {
-
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(int maxExtract, boolean simulate) {
-
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored() {
-
- return energy;
- }
-
- @Override
- public int getMaxEnergyStored() {
-
- return capacity;
- }
-
-}
diff --git a/src/java/cofh/api/energy/IEnergyConnection.java b/src/java/cofh/api/energy/IEnergyConnection.java
deleted file mode 100644
index 79bdf77..0000000
--- a/src/java/cofh/api/energy/IEnergyConnection.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
- * accept it; otherwise just use IEnergyHandler.
- *
- * Note that {@link IEnergyHandler} is an extension of this.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyConnection {
-
- /**
- * Returns TRUE if the TileEntity can connect on a given side.
- */
- boolean canConnectEnergy(ForgeDirection from);
-
-}
diff --git a/src/java/cofh/api/energy/IEnergyContainerItem.java b/src/java/cofh/api/energy/IEnergyContainerItem.java
deleted file mode 100644
index 959427a..0000000
--- a/src/java/cofh/api/energy/IEnergyContainerItem.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cofh.api.energy;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-/**
- * Implement this interface on Item classes that support external manipulation of their internal energy storages.
- *
- * A reference implementation is provided {@link ItemEnergyContainer}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyContainerItem {
-
- /**
- * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
- *
- * @param container
- * ItemStack to be charged.
- * @param maxReceive
- * Maximum amount of energy to be sent into the item.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received by the item.
- */
- int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
-
- /**
- * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
- * discharged.
- *
- * @param container
- * ItemStack to be discharged.
- * @param maxExtract
- * Maximum amount of energy to be extracted from the item.
- * @param simulate
- * If TRUE, the discharge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
- */
- int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
-
- /**
- * Get the amount of energy currently stored in the container item.
- */
- int getEnergyStored(ItemStack container);
-
- /**
- * Get the max amount of energy that can be stored in the container item.
- */
- int getMaxEnergyStored(ItemStack container);
-
- void addInformation(ItemStack is, EntityPlayer player, List list, boolean displayMore);
-
-}
diff --git a/src/java/cofh/api/energy/IEnergyHandler.java b/src/java/cofh/api/energy/IEnergyHandler.java
deleted file mode 100644
index 22f2dbc..0000000
--- a/src/java/cofh/api/energy/IEnergyHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver {
-
- // merely a convenience interface (remove these methods in 1.8; provided here for back-compat via compiler doing things)
-
- /**
- * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
- *
- * @param from
- * Orientation the energy is received from.
- * @param maxReceive
- * Maximum amount of energy to receive.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received.
- */
- @Override
- int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
-
- /**
- * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
- *
- * @param from
- * Orientation the energy is extracted from.
- * @param maxExtract
- * Maximum amount of energy to extract.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted.
- */
- @Override
- int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
-
-
- /**
- * Returns the amount of energy currently stored.
- */
- @Override
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- @Override
- int getMaxEnergyStored(ForgeDirection from);
-
-}
diff --git a/src/java/cofh/api/energy/IEnergyProvider.java b/src/java/cofh/api/energy/IEnergyProvider.java
deleted file mode 100644
index 05287b3..0000000
--- a/src/java/cofh/api/energy/IEnergyProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyProvider extends IEnergyConnection {
-
- /**
- * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
- *
- * @param from
- * Orientation the energy is extracted from.
- * @param maxExtract
- * Maximum amount of energy to extract.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted.
- */
- int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored(ForgeDirection from);
-
-}
diff --git a/src/java/cofh/api/energy/IEnergyReceiver.java b/src/java/cofh/api/energy/IEnergyReceiver.java
deleted file mode 100644
index c726e09..0000000
--- a/src/java/cofh/api/energy/IEnergyReceiver.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyReceiver extends IEnergyConnection {
-
- /**
- * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
- *
- * @param from
- * Orientation the energy is received from.
- * @param maxReceive
- * Maximum amount of energy to receive.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received.
- */
- int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored(ForgeDirection from);
-
-}
diff --git a/src/java/cofh/api/energy/IEnergyStorage.java b/src/java/cofh/api/energy/IEnergyStorage.java
deleted file mode 100644
index bc20656..0000000
--- a/src/java/cofh/api/energy/IEnergyStorage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cofh.api.energy;
-
-/**
- * An energy storage is the unit of interaction with Energy inventories.
- * This is not to be implemented on TileEntities. This is for internal use only.
- *
- * A reference implementation can be found at {@link EnergyStorage}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyStorage {
-
- /**
- * Adds energy to the storage. Returns quantity of energy that was accepted.
- *
- * @param maxReceive
- * Maximum amount of energy to be inserted.
- * @param simulate
- * If TRUE, the insertion will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) accepted by the storage.
- */
- int receiveEnergy(int maxReceive, boolean simulate);
-
- /**
- * Removes energy from the storage. Returns quantity of energy that was removed.
- *
- * @param maxExtract
- * Maximum amount of energy to be extracted.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the storage.
- */
- int extractEnergy(int maxExtract, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored();
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored();
-
-}
diff --git a/src/java/cofh/api/energy/ItemEnergyContainer.java b/src/java/cofh/api/energy/ItemEnergyContainer.java
deleted file mode 100644
index 055ae45..0000000
--- a/src/java/cofh/api/energy/ItemEnergyContainer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own.
- *
- * @author King Lemming
- *
- */
-public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
-
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public ItemEnergyContainer() {
-
- }
-
- public ItemEnergyContainer(int capacity) {
-
- this(capacity, capacity, capacity);
- }
-
- public ItemEnergyContainer(int capacity, int maxTransfer) {
-
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
-
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public ItemEnergyContainer setCapacity(int capacity) {
-
- this.capacity = capacity;
- return this;
- }
-
- public void setMaxTransfer(int maxTransfer) {
-
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- }
-
- public void setMaxReceive(int maxReceive) {
-
- this.maxReceive = maxReceive;
- }
-
- public void setMaxExtract(int maxExtract) {
-
- this.maxExtract = maxExtract;
- }
-
- /* IEnergyContainerItem */
- @Override
- public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
-
- if (container.stackTagCompound == null) {
- container.stackTagCompound = new NBTTagCompound();
- }
- int energy = container.stackTagCompound.getInteger("Energy");
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- container.stackTagCompound.setInteger("Energy", energy);
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
-
- if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
- return 0;
- }
- int energy = container.stackTagCompound.getInteger("Energy");
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- container.stackTagCompound.setInteger("Energy", energy);
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored(ItemStack container) {
-
- if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
- return 0;
- }
- return container.stackTagCompound.getInteger("Energy");
- }
-
- @Override
- public int getMaxEnergyStored(ItemStack container) {
-
- return capacity;
- }
-
-}
diff --git a/src/java/cofh/api/energy/TileEnergyHandler.java b/src/java/cofh/api/energy/TileEnergyHandler.java
deleted file mode 100644
index 7cc655e..0000000
--- a/src/java/cofh/api/energy/TileEnergyHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your own.
- *
- * @author King Lemming
- *
- */
-public class TileEnergyHandler extends TileEntity implements IEnergyHandler {
-
- protected EnergyStorage storage = new EnergyStorage(32000);
-
- @Override
- public void readFromNBT(NBTTagCompound nbt) {
-
- super.readFromNBT(nbt);
- storage.readFromNBT(nbt);
- }
-
- @Override
- public void writeToNBT(NBTTagCompound nbt) {
-
- super.writeToNBT(nbt);
- storage.writeToNBT(nbt);
- }
-
- /* IEnergyConnection */
- @Override
- public boolean canConnectEnergy(ForgeDirection from) {
-
- return true;
- }
-
- /* IEnergyReceiver */
- @Override
- public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
-
- return storage.receiveEnergy(maxReceive, simulate);
- }
-
- /* IEnergyProvider */
- @Override
- public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
-
- return storage.extractEnergy(maxExtract, simulate);
- }
-
- /* IEnergyReceiver and IEnergyProvider */
- @Override
- public int getEnergyStored(ForgeDirection from) {
-
- return storage.getEnergyStored();
- }
-
- @Override
- public int getMaxEnergyStored(ForgeDirection from) {
-
- return storage.getMaxEnergyStored();
- }
-
-}
diff --git a/src/java/cofh/api/energy/package-info.java b/src/java/cofh/api/energy/package-info.java
deleted file mode 100644
index 7379702..0000000
--- a/src/java/cofh/api/energy/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub
- * http://www.teamcofh.com
- */
-@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy")
-package cofh.api.energy;
-
-import cofh.api.CoFHAPIProps;
-import cpw.mods.fml.common.API;
-
diff --git a/src/java/cofh/api/package-info.java b/src/java/cofh/api/package-info.java
deleted file mode 100644
index 08ff5fc..0000000
--- a/src/java/cofh/api/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub
- * http://www.teamcofh.com
- */
-@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI")
-package cofh.api;
-
-import cpw.mods.fml.common.API;
-
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java
index 07aa890..2876d2d 100644
--- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java
+++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java
@@ -26,13 +26,10 @@ import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum;
import net.p455w0rd.wirelesscraftingterminal.proxy.CommonProxy;
import net.p455w0rd.wirelesscraftingterminal.reference.Reference;
-@Mod(modid = Reference.MODID, acceptedMinecraftVersions = "[1.7.10]", name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY, dependencies = ""
- + "required-after:Forge@["
- + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
+@Mod(modid = Reference.MODID, acceptedMinecraftVersions = "[1.7.10]", name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY, dependencies = "" + "required-after:Forge@[" + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
- + net.minecraftforge.common.ForgeVersion.buildVersion + ",);"
- + "required-after:appliedenergistics2@[rv3-beta-1,);after:NotEnoughItems;")
+ + net.minecraftforge.common.ForgeVersion.buildVersion + ",);" + "required-after:appliedenergistics2@[rv3-beta-1,);required-after:p455w0rdslib;after:NotEnoughItems;")
public class WirelessCraftingTerminal {
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java
index 8f084b5..f33a88c 100644
--- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java
+++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java
@@ -26,6 +26,7 @@ import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.EntityXPOrb;
import net.minecraft.entity.player.EntityPlayer;
@@ -41,7 +42,6 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
import net.minecraftforge.oredict.OreDictionary;
import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler;
import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem;
-import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost;
import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource;
import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler;
import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils;
@@ -51,11 +51,12 @@ import net.p455w0rd.wirelesscraftingterminal.handlers.KeybindHandler;
import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler;
import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject;
import net.p455w0rd.wirelesscraftingterminal.reference.Reference;
+import p455w0rdslib.util.EntityItemUtils;
/**
* Jotato's amazing magnet item from QuantumFlux adapted for use in the Wireless
* Crafting Terminal
- *
+ *
* @author p455w0rd, Jotato
*
*/
@@ -74,7 +75,7 @@ public class ItemMagnet extends Item {
public ItemMagnet() {
super();
setMaxStackSize(1);
- this.distanceFromPlayer = 16;
+ distanceFromPlayer = 16;
canRepair = false;
setMaxDamage(0);
setTextureName(Reference.MODID + ":magnetCard");
@@ -87,7 +88,7 @@ public class ItemMagnet extends Item {
}
public void setItemStack(ItemStack is) {
- this.thisItemStack = is;
+ thisItemStack = is;
}
@Override
@@ -102,7 +103,6 @@ public class ItemMagnet extends Item {
return null;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack is, EntityPlayer player, List list, boolean par4) {
@@ -110,7 +110,7 @@ public class ItemMagnet extends Item {
String shift = LocaleHandler.PressShift.getLocal().replace("Shift", color("yellow") + color("bold") + color("italics") + "Shift" + color("gray"));
if (isShiftKeyDown()) {
ItemStack itemStack = getItemStack();
-
+
String info = LocaleHandler.MagnetDesc.getLocal();
for (String line : Splitter.on("\n").split(WordUtils.wrap(info, 37, "\n", false))) {
list.add(line.trim());
@@ -118,7 +118,7 @@ public class ItemMagnet extends Item {
list.add("");
list.add(color("italics") + "" + LocaleHandler.MagnetDesc2.getLocal());
-
+
if (isActivated(itemStack)) {
String boundKey = Keyboard.getKeyName(KeybindHandler.openMagnetFilter.getKeyCode());
if (!boundKey.equals("NONE")) {
@@ -148,13 +148,13 @@ public class ItemMagnet extends Item {
String nbtData = LocaleHandler.NBTData.getLocal();
String metaData = LocaleHandler.MetaData.getLocal();
String usingOreDict = LocaleHandler.Using.getLocal() + " " + LocaleHandler.OreDict.getLocal();
-
+
list.add((!doesMagnetUseOreDict() ? " " + not : color("green")) + " " + usingOreDict);
list.add((!doesMagnetIgnoreNBT() ? " " + not : color("green")) + " " + ignoring + " " + nbtData);
list.add((!doesMagnetIgnoreMeta() ? " " + not : color("green")) + " " + ignoring + " " + metaData);
List filteredItems = getFilteredItems(itemStack);
-
+
if (filteredItems != null) {
list.add("");
list.add(color("gray") + LocaleHandler.FilteredItems.getLocal() + ":");
@@ -162,7 +162,7 @@ public class ItemMagnet extends Item {
list.add(" " + filteredItems.get(i).getDisplayName());
}
}
-
+
list.add("");
String onlyWorks = LocaleHandler.OnlyWorks.getLocal();
for (String line : Splitter.on("\n").split(WordUtils.wrap(onlyWorks, 27, "\n", false))) {
@@ -220,7 +220,6 @@ public class ItemMagnet extends Item {
}
}
- @SuppressWarnings("rawtypes")
public void doMagnet(ItemStack item, World world, EntityPlayer player, ItemStack wirelessTerm) {
if (world.isRemote) {
return;
@@ -228,21 +227,29 @@ public class ItemMagnet extends Item {
if (getItemStack() == null) {
return;
}
- if (!isActivated(item))
+ if (!isActivated(item)) {
return;
- if (player == null)
+ }
+ if (player == null) {
return;
+ }
+ if (player.isSneaking()) {
+ return;
+ }
- List filteredList = getFilteredItems(this.getItemStack());
+ List filteredList = getFilteredItems(getItemStack());
// items
- Iterator iterator = getEntitiesInRange(EntityItem.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, this.distanceFromPlayer).iterator();
+ Iterator iterator = getEntitiesInRange(EntityItem.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, distanceFromPlayer).iterator();
while (iterator.hasNext()) {
EntityItem itemToGet = (EntityItem) iterator.next();
if (itemToGet == null) {
return;
}
- itemToGet.delayBeforeCanPickup = 75;
+ if (EntityItemUtils.getThrowerName(itemToGet) != null && EntityItemUtils.getThrowerName(itemToGet).equals(player.getCommandSenderName()) && !EntityItemUtils.canPickup(itemToGet)) {
+ continue;
+ }
+ //itemToGet.delayBeforeCanPickup = 75;
EntityItemPickupEvent pickupEvent = new EntityItemPickupEvent(player, itemToGet);
ItemPickupEvent itemPickupEvent = new ItemPickupEvent(player, itemToGet);
@@ -255,13 +262,13 @@ public class ItemMagnet extends Item {
MinecraftForge.EVENT_BUS.post(pickupEvent);
FMLCommonHandler.instance().bus().post(itemPickupEvent);
- if (this.obj == null) {
- this.obj = getGuiObject(wirelessTerm, player, world, (int) player.posX, (int) player.posY, (int) player.posZ);
- this.civ = (IPortableCell) this.obj;
- this.powerSrc = (IEnergySource) this.civ;
- this.monitor = civ.getItemInventory();
- this.cellInv = this.monitor;
- this.mySrc = new WCTPlayerSource(player, (WCTIActionHost) this.obj);
+ if (obj == null) {
+ obj = getGuiObject(wirelessTerm, player, world, (int) player.posX, (int) player.posY, (int) player.posZ);
+ civ = obj;
+ powerSrc = civ;
+ monitor = civ.getItemInventory();
+ cellInv = monitor;
+ mySrc = new WCTPlayerSource(player, obj);
}
boolean ignoreRange = (isBoosterInstalled(wirelessTerm) && Reference.WCT_BOOSTER_ENABLED);
@@ -272,7 +279,7 @@ public class ItemMagnet extends Item {
if (!itemToGet.isDead) {
// whitelist
- if (getMode(this.getItemStack())) {
+ if (getMode(getItemStack())) {
if (isItemFiltered(itemStackToGet, filteredList) && filteredList != null && filteredList.size() > 0) {
itemToGet.setDead();
doInject(ais, stackSize, player, itemToGet, itemStackToGet, world);
@@ -318,7 +325,7 @@ public class ItemMagnet extends Item {
}
// xp
- iterator = getEntitiesInRange(EntityXPOrb.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, this.distanceFromPlayer).iterator();
+ iterator = getEntitiesInRange(EntityXPOrb.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, distanceFromPlayer).iterator();
while (iterator.hasNext()) {
EntityXPOrb xpToGet = (EntityXPOrb) iterator.next();
if (xpToGet.isDead || xpToGet.isInvisible()) {
@@ -349,23 +356,23 @@ public class ItemMagnet extends Item {
}
private boolean doesMagnetIgnoreNBT() {
- return RandomUtils.readBoolean(this.getItemStack(), "IgnoreNBT");
+ return RandomUtils.readBoolean(getItemStack(), "IgnoreNBT");
}
private boolean doesMagnetIgnoreMeta() {
- return RandomUtils.readBoolean(this.getItemStack(), "IgnoreMeta");
+ return RandomUtils.readBoolean(getItemStack(), "IgnoreMeta");
}
private boolean doesMagnetUseOreDict() {
- return RandomUtils.readBoolean(this.getItemStack(), "UseOreDict");
+ return RandomUtils.readBoolean(getItemStack(), "UseOreDict");
}
private boolean areOresEqual(ItemStack is1, ItemStack is2) {
int[] list1 = OreDictionary.getOreIDs(is1);
int[] list2 = OreDictionary.getOreIDs(is2);
- for (int i = 0; i < list1.length; i++) {
- for (int j = 0; j < list2.length; j++) {
- if (list1[i] == list2[j]) {
+ for (int element : list1) {
+ for (int element2 : list2) {
+ if (element == element2) {
return true;
}
}
@@ -376,7 +383,7 @@ public class ItemMagnet extends Item {
private boolean isItemFiltered(ItemStack is, List itemList) {
if (is != null && itemList != null) {
for (int i = 0; i < itemList.size(); i++) {
- ItemStack thisStack = (ItemStack) itemList.get(i);
+ ItemStack thisStack = itemList.get(i);
//use oredict
if (doesMagnetUseOreDict()) {
if (areOresEqual(is, thisStack)) {
@@ -421,7 +428,7 @@ public class ItemMagnet extends Item {
if (player.capabilities.isCreativeMode) {
return true;
}
- final IGrid g = this.obj.getTargetGrid();
+ final IGrid g = obj.getTargetGrid();
if (g != null) {
if (requirePower) {
final IEnergyGrid eg = g.getCache(IEnergyGrid.class);
@@ -462,7 +469,7 @@ public class ItemMagnet extends Item {
}
private void doInject(IAEItemStack ais, int stackSize, EntityPlayer player, EntityItem itemToGet, ItemStack itemStackToGet, World world) {
- ais = Platform.poweredInsert(this.powerSrc, this.cellInv, ais, this.mySrc);
+ ais = Platform.poweredInsert(powerSrc, cellInv, ais, mySrc);
if (ais != null) {
player.onItemPickup(itemToGet, stackSize);
player.inventory.addItemStackToInventory(itemStackToGet);
@@ -526,8 +533,9 @@ public class ItemMagnet extends Item {
}
protected boolean isActivated(ItemStack item) {
- if (item == null)
+ if (item == null) {
return false;
+ }
return item.getItemDamage() != 0;
}