forked from bdew-minecraft/ae2stuff
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding Advanced Wireless Setup Kit (#18)
* Added Advanced Wireless Setup Kit * Update adv wireless setup kit texture * Update adv wireless setup kit texture * Added NBT Clearing recipe for adv wireless setup kit * Added NBT clearing recipe for basic wireless kit and spotless * Fixed issue where playing on a server could cause a NoSuchMethodError * Added chat feedback for when mode is switched * Spotless * Added requested features from pull request review - Added constants to AdvWirelessKit.scala to define values for the modes - Added a constant to AdvItemLocationStore.scala to find the NBTTag type and use that in place of which was used previously - Added error logging to AdvWirelessKit.scala and ItemWirelessKit.scala for when a connection fails fatally - Switched else statements for mode to else if statements to explicitly check that the mode is the other mode * Added requested features from pull request review - Added constants to AdvWirelessKit.scala to define values for the modes - Added a constant to AdvItemLocationStore.scala to find the COMPOUND NBTTag type and use that in place of 10 which was used previously - Added error logging to AdvWirelessKit.scala and ItemWirelessKit.scala for when a connection fails fatally - Switched else statements for mode to else if statements to explicitly check that the mode is the other mode
- Loading branch information
1 parent
42ba2ce
commit bf19836
Showing
10 changed files
with
430 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,4 @@ | |
|
|
||
| plugins { | ||
| id 'com.gtnewhorizons.gtnhconvention' | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+325 Bytes
src/main/resources/assets/ae2stuff/textures/items/advwirelesskit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package net.bdew.ae2stuff | ||
|
|
||
| import cpw.mods.fml.common.registry.GameRegistry | ||
| import net.bdew.ae2stuff.items.{AdvWirelessKit, ItemWirelessKit} | ||
| import net.minecraft.item.ItemStack | ||
|
|
||
| object Recipes { | ||
| def load(): Unit = { | ||
| // add recipe to clear NBT from adv wireless kit | ||
| GameRegistry.addShapelessRecipe( | ||
| new ItemStack(AdvWirelessKit), | ||
| AdvWirelessKit | ||
| ) | ||
| GameRegistry.addShapelessRecipe( | ||
| new ItemStack(ItemWirelessKit), | ||
| ItemWirelessKit | ||
| ) | ||
| } | ||
| } |
256 changes: 256 additions & 0 deletions
256
src/main/scala/net/bdew/ae2stuff/items/AdvWirelessKit.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,256 @@ | ||
| /* | ||
| * Copyright (c) bdew, 2014 - 2015 | ||
| * https://github.com/bdew/ae2stuff | ||
| * | ||
| * This mod is distributed under the terms of the Minecraft Mod Public | ||
| * License 1.0, or MMPL. Please check the contents of the license located in | ||
| * http://bdew.net/minecraft-mod-public-license/ | ||
| */ | ||
|
|
||
| package net.bdew.ae2stuff.items | ||
|
|
||
| import appeng.api.config.SecurityPermissions | ||
| import appeng.api.exceptions.FailedConnection | ||
| import net.bdew.ae2stuff.grid.Security | ||
| import net.bdew.ae2stuff.machines.wireless.{BlockWireless, TileWireless} | ||
| import net.bdew.ae2stuff.misc.AdvItemLocationStore | ||
| import net.bdew.lib.Misc | ||
| import net.bdew.lib.block.BlockRef | ||
| import net.bdew.lib.items.SimpleItem | ||
| import net.minecraft.entity.EntityLivingBase | ||
| import net.minecraft.entity.player.EntityPlayer | ||
| import net.minecraft.item.ItemStack | ||
| import net.minecraft.world.World | ||
|
|
||
| import java.util | ||
|
|
||
| object AdvWirelessKit | ||
| extends SimpleItem("AdvWirelessKit") | ||
| with AdvItemLocationStore { | ||
| setMaxStackSize(1) | ||
|
|
||
| val MODE_QUEUING = 0; | ||
| val MODE_BINDING = 1; | ||
|
|
||
| def checkSecurity(t1: TileWireless, t2: TileWireless, p: EntityPlayer) = { | ||
| val pid = Security.getPlayerId(p) | ||
| Security.playerHasPermission( | ||
| t1.getNode.getGrid, | ||
| pid, | ||
| SecurityPermissions.BUILD | ||
| ) && | ||
| Security.playerHasPermission( | ||
| t2.getNode.getGrid, | ||
| pid, | ||
| SecurityPermissions.BUILD | ||
| ) | ||
| } | ||
|
|
||
| override def onItemRightClick( | ||
| stack: ItemStack, | ||
| world: World, | ||
| player: EntityPlayer | ||
| ): ItemStack = { | ||
| import net.bdew.lib.helpers.ChatHelper._ | ||
| if (!world.isRemote && player.isSneaking) { | ||
| toggleMode(stack) | ||
| if (getMode(stack) == MODE_QUEUING) { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.advtool.queueing.activated").setColor( | ||
| Color.GREEN | ||
| ) | ||
| ) | ||
| } else { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.advtool.binding.activated").setColor(Color.GREEN) | ||
| ) | ||
| } | ||
| } | ||
| stack | ||
| } | ||
|
|
||
| override def onItemUse( | ||
| stack: ItemStack, | ||
| player: EntityPlayer, | ||
| world: World, | ||
| x: Int, | ||
| y: Int, | ||
| z: Int, | ||
| side: Int, | ||
| xOff: Float, | ||
| yOff: Float, | ||
| zOff: Float | ||
| ): Boolean = { | ||
| import net.bdew.lib.helpers.ChatHelper._ | ||
| val pos = BlockRef(x, y, z) | ||
| if (!pos.blockIs(world, BlockWireless)) return false | ||
| if (!world.isRemote) { | ||
| if (player.isSneaking) { | ||
| toggleMode(stack) | ||
| if (getMode(stack) == MODE_QUEUING) { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.advtool.queueing.activated").setColor( | ||
| Color.GREEN | ||
| ) | ||
| ) | ||
| } else if (getMode(stack) == MODE_BINDING) { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.advtool.binding.activated").setColor( | ||
| Color.GREEN | ||
| ) | ||
| ) | ||
| } | ||
| return true; | ||
| } | ||
| pos.getTile[TileWireless](world) foreach { tile => | ||
| val pid = Security.getPlayerId(player) | ||
| // Check that the player can modify the network | ||
| if ( | ||
| !Security.playerHasPermission( | ||
| tile.getNode.getGrid, | ||
| pid, | ||
| SecurityPermissions.BUILD | ||
| ) | ||
| ) { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.tool.security.player").setColor(Color.RED) | ||
| ) | ||
| } else if (getMode(stack) == MODE_QUEUING) { | ||
| addLocation(stack, pos, world.provider.dimensionId) | ||
| player.addChatMessage( | ||
| L( | ||
| "ae2stuff.wireless.advtool.queued", | ||
| pos.x.toString, | ||
| pos.y.toString, | ||
| pos.z.toString | ||
| ).setColor(Color.GREEN) | ||
| ) | ||
| } else if (getMode(stack) == MODE_BINDING) { | ||
| if (hasLocation(stack)) { | ||
| // Have other location - start connecting | ||
| val otherPos = getNextLocation(stack) | ||
|
|
||
| if (getDimension(stack) != world.provider.dimensionId) { | ||
| // Different dimensions - error out | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.tool.dimension").setColor(Color.RED) | ||
| ) | ||
| } else if (pos == otherPos) { | ||
| // Same block - clear the location | ||
| popLocation(stack) | ||
| } else { | ||
| otherPos.getTile[TileWireless](world) match { | ||
| // Check that the other tile is still around | ||
| case Some(other: TileWireless) => | ||
| // And check that the player can modify it too | ||
| if ( | ||
| !Security.playerHasPermission( | ||
| other.getNode.getGrid, | ||
| pid, | ||
| SecurityPermissions.BUILD | ||
| ) | ||
| ) { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.tool.security.player").setColor( | ||
| Color.RED | ||
| ) | ||
| ) | ||
| } else { | ||
| // Player can modify both sides - unlink current connections if any | ||
| tile.doUnlink() | ||
| other.doUnlink() | ||
|
|
||
| // Make player the owner of both blocks | ||
| tile.getNode.setPlayerID(pid) | ||
| other.getNode.setPlayerID(pid) | ||
| try { | ||
| if (tile.doLink(other)) { | ||
| player.addChatMessage( | ||
| L( | ||
| "ae2stuff.wireless.tool.connected", | ||
| pos.x.toString, | ||
| pos.y.toString, | ||
| pos.z.toString | ||
| ).setColor(Color.GREEN) | ||
| ) | ||
| } else { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.tool.failed").setColor(Color.RED) | ||
| ) | ||
| } | ||
| } catch { | ||
| case e: FailedConnection => | ||
| player.addChatComponentMessage( | ||
| (L( | ||
| "ae2stuff.wireless.tool.failed" | ||
| ) & ": " & e.getMessage).setColor(Color.RED) | ||
| ) | ||
| tile.doUnlink() | ||
| print("Failed to link wireless connector: " + e) | ||
| } | ||
| } | ||
| popLocation(stack) | ||
| case _ => | ||
| // The other block is gone - error out | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.tool.noexist").setColor(Color.RED) | ||
| ) | ||
| popLocation(stack) | ||
| } | ||
| } | ||
| true | ||
| } else { | ||
| player.addChatMessage( | ||
| L("ae2stuff.wireless.advtool.noconnectors").setColor(Color.RED) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| true | ||
| } | ||
|
|
||
| override def addInformation( | ||
| stack: ItemStack, | ||
| player: EntityPlayer, | ||
| tips: util.List[_], | ||
| detailed: Boolean | ||
| ): Unit = { | ||
| val list = tips.asInstanceOf[util.List[String]] | ||
| if (getLocations(stack).tagCount() > 0) { | ||
| val next = getNextLocation(stack) | ||
| list.add( | ||
| Misc.toLocalF( | ||
| "ae2stuff.wireless.advtool.connector.next", | ||
| next.x, | ||
| next.y, | ||
| next.z | ||
| ) | ||
| ) | ||
| } | ||
| if (getMode(stack) == MODE_QUEUING) { | ||
| list.add(Misc.toLocal("ae2stuff.wireless.advtool.queueing")) | ||
| if (getLocations(stack).tagCount() == 0) { | ||
| list.add(Misc.toLocal("ae2stuff.wireless.advtool.queueing.empty")) | ||
| } else { | ||
| list.add(Misc.toLocal("ae2stuff.wireless.advtool.queueing.notempty")) | ||
| for (i <- 0 until getLocations(stack).tagCount()) { | ||
| val loc = BlockRef.fromNBT(getLocations(stack).getCompoundTagAt(i)) | ||
| list.add(loc.x + "," + loc.y + "," + loc.z) | ||
| } | ||
| } | ||
| } else if (getMode(stack) == MODE_BINDING) { | ||
| list.add(Misc.toLocal("ae2stuff.wireless.advtool.binding")) | ||
| if (getLocations(stack).tagCount() == 0) { | ||
| list.add(Misc.toLocal("ae2stuff.wireless.advtool.binding.empty")) | ||
| } else { | ||
| list.add(Misc.toLocal("ae2stuff.wireless.advtool.binding.notempty")) | ||
| for (i <- 0 until getLocations(stack).tagCount()) { | ||
| val loc = BlockRef.fromNBT(getLocations(stack).getCompoundTagAt(i)) | ||
| list.add(loc.x + "," + loc.y + "," + loc.z) | ||
| } | ||
| } | ||
| } | ||
| list.add(Misc.toLocal("ae2stuff.wireless.advtool.extra")); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.