Fixes (Pokecube-Development#875)

* Fixed the `forge:storage_blocks` tag * Fix recipes * Adjust structure gen * Structure Tweaks * Tweak structure * Swing hand when used
Unknown-Tokyo · Jan 24, 2022 · 56bcaea · 56bcaea
1 parent 37e064a
commit 56bcaea
Show file tree

Hide file tree

Showing 37 changed files with 97 additions and 76 deletions.
diff --git a/src/main/java/pokecube/adventures/items/Linker.java b/src/main/java/pokecube/adventures/items/Linker.java
@@ -71,6 +71,7 @@ public boolean setLinkedPos(final GlobalPos pos, final Entity user)
                         final Player player = (Player) user;
                         player.displayClientMessage(new TranslatableComponent("item.pokecube_adventures.linker.unset"),
                                 true);
+                        player.swing(player.getUsedItemHand());
                     }
                     else
                     {
@@ -90,6 +91,7 @@ public boolean setLinkedPos(final GlobalPos pos, final Entity user)
                         final Player player = (Player) user;
                         player.displayClientMessage(new TranslatableComponent("item.pokecube_adventures.linker.set"),
                                 true);
+                        player.swing(player.getUsedItemHand());
                     }
                     else
                     {
@@ -106,6 +108,7 @@ public boolean setLinkedPos(final GlobalPos pos, final Entity user)
                         final Player player = (Player) user;
                         player.displayClientMessage(new TranslatableComponent("item.pokecube_adventures.linker.set"),
                                 true);
+                        player.swing(player.getUsedItemHand());
                     }
                     else
                     {
@@ -152,6 +155,7 @@ else if (TrainerCaps.getHasPokemobs(target) != null)
                 ai.getPrimaryTask().setPos(pos.pos().above());
                 playerIn.displayClientMessage(new TranslatableComponent("item.pokecube_adventures.linked.mob",
                         target.getDisplayName(), bpos.getX(), bpos.getY(), bpos.getZ()), true);
+                playerIn.swing(playerIn.getUsedItemHand());
                 return true;
             }
             else playerIn.displayClientMessage(new TranslatableComponent("item.pokecube_adventures.linked.mob.fail"),

diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/main/resources/data/forge/tags/blocks/storage_blocks.json
@@ -1,12 +1,12 @@
 {
   "replace": false,
   "values": [
-    "#forge:storage_block/aquamarine",
-    "#forge:storage_block/cosmic_dust",
-    "#forge:storage_block/ruby",
-    "#forge:storage_block/sapphire",
-    "#forge:storage_block/spectrum",
-    "#forge:storage_block/fractal",
-    "#forge:storage_block/unrefined_aquamarine"
+    "#forge:storage_blocks/aquamarine",
+    "#forge:storage_blocks/cosmic",
+    "#forge:storage_blocks/fractal",
+    "#forge:storage_blocks/ruby",
+    "#forge:storage_blocks/sapphire",
+    "#forge:storage_blocks/spectrum",
+    "#forge:storage_blocks/unrefined_aquamarine"
   ]
 }
diff --git a/...gs/blocks/storage_blocks/cosmic_dust.json → ...ge/tags/blocks/storage_blocks/cosmic.json b/...gs/blocks/storage_blocks/cosmic_dust.json → ...ge/tags/blocks/storage_blocks/cosmic.json
diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/main/resources/data/forge/tags/items/storage_blocks.json
@@ -1,12 +1,12 @@
 {
   "replace": false,
   "values": [
-    "#forge:storage_block/aquamarine",
-    "#forge:storage_block/cosmic_dust",
-    "#forge:storage_block/ruby",
-    "#forge:storage_block/sapphire",
-    "#forge:storage_block/spectrum",
-    "#forge:storage_block/fractal",
-    "#forge:storage_block/unrefined_aquamarine"
+    "#forge:storage_blocks/aquamarine",
+    "#forge:storage_blocks/cosmic",
+    "#forge:storage_blocks/fractal",
+    "#forge:storage_blocks/ruby",
+    "#forge:storage_blocks/sapphire",
+    "#forge:storage_blocks/spectrum",
+    "#forge:storage_blocks/unrefined_aquamarine"
   ]
 }
diff --git a/...ags/items/storage_blocks/cosmic_dust.json → ...rge/tags/items/storage_blocks/cosmic.json b/...ags/items/storage_blocks/cosmic_dust.json → ...rge/tags/items/storage_blocks/cosmic.json
diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/crystal.json b/src/main/resources/data/forge/tags/items/storage_blocks/crystal.json
diff --git a/src/main/resources/data/pokecube/recipes/pc_base.json b/src/main/resources/data/pokecube/recipes/pc_base.json
@@ -11,7 +11,7 @@
       "tag": "forge:dusts/redstone"
     },
     "B": {
-      "tag": "forge:storage_block/iron"
+      "tag": "forge:storage_blocks/iron"
     },
     "I": {
       "tag": "forge:ingots/iron"

diff --git a/src/main/resources/data/pokecube/recipes/pc_top.json b/src/main/resources/data/pokecube/recipes/pc_top.json
@@ -11,7 +11,7 @@
       "tag": "forge:dusts/redstone"
     },
     "B": {
-      "tag": "forge:storage_block/iron"
+      "tag": "forge:storage_blocks/iron"
     },
     "G": {
       "tag": "forge:glass"

diff --git a/src/main/resources/data/pokecube/structures/village/deep/town_centers/center_1.nbt b/src/main/resources/data/pokecube/structures/village/deep/town_centers/center_1.nbt
diff --git a/src/main/resources/data/pokecube_adventures/recipes/afa.json b/src/main/resources/data/pokecube_adventures/recipes/afa.json
@@ -11,7 +11,7 @@
       "item": "pokecube:trade_machine"
     },
     "S": {
-      "tag": "forge:storage_block/iron"
+      "tag": "forge:storage_blocks/iron"
     },
     "I": {
       "tag": "forge:ingots/iron"

diff --git a/src/main/resources/data/pokecube_adventures/recipes/cloner.json b/src/main/resources/data/pokecube_adventures/recipes/cloner.json
@@ -14,7 +14,7 @@
       "item": "pokecube:trade_machine"
     },
     "G": {
-      "tag": "forge:storage_block/gold"
+      "tag": "forge:storage_blocks/gold"
     },
     "I": {
       "tag": "forge:ingots/gold"

diff --git a/src/main/resources/data/pokecube_adventures/recipes/commander.json b/src/main/resources/data/pokecube_adventures/recipes/commander.json
@@ -11,7 +11,7 @@
       "item": "pokecube:trade_machine"
     },
     "S": {
-      "tag": "forge:storage_block/iron"
+      "tag": "forge:storage_blocks/iron"
     },
     "I": {
       "tag": "forge:ingots/iron"

diff --git a/src/main/resources/data/pokecube_adventures/recipes/daycare.json b/src/main/resources/data/pokecube_adventures/recipes/daycare.json
@@ -11,7 +11,7 @@
       "item": "pokecube:trade_machine"
     },
     "S": {
-      "tag": "forge:storage_block/iron"
+      "tag": "forge:storage_blocks/iron"
     },
     "I": {
       "tag": "forge:ingots/iron"

diff --git a/src/main/resources/data/pokecube_adventures/recipes/extractor.json b/src/main/resources/data/pokecube_adventures/recipes/extractor.json
@@ -11,7 +11,7 @@
       "item": "pokecube:trade_machine"
     },
     "S": {
-      "tag": "forge:storage_block/diamond"
+      "tag": "forge:storage_blocks/diamond"
     },
     "I": {
       "tag": "forge:ingots/gold"

diff --git a/src/main/resources/data/pokecube_adventures/recipes/siphon.json b/src/main/resources/data/pokecube_adventures/recipes/siphon.json
@@ -12,7 +12,7 @@
       "data": 0
     },
     "B": {
-      "tag": "forge:storage_block/redstone"
+      "tag": "forge:storage_blocks/redstone"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_adventures/recipes/splicer.json b/src/main/resources/data/pokecube_adventures/recipes/splicer.json
@@ -11,7 +11,7 @@
       "item": "pokecube_adventures:cloner"
     },
     "S": {
-      "tag": "forge:storage_block/diamond"
+      "tag": "forge:storage_blocks/diamond"
     },
     "I": {
       "item": "minecraft:nether_star"

diff --git a/src/main/resources/data/pokecube_adventures/recipes/warp_pad.json b/src/main/resources/data/pokecube_adventures/recipes/warp_pad.json
@@ -11,7 +11,7 @@
       "item": "minecraft:ender_eye"
     },
     "I": {
-      "tag": "forge:storage_block/iron"
+      "tag": "forge:storage_blocks/iron"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_legends/recipes/blue_orb.json b/src/main/resources/data/pokecube_legends/recipes/blue_orb.json
@@ -13,7 +13,7 @@
       "item": "pokecube_legends:grayorb"
     },
     "R": {
-      "tag": "forge:storage_block/sapphire"
+      "tag": "forge:storage_blocks/sapphire"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_legends/recipes/green_orb.json b/src/main/resources/data/pokecube_legends/recipes/green_orb.json
@@ -13,7 +13,7 @@
       "item": "pokecube_legends:grayorb"
     },
     "R": {
-      "tag": "forge:storage_block/emerald"
+      "tag": "forge:storage_blocks/emerald"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/legendary_spawn.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/legendary_spawn.json
@@ -10,7 +10,7 @@
       "item": "pokecube_legends:legendaryorb"
     },
     "A": {
-      "tag": "forge:storage_block/gold"
+      "tag": "forge:storage_blocks/gold"
     },
     "H": {
       "item": "minecraft:nether_star"

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regice_core.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regice_core.json
@@ -7,10 +7,10 @@
   ],
   "key": {
     "R": {
-      "tag": "forge:storage_block/lapis"
+      "tag": "forge:storage_blocks/lapis"
     },
     "A": {
-      "tag": "forge:storage_block/redstone"
+      "tag": "forge:storage_blocks/redstone"
     },
     "C": {
       "item": "minecraft:packed_ice"

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regidrago_core.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regidrago_core.json
@@ -10,7 +10,7 @@
       "tag": "forge:obsidian"
     },
     "A": {
-      "tag": "forge:storage_block/ruby"
+      "tag": "forge:storage_blocks/ruby"
     },
     "C": {
       "item": "minecraft:magma_block"

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regieleki_core.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regieleki_core.json
@@ -7,13 +7,13 @@
   ],
   "key": {
     "R": {
-      "tag": "forge:storage_block/redstone"
+      "tag": "forge:storage_blocks/redstone"
     },
     "A": {
-      "tag": "forge:storage_block/ruby"
+      "tag": "forge:storage_blocks/ruby"
     },
     "S": {
-      "tag": "forge:storage_block/sapphire"
+      "tag": "forge:storage_blocks/sapphire"
     },
     "C": {
       "item": "minecraft:yellow_terracotta"

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regigigas_core.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regigigas_core.json
@@ -7,16 +7,16 @@
   ],
   "key": {
     "R": {
-      "tag": "forge:storage_block/emerald"
+      "tag": "forge:storage_blocks/emerald"
     },
     "A": {
-      "tag": "forge:storage_block/redstone"
+      "tag": "forge:storage_blocks/redstone"
     },
     "C": {
       "item": "minecraft:end_stone_bricks"
     },
     "G": {
-      "tag": "forge:storage_block/gold"
+      "tag": "forge:storage_blocks/gold"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regirock_core.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/regirock_core.json
@@ -10,10 +10,10 @@
       "item": "minecraft:terracotta"
     },
     "A": {
-      "tag": "forge:storage_block/redstone"
+      "tag": "forge:storage_blocks/redstone"
     },
     "R": {
-      "tag": "forge:storage_block/gold"
+      "tag": "forge:storage_blocks/gold"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/registeel_core.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/registeel_core.json
@@ -10,10 +10,10 @@
       "item": "minecraft:magma_block"
     },
     "A": {
-      "tag": "forge:storage_block/redstone"
+      "tag": "forge:storage_blocks/redstone"
     },
     "C": {
-      "tag": "forge:storage_block/iron"
+      "tag": "forge:storage_blocks/iron"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/trough_block.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/trough_block.json
@@ -8,7 +8,7 @@
   ],
   "key": {
     "0": {
-      "tag": "forge:storage_block/gold"
+      "tag": "forge:storage_blocks/gold"
     },
     "R": {
       "tag": "forge:ingots/gold"

diff --git a/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/victini_trophy.json b/src/main/resources/data/pokecube_legends/recipes/legends_spawn_blocks/victini_trophy.json
@@ -8,7 +8,7 @@
   ],
   "key": {
     "4": {
-      "tag": "forge:storage_block/gold"
+      "tag": "forge:storage_blocks/gold"
     },
     "2": {
       "item": "pokecube_legends:grayorb"

diff --git a/src/main/resources/data/pokecube_legends/recipes/pokecubes/beastcube.json b/src/main/resources/data/pokecube_legends/recipes/pokecubes/beastcube.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "G": {
-      "tag": "forge:storage_block/gold"
+      "tag": "forge:storage_blocks/gold"
     },
     "A": {
       "item": "minecraft:stone_button"

diff --git a/src/main/resources/data/pokecube_legends/recipes/red_orb.json b/src/main/resources/data/pokecube_legends/recipes/red_orb.json
@@ -13,7 +13,7 @@
       "item": "pokecube_legends:grayorb"
     },
     "R": {
-      "tag": "forge:storage_block/ruby"
+      "tag": "forge:storage_blocks/ruby"
     }
   },
   "result": {

diff --git a/src/main/resources/data/pokecube_legends/recipes/reveal_glass.json b/src/main/resources/data/pokecube_legends/recipes/reveal_glass.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "A": {
-      "tag": "forge:storage_block/crystal"
+      "tag": "forge:storage_blocks/aquamarine"
     },
     "Q": {
       "item": "pokecube_legends:blueorb"