v1.3.9 [ 1.20.2 ]

changelog: see changelog.md

.github/workflows/build.yml

@@ -4,7 +4,7 @@
 # certain platforms or Java versions, and provides a first line of defence
 # against bad commits.
 
-run-name: "v1.3.8 - 1.20.2"
+run-name: "v1.3.9 - 1.20.2"
 
 name: build
 on: [ push, pull_request, workflow_dispatch ]

.github/workflows/publish.yml

@@ -4,13 +4,13 @@
 # certain platforms or Java versions, and provides a first line of defence
 # against bad commits.
 
-run-name: "release: v1.3.8 - 1.20.2"
+run-name: "release: v1.3.9 - 1.20.2"
 
 name: publish
 on: workflow_dispatch
 
 env:
-  VERSION: 1.3.8
+  VERSION: 1.3.9
   MC_VERSION: "1.20.2"
   MC_VERSION_RANGE: |
     1.20

changelog.md

@@ -1,8 +1,9 @@
-# v1.3.8 [ 1.20.2 ]
+# v1.3.9 [ 1.20.2 ]
 
 ## General
 
-- Added the forgotten Copper Blocks
+- Fix Copper Blocks textures (fixes #38)
+- Add Bone Block
 - Compatible with: `[ 1.20, 1.20.1, 1.20.2 ]`
 
 ---

common/src/main/java/net/sashiro/compressedblocks/block/CompressedBlock.java

@@ -204,19 +204,4 @@ public void appendHoverText(@NotNull ItemStack is, @Nullable BlockGetter bg, @No
             lC.add(Component.literal(compressor.getBlockCount() + " Blocks").withStyle(compressor.getStyle()));
         }
     }
-
-    public static class CustomWeatheringCopperBlock extends WeatheringCopperFullBlock {
-        private final Compression compressor = new Compression();
-
-        public CustomWeatheringCopperBlock(WeatherState weatherState, Properties properties, int compressionLevel) {
-            super(weatherState, properties);
-            compressor.setCompressionLevel(compressionLevel);
-        }
-
-        @Override
-        public void appendHoverText(@NotNull ItemStack is, @Nullable BlockGetter bg, @NotNull List<Component> lC, @NotNull TooltipFlag ttf) {
-            super.appendHoverText(is, bg, lC, ttf);
-            lC.add(Component.literal(compressor.getBlockCount() + " Blocks").withStyle(compressor.getStyle()));
-        }
-    }
 }

common/src/main/java/net/sashiro/compressedblocks/util/StringUtils.java

@@ -20,4 +20,17 @@ public static String stringFormat(String formatString) {
         }
         return stringFormat.toString().trim();
     }
+
+    /**
+     * Utility function to remove the index of compressed Items & Blocks
+     * @param name of the Item / Block.
+     * @return actual Block name.
+     */
+    public static String removeCompressionName(String name) {
+        for (int i = 0; i < 10; i++) {
+            if (name.contains("c" + i))
+                name = name.replace("c" + i + "_", "");
+        }
+        return name;
+    }
 }

common/src/main/resources/assets/compressedblocks/blockstates/c0_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c0_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c0_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c0_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c1_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c1_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c1_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c1_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c2_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c2_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c2_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c2_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c3_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c3_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c3_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c3_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c4_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c4_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c4_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c4_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c5_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c5_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c5_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c5_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c6_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c6_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c6_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c6_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c7_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c7_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c7_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c7_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c8_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c8_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c8_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c8_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/blockstates/c9_bone_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "compressedblocks:block/c9_bone_block_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "compressedblocks:block/c9_bone_block"
+    },
+    "axis=z": {
+      "model": "compressedblocks:block/c9_bone_block_horizontal",
+      "x": 90
+    }
+  }
+}

common/src/main/resources/assets/compressedblocks/models/block/c0_bone_block.json

@@ -0,0 +1,76 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "elements": [
+    {
+      "faces": {
+        "down": {
+          "texture": "#end"
+        },
+        "east": {
+          "texture": "#side"
+        },
+        "north": {
+          "texture": "#side"
+        },
+        "south": {
+          "texture": "#side"
+        },
+        "up": {
+          "texture": "#end"
+        },
+        "west": {
+          "texture": "#side"
+        }
+      },
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ]
+    },
+    {
+      "faces": {
+        "down": {
+          "texture": "#overlay"
+        },
+        "east": {
+          "texture": "#overlay"
+        },
+        "north": {
+          "texture": "#overlay"
+        },
+        "south": {
+          "texture": "#overlay"
+        },
+        "up": {
+          "texture": "#overlay"
+        },
+        "west": {
+          "texture": "#overlay"
+        }
+      },
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ]
+    }
+  ],
+  "render_type": "minecraft:translucent",
+  "textures": {
+    "end": "minecraft:block/bone_block_top",
+    "overlay": "compressedblocks:block/compression_level_0",
+    "particle": "minecraft:block/bone_block_side",
+    "side": "minecraft:block/bone_block_side"
+  }
+}