diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 669638f6d..8d12c604e 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -204,6 +204,19 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless new Vec3d(entityIn.posX - 5, entityIn.posY - 5, entityIn.posZ - 5))); boolean emptyFilter = true; for (EntityItem i : ei) { + if (i.isDead) { + continue; + } + + NBTTagCompound itemTag = i.getEntityData(); + if (itemTag.hasKey("PreventRemoteMovement")) { + continue; + } + + if (i.getThrower().equals(entityIn.getName()) && i.cannotPickup()) { + continue; + } + boolean matched = false; for (int ss = 0; ss < c.getSlots(); ss++) { ItemStack filter = c.getStackInSlot(ss); @@ -222,12 +235,11 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless } } if (emptyFilter) { - i.setPosition(entityIn.posX, entityIn.posY, entityIn.posZ); - } - if (matched && !inverted) { - i.setPosition(entityIn.posX, entityIn.posY, entityIn.posZ); + teleportItem(i,entityIn); + } else if (matched && !inverted) { + teleportItem(i,entityIn); } else if (!matched && inverted) { - i.setPosition(entityIn.posX, entityIn.posY, entityIn.posZ); + teleportItem(i,entityIn); } } } @@ -235,4 +247,9 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless } } } + + private void teleportItem(EntityItem i, Entity entityIn){ + i.motionX = i.motionY = i.motionZ = 0; + i.setPosition(entityIn.posX, entityIn.posY, entityIn.posZ); + } } diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang index ebebd4590..bd2527ddd 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang @@ -462,6 +462,8 @@ item.appliedenergistics2.material.blank_pattern.name=Blank Pattern item.appliedenergistics2.material.calculation_processor.name=Calculation Processor item.appliedenergistics2.material.card_capacity.name=Capacity Card item.appliedenergistics2.material.card_pattern_expansion.name=Pattern Expansion Card +item.appliedenergistics2.material.card_magnet.name=Magnet Card +item.appliedenergistics2.material.card_quantum_link.name=Quantum Link Card item.appliedenergistics2.material.card_fuzzy.name=Fuzzy Card item.appliedenergistics2.material.card_inverter.name=Inverter Card item.appliedenergistics2.material.card_redstone.name=Redstone Card @@ -586,6 +588,9 @@ item.appliedenergistics2.matter_cannon.name=Matter Cannon item.appliedenergistics2.memory_card.name=Memory Card item.appliedenergistics2.color_applicator.name=Color Applicator item.appliedenergistics2.wireless_terminal.name=Wireless Terminal +item.appliedenergistics2.wireless_crafting_terminal.name=Wireless Crafting Terminal +item.appliedenergistics2.wireless_pattern_terminal.name=Wireless Pattern Terminal +item.appliedenergistics2.wireless_fluid_terminal.name=Wireless Fluid Terminal item.appliedenergistics2.biometric_card.name=Biometric Card item.appliedenergistics2.debug_card.name=Dev.DebugCard diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_card_magnet.json b/src/main/resources/assets/appliedenergistics2/models/item/material_card_magnet.json new file mode 100644 index 000000000..cdc1d4b62 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_card_magnet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_card_magnet" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless_crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_crafting_terminal.json new file mode 100644 index 000000000..ebae5a8a6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless_crafting_terminal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/wireless_crafting_terminal" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless_fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_fluid_terminal.json new file mode 100644 index 000000000..d252e1501 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless_fluid_terminal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/wireless_fluid_terminal" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless_pattern_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_pattern_terminal.json new file mode 100644 index 000000000..2e2f2da2d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless_pattern_terminal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/wireless_pattern_terminal" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_card_magnet.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_magnet.png new file mode 100644 index 000000000..ad95ae015 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_magnet.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/wireless_crafting_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/items/wireless_crafting_terminal.png new file mode 100644 index 000000000..ec4c6096f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/items/wireless_crafting_terminal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/wireless_fluid_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/items/wireless_fluid_terminal.png new file mode 100644 index 000000000..28f34fa03 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/items/wireless_fluid_terminal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/wireless_pattern_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/items/wireless_pattern_terminal.png new file mode 100644 index 000000000..82719e075 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/items/wireless_pattern_terminal.png differ