Merge pull request #66 from WesterosCraft/1.18.2-pizza

1.18.2 pizza
WesterosCraft · Feb 2, 2024 · dd5fad0 · dd5fad0
2 parents 66c8c72 + deb28f0
commit dd5fad0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/copyFilesPizza.sh b/copyFilesPizza.sh
@@ -6,9 +6,9 @@ mkdir -p src/main/resources/assets/westerosblocks/models/item
 mkdir -p src/main/resources/assets/westerosblocks/blockstates
 mkdir -p src/main/resources/data/minecraft/tags/blocks
 mkdir -p src/main/resources/data/westerosblocks/tags/blocks
-cp ../forge-1.18.2/config/westerosblocks/assets/westerosblocks/lang/*.json ../WesterosBlocks/src/main/resources/assets/westerosblocks/lang
-cp ../forge-1.18.2/config/westerosblocks/assets/westerosblocks/blockstates/*.json ../WesterosBlocks/src/main/resources/assets/westerosblocks/blockstates
-cp -R ../forge-1.18.2/config/westerosblocks/assets/westerosblocks/models/block/generated/. ../WesterosBlocks/src/main/resources/assets/westerosblocks/models/block/generated
-cp ../forge-1.18.2/config/westerosblocks/assets/westerosblocks/models/item//*.json ../WesterosBlocks/src/main/resources/assets/westerosblocks/models/item
-cp ../forge-1.18.2/config/westerosblocks/data/minecraft/tags/blocks/*.json ../WesterosBlocks/src/main/resources/data/minecraft/tags/blocks
-cp ../forge-1.18.2/config/westerosblocks/data/westerosblocks/tags/blocks/*.json ../WesterosBlocks/src/main/resources/data/westerosblocks/tags/blocks
+cp ../wc-local-1.18.2/config/westerosblocks/assets/westerosblocks/lang/*.json ../WesterosBlocks/src/main/resources/assets/westerosblocks/lang
+cp ../wc-local-1.18.2/config/westerosblocks/assets/westerosblocks/blockstates/*.json ../WesterosBlocks/src/main/resources/assets/westerosblocks/blockstates
+cp -R ../wc-local-1.18.2/config/westerosblocks/assets/westerosblocks/models/block/generated/. ../WesterosBlocks/src/main/resources/assets/westerosblocks/models/block/generated
+cp ../wc-local-1.18.2/config/westerosblocks/assets/westerosblocks/models/item//*.json ../WesterosBlocks/src/main/resources/assets/westerosblocks/models/item
+cp ../wc-local-1.18.2/config/westerosblocks/data/minecraft/tags/blocks/*.json ../WesterosBlocks/src/main/resources/data/minecraft/tags/blocks
+cp ../wc-local-1.18.2/config/westerosblocks/data/westerosblocks/tags/blocks/*.json ../WesterosBlocks/src/main/resources/data/westerosblocks/tags/blocks
diff --git a/src/main/resources/WesterosBlocks.json b/src/main/resources/WesterosBlocks.json
@@ -498,7 +498,6 @@
         "minecraft:bell",
         "minecraft:lantern",
         "minecraft:sweet_berries",
-        "minecraft:campfire",
         "minecraft:bee_spawn_egg",
         "minecraft:bee_nest",
         "minecraft:beehive",

diff --git a/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v1.json b/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v1.json
@@ -1,6 +1,6 @@
 {
   "parent": "westerosblocks:block/tinted/cube_all",
   "textures": {
-    "all": "westerosblocks:block/cobblestone/mossy/all1"
+    "all": "westerosblocks:block/cobblestone/grey_mossy/all1"
   }
 }
diff --git a/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v2.json b/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v2.json
@@ -1,6 +1,6 @@
 {
   "parent": "westerosblocks:block/tinted/cube_all",
   "textures": {
-    "all": "westerosblocks:block/cobblestone/mossy/all2"
+    "all": "westerosblocks:block/cobblestone/grey_mossy/all2"
   }
 }
diff --git a/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v3.json b/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v3.json
@@ -1,6 +1,6 @@
 {
   "parent": "westerosblocks:block/tinted/cube_all",
   "textures": {
-    "all": "westerosblocks:block/cobblestone/mossy/all3"
+    "all": "westerosblocks:block/cobblestone/grey_mossy/all3"
   }
 }
diff --git a/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v4.json b/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v4.json
@@ -1,6 +1,6 @@
 {
   "parent": "westerosblocks:block/tinted/cube_all",
   "textures": {
-    "all": "westerosblocks:block/cobblestone/mossy/all4"
+    "all": "westerosblocks:block/cobblestone/grey_mossy/all4"
   }
 }
diff --git a/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v5.json b/src/main/resources/assets/westerosblocks/models/block/custom/mossy_cobblestone/base_v5.json
@@ -1,6 +1,6 @@
 {
   "parent": "westerosblocks:block/tinted/cube_all",
   "textures": {
-    "all": "westerosblocks:block/cobblestone/mossy/all5"
+    "all": "westerosblocks:block/cobblestone/grey_mossy/all5"
   }
 }