From 11a47838818d1fe2fb1ac99a47a1afe4be13dc12 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Thu, 2 Feb 2023 11:23:51 -0300 Subject: [PATCH] more textures --- .../tools/powered/ToolWirelessTerminal.java | 27 ++++++++++++++---- .../appliedenergistics2/lang/en_us.lang | 5 ++++ .../models/item/material_card_magnet.json | 6 ++++ .../item/wireless_crafting_terminal.json | 6 ++++ .../models/item/wireless_fluid_terminal.json | 6 ++++ .../item/wireless_pattern_terminal.json | 6 ++++ .../textures/items/material_card_magnet.png | Bin 0 -> 277 bytes .../items/wireless_crafting_terminal.png | Bin 0 -> 242 bytes .../items/wireless_fluid_terminal.png | Bin 0 -> 260 bytes .../items/wireless_pattern_terminal.png | Bin 0 -> 256 bytes 10 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_card_magnet.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/wireless_crafting_terminal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/wireless_fluid_terminal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/wireless_pattern_terminal.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/material_card_magnet.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/wireless_crafting_terminal.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/wireless_fluid_terminal.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/wireless_pattern_terminal.png 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 0000000000000000000000000000000000000000..ad95ae0158b349e3fce5a74aa4bf4c463442dfad GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU zNAoo(@UU#xcYOHo`P6BvT;{g)`an}INNS`Np9|#nbi^X zdfspA!W-rrJ7#9+-kTh8BtEI;c9TG)PMUb6t=NZG^~ZI;)Gk44ofy`glX=O&z`&C3 z=2h=8TI_S9@Dx9q6l{n0x zXm{ea$W8_kz66J@1`1D7O6)iSp0HX-Jd9&lo@$)XCFFdH`+sAQ56^$ef5uLqMFJR> p{JLN7#+J5X_QzB!AqHkQU|AsWG@{qB4R z95{|hcs%{j&zC!0j+neJv_uB;QWzdUY5&Rc*V=V&%1B0ilpUXO@geCxI1yt<- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..82719e0755961b9b3a1397edf18fcfa1b151049a GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUS9Amy12}?&Ey;%6>$M2(u u1i}{IC~N6!=$x(ogz3uj-0eCm>I|$|#GKFYFJWL{VDNPHb6Mw<&;$VaU{c`# literal 0 HcmV?d00001