diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 445c692c6..cff48e98d 100644 --- a/.github/workflows/build.yml +++ b/.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 ] diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0f03641c6..343abe96d 100644 --- a/.github/workflows/publish.yml +++ b/.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 diff --git a/changelog.md b/changelog.md index d736dd303..2944f68ec 100644 --- a/changelog.md +++ b/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 ]` --- diff --git a/common/src/main/java/net/sashiro/compressedblocks/block/BlockList.java b/common/src/main/java/net/sashiro/compressedblocks/block/BlockList.java index 6fc27d631..c725af208 100644 --- a/common/src/main/java/net/sashiro/compressedblocks/block/BlockList.java +++ b/common/src/main/java/net/sashiro/compressedblocks/block/BlockList.java @@ -1,7 +1,6 @@ package net.sashiro.compressedblocks.block; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.WeatheringCopper; import net.minecraft.world.level.block.state.BlockBehaviour; import net.sashiro.compressedblocks.block.CompressedBlock.*; @@ -829,179 +828,193 @@ public class BlockList { // Version: 1.3.8 // ================================================== // COPPER_BLOCK - public static final CustomWeatheringCopperBlock COPPER_BLOCK_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock COPPER_BLOCK_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock COPPER_BLOCK_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock COPPER_BLOCK_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock COPPER_BLOCK_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock COPPER_BLOCK_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock COPPER_BLOCK_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock COPPER_BLOCK_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock COPPER_BLOCK_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock COPPER_BLOCK_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock COPPER_BLOCK_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock COPPER_BLOCK_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 9); // CUT_COPPER - public static final CustomWeatheringCopperBlock CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // EXPOSED_COPPER - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock EXPOSED_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock EXPOSED_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock EXPOSED_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock EXPOSED_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock EXPOSED_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock EXPOSED_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock EXPOSED_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock EXPOSED_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock EXPOSED_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock EXPOSED_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock EXPOSED_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // EXPOSED_CUT_COPPER - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock EXPOSED_CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock EXPOSED_CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WEATHERED_COPPER - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WEATHERED_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WEATHERED_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WEATHERED_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WEATHERED_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WEATHERED_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WEATHERED_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WEATHERED_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WEATHERED_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WEATHERED_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WEATHERED_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WEATHERED_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WEATHERED_CUT_COPPER - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WEATHERED_CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WEATHERED_CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // OXIDIZED_COPPER - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock OXIDIZED_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock OXIDIZED_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock OXIDIZED_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock OXIDIZED_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock OXIDIZED_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock OXIDIZED_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock OXIDIZED_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock OXIDIZED_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock OXIDIZED_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock OXIDIZED_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock OXIDIZED_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // OXIDIZED_CUT_COPPER - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock OXIDIZED_CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock OXIDIZED_CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_COPPER_BLOCK - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_COPPER_BLOCK_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_COPPER_BLOCK_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_COPPER_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_CUT_COPPER - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_EXPOSED_COPPER - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_EXPOSED_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_EXPOSED_CUT_COPPER - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_EXPOSED_CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_EXPOSED_CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_WEATHERED_COPPER - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_WEATHERED_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_WEATHERED_CUT_COPPER - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_WEATHERED_CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_WEATHERED_CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_OXIDIZED_COPPER - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_OXIDIZED_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); // WAXED_OXIDIZED_CUT_COPPER - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_0 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_1 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_2 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_3 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_4 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_5 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_6 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_7 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_8 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); - public static final CustomWeatheringCopperBlock WAXED_OXIDIZED_CUT_COPPER_9 = new CustomWeatheringCopperBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_0 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_1 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_2 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_3 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_4 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_5 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_6 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_7 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_8 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomDefaultBlock WAXED_OXIDIZED_CUT_COPPER_9 = new CustomDefaultBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER).strength(HARDNESS[6], RESISTANCE[4]), 9); + // ================================================== + // Version: 1.3.9 + // ================================================== + // BONE_BLOCK + public static final CustomRotatedPillarBlock BONE_BLOCK_0 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 0); + public static final CustomRotatedPillarBlock BONE_BLOCK_1 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[2], RESISTANCE[0]), 1); + public static final CustomRotatedPillarBlock BONE_BLOCK_2 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 2); + public static final CustomRotatedPillarBlock BONE_BLOCK_3 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[3], RESISTANCE[1]), 3); + public static final CustomRotatedPillarBlock BONE_BLOCK_4 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 4); + public static final CustomRotatedPillarBlock BONE_BLOCK_5 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[4], RESISTANCE[2]), 5); + public static final CustomRotatedPillarBlock BONE_BLOCK_6 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 6); + public static final CustomRotatedPillarBlock BONE_BLOCK_7 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[5], RESISTANCE[3]), 7); + public static final CustomRotatedPillarBlock BONE_BLOCK_8 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 8); + public static final CustomRotatedPillarBlock BONE_BLOCK_9 = new CustomRotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).strength(HARDNESS[6], RESISTANCE[4]), 9); } diff --git a/common/src/main/java/net/sashiro/compressedblocks/block/CompressedBlock.java b/common/src/main/java/net/sashiro/compressedblocks/block/CompressedBlock.java index 3720f182f..5cea0444e 100644 --- a/common/src/main/java/net/sashiro/compressedblocks/block/CompressedBlock.java +++ b/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 lC, @NotNull TooltipFlag ttf) { - super.appendHoverText(is, bg, lC, ttf); - lC.add(Component.literal(compressor.getBlockCount() + " Blocks").withStyle(compressor.getStyle())); - } - } } diff --git a/common/src/main/java/net/sashiro/compressedblocks/util/StringUtils.java b/common/src/main/java/net/sashiro/compressedblocks/util/StringUtils.java index ec3f6625a..9a8517313 100644 --- a/common/src/main/java/net/sashiro/compressedblocks/util/StringUtils.java +++ b/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; + } } diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c0_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c0_bone_block.json new file mode 100644 index 000000000..e4650d021 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c1_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c1_bone_block.json new file mode 100644 index 000000000..bcdd2d7f8 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c2_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c2_bone_block.json new file mode 100644 index 000000000..9b4c5c107 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c3_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c3_bone_block.json new file mode 100644 index 000000000..7ac16fec0 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c4_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c4_bone_block.json new file mode 100644 index 000000000..75dc814e9 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c5_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c5_bone_block.json new file mode 100644 index 000000000..828bac0d6 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c6_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c6_bone_block.json new file mode 100644 index 000000000..d14cd1683 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c7_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c7_bone_block.json new file mode 100644 index 000000000..1ec441af4 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c8_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c8_bone_block.json new file mode 100644 index 000000000..73ee43222 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/blockstates/c9_bone_block.json b/common/src/main/resources/assets/compressedblocks/blockstates/c9_bone_block.json new file mode 100644 index 000000000..8aeb09ed3 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c0_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c0_bone_block.json new file mode 100644 index 000000000..59fa9612f --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c0_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c0_bone_block_horizontal.json new file mode 100644 index 000000000..d473d07a5 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c0_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c1_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c1_bone_block.json new file mode 100644 index 000000000..d494b6f9f --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c1_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_1", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c1_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c1_bone_block_horizontal.json new file mode 100644 index 000000000..5e8cd5284 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c1_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_1", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c2_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c2_bone_block.json new file mode 100644 index 000000000..eaece6f53 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c2_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_2", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c2_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c2_bone_block_horizontal.json new file mode 100644 index 000000000..03f96538b --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c2_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_2", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c3_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c3_bone_block.json new file mode 100644 index 000000000..733ef1c97 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c3_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_3", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c3_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c3_bone_block_horizontal.json new file mode 100644 index 000000000..cbd965d30 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c3_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_3", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c4_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c4_bone_block.json new file mode 100644 index 000000000..fff2ff02a --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c4_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_4", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c4_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c4_bone_block_horizontal.json new file mode 100644 index 000000000..c85d02320 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c4_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_4", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c5_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c5_bone_block.json new file mode 100644 index 000000000..4d00fcb57 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c5_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_5", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c5_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c5_bone_block_horizontal.json new file mode 100644 index 000000000..79d4f413b --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c5_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_5", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c6_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c6_bone_block.json new file mode 100644 index 000000000..43f18b0bc --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c6_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_6", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c6_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c6_bone_block_horizontal.json new file mode 100644 index 000000000..347e6c4b0 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c6_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_6", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c7_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c7_bone_block.json new file mode 100644 index 000000000..466a6fe91 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c7_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_7", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c7_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c7_bone_block_horizontal.json new file mode 100644 index 000000000..562a069ec --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c7_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_7", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c8_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c8_bone_block.json new file mode 100644 index 000000000..5970d34ea --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c8_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_8", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c8_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c8_bone_block_horizontal.json new file mode 100644 index 000000000..be71bc8d3 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c8_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_8", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c9_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/block/c9_bone_block.json new file mode 100644 index 000000000..f166c9817 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c9_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_9", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/block/c9_bone_block_horizontal.json b/common/src/main/resources/assets/compressedblocks/models/block/c9_bone_block_horizontal.json new file mode 100644 index 000000000..9c532190c --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/block/c9_bone_block_horizontal.json @@ -0,0 +1,76 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "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_9", + "particle": "minecraft:block/bone_block_side", + "side": "minecraft:block/bone_block_side" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c0_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c0_bone_block.json new file mode 100644 index 000000000..1ee24d1be --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c0_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c0_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c1_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c1_bone_block.json new file mode 100644 index 000000000..021f00913 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c1_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c1_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c2_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c2_bone_block.json new file mode 100644 index 000000000..45631196e --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c2_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c2_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c3_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c3_bone_block.json new file mode 100644 index 000000000..8ba6b36aa --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c3_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c3_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c4_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c4_bone_block.json new file mode 100644 index 000000000..21c1e5776 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c4_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c4_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c5_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c5_bone_block.json new file mode 100644 index 000000000..9a1a5958d --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c5_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c5_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c6_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c6_bone_block.json new file mode 100644 index 000000000..f32bc074d --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c6_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c6_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c7_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c7_bone_block.json new file mode 100644 index 000000000..535241730 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c7_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c7_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c8_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c8_bone_block.json new file mode 100644 index 000000000..cc292bfa1 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c8_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c8_bone_block" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/compressedblocks/models/item/c9_bone_block.json b/common/src/main/resources/assets/compressedblocks/models/item/c9_bone_block.json new file mode 100644 index 000000000..3ea0307a2 --- /dev/null +++ b/common/src/main/resources/assets/compressedblocks/models/item/c9_bone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "compressedblocks:block/c9_bone_block" +} \ No newline at end of file diff --git a/fabric/src/main/java/net/sashiro/compressedblocks/registry/CBBlocksRegister.java b/fabric/src/main/java/net/sashiro/compressedblocks/registry/CBBlocksRegister.java index 9fbd27821..b20db1685 100644 --- a/fabric/src/main/java/net/sashiro/compressedblocks/registry/CBBlocksRegister.java +++ b/fabric/src/main/java/net/sashiro/compressedblocks/registry/CBBlocksRegister.java @@ -11,6 +11,9 @@ import static net.sashiro.compressedblocks.Constants.MOD_ID; import static net.sashiro.compressedblocks.block.BlockList.*; +/** + * Forge doesn't let us use Vanilla Registries which results in duplicate code. + */ public class CBBlocksRegister { private static void registerBlock(String name, Block block) { @@ -1014,5 +1017,19 @@ public static void register() { registerBlock("c7_" + "WAXED_OXIDIZED_CUT_COPPER", WAXED_OXIDIZED_CUT_COPPER_7); registerBlock("c8_" + "WAXED_OXIDIZED_CUT_COPPER", WAXED_OXIDIZED_CUT_COPPER_8); registerBlock("c9_" + "WAXED_OXIDIZED_CUT_COPPER", WAXED_OXIDIZED_CUT_COPPER_9); + // ================================================== + // Version: 1.3.9 + // ================================================== + // BONE_BLOCK + registerBlock("c0_" + "BONE_BLOCK", BONE_BLOCK_0); + registerBlock("c1_" + "BONE_BLOCK", BONE_BLOCK_1); + registerBlock("c2_" + "BONE_BLOCK", BONE_BLOCK_2); + registerBlock("c3_" + "BONE_BLOCK", BONE_BLOCK_3); + registerBlock("c4_" + "BONE_BLOCK", BONE_BLOCK_4); + registerBlock("c5_" + "BONE_BLOCK", BONE_BLOCK_5); + registerBlock("c6_" + "BONE_BLOCK", BONE_BLOCK_6); + registerBlock("c7_" + "BONE_BLOCK", BONE_BLOCK_7); + registerBlock("c8_" + "BONE_BLOCK", BONE_BLOCK_8); + registerBlock("c9_" + "BONE_BLOCK", BONE_BLOCK_9); } } diff --git a/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBBlockStateProvider.java b/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBBlockStateProvider.java index 705e96535..749f68bfa 100644 --- a/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBBlockStateProvider.java +++ b/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBBlockStateProvider.java @@ -15,6 +15,8 @@ @SuppressWarnings("unused") public class CBBlockStateProvider extends BlockStateProvider { + private final GenUtils utils = new GenUtils(); + public CBBlockStateProvider(PackOutput packOutput, ExistingFileHelper exFileHelper) { super(packOutput, MOD_ID, exFileHelper); } @@ -26,18 +28,18 @@ protected void registerStatesAndModels() { ModelFile.UncheckedModelFile cubeColumnHorizontal = new ModelFile.UncheckedModelFile("block/cube_column_horizontal"); for (RegistryObject block : CBRegistryEvent.BLOCKS.getEntries()) { - if (block.get().getDescriptionId().contains("honey_block") || block.get().getDescriptionId().contains("basalt")) - continue; + // exclude manually added resources + if (utils.isBlock(block)) continue; if (block.get().getDescriptionId().contains("_log")) { RotatedPillarBlock block1 = (RotatedPillarBlock) block.get(); axisBlock( block1, models().cubeColumn( block.get().getDescriptionId().replace("block.compressedblocks.", ""), - getActualResourceLocation(block.get().getDescriptionId()), new ResourceLocation("minecraft", getCleanName(block.get().getDescriptionId()) + "_top") + utils.getActualResourceLocation(block.get().getDescriptionId()), new ResourceLocation("minecraft", utils.getCleanName(block.get().getDescriptionId()) + "_top") ) - .texture("particle", getActualResourceLocation(block.get().getDescriptionId())) - .texture("overlay", getCompressionOverlay(block.get().getDescriptionId())) + .texture("particle", utils.getActualResourceLocation(block.get().getDescriptionId())) + .texture("overlay", utils.getCompressionOverlay(block.get().getDescriptionId())) .parent(cubeColumn) .renderType("translucent") .element() @@ -62,10 +64,10 @@ block1, models().cubeColumn( .end() , models().cubeColumnHorizontal( block.get().getDescriptionId().replace("block.compressedblocks.", "") + "_horizontal", - getActualResourceLocation(block.get().getDescriptionId()), new ResourceLocation("minecraft", getCleanName(block.get().getDescriptionId()) + "_top") + utils.getActualResourceLocation(block.get().getDescriptionId()), new ResourceLocation("minecraft", utils.getCleanName(block.get().getDescriptionId()) + "_top") ) - .texture("particle", getActualResourceLocation(block.get().getDescriptionId())) - .texture("overlay", getCompressionOverlay(block.get().getDescriptionId())) + .texture("particle", utils.getActualResourceLocation(block.get().getDescriptionId())) + .texture("overlay", utils.getCompressionOverlay(block.get().getDescriptionId())) .parent(cubeColumnHorizontal) .renderType("translucent") .element() @@ -93,10 +95,10 @@ block1, models().cubeColumn( simpleBlock( block.get(), models().cubeAll( block.get().getDescriptionId().replace("block.compressedblocks.", ""), - getActualResourceLocation(block.get().getDescriptionId()) + utils.getActualResourceLocation(block.get().getDescriptionId()) ) - .texture("particle", getActualResourceLocation(block.get().getDescriptionId())) - .texture("overlay", getCompressionOverlay(block.get().getDescriptionId())) + .texture("particle", utils.getActualResourceLocation(block.get().getDescriptionId())) + .texture("overlay", utils.getCompressionOverlay(block.get().getDescriptionId())) .parent(blockBlock) .renderType("translucent") .element() @@ -125,37 +127,8 @@ block1, models().cubeColumn( for (RegistryObject block : CBRegistryEvent.CRATE_BLOCKS.getEntries()) { String crate_name = block.get().getDescriptionId().replace("block.compressedblocks.", ""); - String mc_name = getMCName(crate_name); - ResourceLocation location = new ResourceLocation("item/" + mc_name); - - if (mc_name.contains("rail") - || mc_name.contains("torch") - || mc_name.contains("lightning_rod") - || mc_name.contains("end_rod") - || mc_name.contains("anvil") - || mc_name.contains("sapling") - || mc_name.contains("mushroom") - || mc_name.contains("fungus") - || mc_name.contains("dandelion") - || mc_name.contains("poppy") - || mc_name.contains("orchid") - || mc_name.contains("allium") - || mc_name.contains("bluet") - || mc_name.contains("tulip") - || mc_name.contains("daisy") - || mc_name.contains("cornflower") - || mc_name.contains("valley") - || mc_name.contains("rose") - || mc_name.contains("turtle") - || mc_name.contains("cobweb") - ) - location = new ResourceLocation("block/" + mc_name); - if (mc_name.contains("sunflower")) location = new ResourceLocation("block/sunflower_front"); - if (mc_name.contains("lilac")) location = new ResourceLocation("block/lilac_top"); - if (mc_name.contains("rose_bush")) location = new ResourceLocation("block/rose_bush_top"); - if (mc_name.contains("peony")) location = new ResourceLocation("block/peony_top"); - if (mc_name.contains("carpet")) - location = new ResourceLocation("block/" + mc_name.replace("carpet", "wool")); + String mc_name = utils.getMCName(crate_name); + ResourceLocation location = utils.getResourceLocation(mc_name); simpleBlock( block.get(), models().cubeAll( @@ -164,7 +137,7 @@ block1, models().cubeColumn( ) .texture("particle", new ResourceLocation(MOD_ID, "block/crate")) .texture("item", location) - .texture("number", getCrateLevel(block.get().getDescriptionId())) + .texture("number", utils.getCrateLevel(block.get().getDescriptionId())) .parent(blockBlock) .renderType("cutout") .element() @@ -186,76 +159,4 @@ block1, models().cubeColumn( ); } } - - private String getMCName(String crateName) { - crateName = crateName.replace("item.compressedblocks.", ""); - if (crateName.startsWith("crated_")) crateName = crateName.replace("crated_", ""); - else if (crateName.startsWith("double_crated_")) crateName = crateName.replace("double_crated_", ""); - else if (crateName.startsWith("triple_crated_")) crateName = crateName.replace("triple_crated_", ""); - else if (crateName.startsWith("quadruple_crated_")) crateName = crateName.replace("quadruple_crated_", ""); - else if (crateName.startsWith("quintuple_crated_")) crateName = crateName.replace("quintuple_crated_", ""); - else if (crateName.startsWith("sextuple_crated_")) crateName = crateName.replace("sextuple_crated_", ""); - else if (crateName.startsWith("septuple_crated_")) crateName = crateName.replace("septuple_crated_", ""); - else if (crateName.startsWith("octuple_crated_")) crateName = crateName.replace("octuple_crated_", ""); - else if (crateName.startsWith("mega_crated_")) crateName = crateName.replace("mega_crated_", ""); - else if (crateName.startsWith("giga_crated_")) crateName = crateName.replace("giga_crated_", ""); - - return crateName; - } - - private ResourceLocation getActualResourceLocation(String resourceLocation) { - String blockName = resourceLocation.replace("block.compressedblocks.", ""); - for (int i = 0; i < 10; i++) { - if (blockName.contains("c" + i)) - blockName = blockName.replace("c" + i + "_", ""); - } - if (resourceLocation.contains("exposed")) blockName = "exposed_copper"; - if (resourceLocation.contains("copper_block")) blockName = "copper_block"; - if (resourceLocation.contains("cut_copper")) blockName = "cut_copper"; - if (resourceLocation.contains("oxidized_copper")) blockName = "oxidized_copper"; - if (resourceLocation.contains("weathered_copper")) blockName = "weathered_copper"; - return new ResourceLocation("minecraft", "block/" + blockName); - } - - private String getCleanName(String resourceLocation) { - String blockName = resourceLocation.replace("block.compressedblocks.", ""); - for (int i = 0; i < 10; i++) { - if (blockName.contains("c" + i)) - blockName = blockName.replace("c" + i + "_", ""); - } - return "block/" + blockName; - } - - private ResourceLocation getCompressionOverlay(String blockName) { - String overlay; - if (blockName.contains("c0")) overlay = "compression_level_0"; - else if (blockName.contains("c1")) overlay = "compression_level_1"; - else if (blockName.contains("c2")) overlay = "compression_level_2"; - else if (blockName.contains("c3")) overlay = "compression_level_3"; - else if (blockName.contains("c4")) overlay = "compression_level_4"; - else if (blockName.contains("c5")) overlay = "compression_level_5"; - else if (blockName.contains("c6")) overlay = "compression_level_6"; - else if (blockName.contains("c7")) overlay = "compression_level_7"; - else if (blockName.contains("c8")) overlay = "compression_level_8"; - else if (blockName.contains("c9")) overlay = "compression_level_9"; - else overlay = "compression_level_0"; - return new ResourceLocation("compressedblocks", "block/" + overlay); - } - - private ResourceLocation getCrateLevel(String blockName) { - String overlay; - blockName = blockName.replace("block.compressedblocks.", ""); - if (blockName.startsWith("crated_")) overlay = "level_0"; - else if (blockName.startsWith("double_crated_")) overlay = "level_1"; - else if (blockName.startsWith("triple_crated_")) overlay = "level_2"; - else if (blockName.startsWith("quadruple_crated_")) overlay = "level_3"; - else if (blockName.startsWith("quintuple_crated_")) overlay = "level_4"; - else if (blockName.startsWith("sextuple_crated_")) overlay = "level_5"; - else if (blockName.startsWith("septuple_crated_")) overlay = "level_6"; - else if (blockName.startsWith("octuple_crated_")) overlay = "level_7"; - else if (blockName.startsWith("mega_crated_")) overlay = "level_8"; - else if (blockName.startsWith("giga_crated_")) overlay = "level_9"; - else overlay = "level_0"; - return new ResourceLocation("compressedblocks", "block/" + overlay); - } } \ No newline at end of file diff --git a/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBItemModelProvider.java b/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBItemModelProvider.java index 0e0a7dea5..ecec350c6 100644 --- a/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBItemModelProvider.java +++ b/forge/src/main/java/net/sashiro/compressedblocks/data/providers/CBItemModelProvider.java @@ -10,6 +10,8 @@ import static net.sashiro.compressedblocks.Constants.MOD_ID; public class CBItemModelProvider extends ItemModelProvider { + private final GenUtils utils = new GenUtils(); + public CBItemModelProvider(PackOutput packOutput, ExistingFileHelper existingFileHelper) { super(packOutput, MOD_ID, existingFileHelper); } @@ -18,8 +20,8 @@ public CBItemModelProvider(PackOutput packOutput, ExistingFileHelper existingFil protected void registerModels() { for (RegistryObject block : CBRegistryEvent.BLOCKS.getEntries()) { - if (block.get().getDescriptionId().contains("honey_block") || block.get().getDescriptionId().contains("basalt")) - continue; + // exclude manually added resources + if (utils.isBlock(block)) continue; String name = block.get().getDescriptionId().replace("block.compressedblocks.", ""); withExistingParent(name, modLoc("block/" + name)); } diff --git a/forge/src/main/java/net/sashiro/compressedblocks/data/providers/GenUtils.java b/forge/src/main/java/net/sashiro/compressedblocks/data/providers/GenUtils.java new file mode 100644 index 000000000..b123289ff --- /dev/null +++ b/forge/src/main/java/net/sashiro/compressedblocks/data/providers/GenUtils.java @@ -0,0 +1,131 @@ +package net.sashiro.compressedblocks.data.providers; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.registries.RegistryObject; +import net.sashiro.compressedblocks.util.StringUtils; +import org.jetbrains.annotations.NotNull; + +/** + * Utilities for Data Generation + */ +@SuppressWarnings("RedundantIfStatement") +public class GenUtils { + protected boolean isBlock(RegistryObject block) { + String blockName = block.get().getDescriptionId(); + + if (blockName.contains("honey_block")) return true; + if (blockName.contains("basalt")) return true; + if (blockName.contains("bone_block")) return true; + return false; + } + + protected ResourceLocation getCrateLevel(String blockName) { + String overlay; + blockName = blockName.replace("block.compressedblocks.", ""); + if (blockName.startsWith("crated_")) overlay = "level_0"; + else if (blockName.startsWith("double_crated_")) overlay = "level_1"; + else if (blockName.startsWith("triple_crated_")) overlay = "level_2"; + else if (blockName.startsWith("quadruple_crated_")) overlay = "level_3"; + else if (blockName.startsWith("quintuple_crated_")) overlay = "level_4"; + else if (blockName.startsWith("sextuple_crated_")) overlay = "level_5"; + else if (blockName.startsWith("septuple_crated_")) overlay = "level_6"; + else if (blockName.startsWith("octuple_crated_")) overlay = "level_7"; + else if (blockName.startsWith("mega_crated_")) overlay = "level_8"; + else if (blockName.startsWith("giga_crated_")) overlay = "level_9"; + else overlay = "level_0"; + return new ResourceLocation("compressedblocks", "block/" + overlay); + } + + protected ResourceLocation getCompressionOverlay(String blockName) { + String overlay; + if (blockName.contains("c0")) overlay = "compression_level_0"; + else if (blockName.contains("c1")) overlay = "compression_level_1"; + else if (blockName.contains("c2")) overlay = "compression_level_2"; + else if (blockName.contains("c3")) overlay = "compression_level_3"; + else if (blockName.contains("c4")) overlay = "compression_level_4"; + else if (blockName.contains("c5")) overlay = "compression_level_5"; + else if (blockName.contains("c6")) overlay = "compression_level_6"; + else if (blockName.contains("c7")) overlay = "compression_level_7"; + else if (blockName.contains("c8")) overlay = "compression_level_8"; + else if (blockName.contains("c9")) overlay = "compression_level_9"; + else overlay = "compression_level_0"; + return new ResourceLocation("compressedblocks", "block/" + overlay); + } + + protected String getCleanName(String resourceLocation) { + String blockName = resourceLocation.replace("block.compressedblocks.", ""); + blockName = StringUtils.removeCompressionName(blockName); + return "block/" + blockName; + } + + protected ResourceLocation getActualResourceLocation(String resourceLocation) { + String blockName = resourceLocation.replace("block.compressedblocks.", ""); + blockName = StringUtils.removeCompressionName(blockName); + + if (blockName.contains("cut")) { + if (blockName.contains("exposed_cut_copper")) blockName = "exposed_cut_copper"; + else if (blockName.contains("oxidized_cut_copper")) blockName = "oxidized_cut_copper"; + else if (blockName.contains("weathered_cut_copper")) blockName = "weathered_cut_copper"; + else if (blockName.contains("cut_copper")) blockName = "cut_copper"; + } else { + if (blockName.contains("copper_block") && !blockName.contains("raw")) blockName = "copper_block"; + else if (blockName.contains("exposed_copper")) blockName = "exposed_copper"; + else if (blockName.contains("oxidized_copper")) blockName = "oxidized_copper"; + else if (blockName.contains("weathered_copper")) blockName = "weathered_copper"; + } + + return new ResourceLocation("minecraft", "block/" + blockName); + } + + protected String getMCName(String crateName) { + crateName = crateName.replace("item.compressedblocks.", ""); + if (crateName.startsWith("crated_")) crateName = crateName.replace("crated_", ""); + else if (crateName.startsWith("double_crated_")) crateName = crateName.replace("double_crated_", ""); + else if (crateName.startsWith("triple_crated_")) crateName = crateName.replace("triple_crated_", ""); + else if (crateName.startsWith("quadruple_crated_")) crateName = crateName.replace("quadruple_crated_", ""); + else if (crateName.startsWith("quintuple_crated_")) crateName = crateName.replace("quintuple_crated_", ""); + else if (crateName.startsWith("sextuple_crated_")) crateName = crateName.replace("sextuple_crated_", ""); + else if (crateName.startsWith("septuple_crated_")) crateName = crateName.replace("septuple_crated_", ""); + else if (crateName.startsWith("octuple_crated_")) crateName = crateName.replace("octuple_crated_", ""); + else if (crateName.startsWith("mega_crated_")) crateName = crateName.replace("mega_crated_", ""); + else if (crateName.startsWith("giga_crated_")) crateName = crateName.replace("giga_crated_", ""); + + return crateName; + } + + @NotNull + protected ResourceLocation getResourceLocation(String mc_name) { + ResourceLocation location = new ResourceLocation("item/" + mc_name); + + if (mc_name.contains("rail") + || mc_name.contains("torch") + || mc_name.contains("lightning_rod") + || mc_name.contains("end_rod") + || mc_name.contains("anvil") + || mc_name.contains("sapling") + || mc_name.contains("mushroom") + || mc_name.contains("fungus") + || mc_name.contains("dandelion") + || mc_name.contains("poppy") + || mc_name.contains("orchid") + || mc_name.contains("allium") + || mc_name.contains("bluet") + || mc_name.contains("tulip") + || mc_name.contains("daisy") + || mc_name.contains("cornflower") + || mc_name.contains("valley") + || mc_name.contains("rose") + || mc_name.contains("turtle") + || mc_name.contains("cobweb") + ) + location = new ResourceLocation("block/" + mc_name); + if (mc_name.contains("sunflower")) location = new ResourceLocation("block/sunflower_front"); + if (mc_name.contains("lilac")) location = new ResourceLocation("block/lilac_top"); + if (mc_name.contains("rose_bush")) location = new ResourceLocation("block/rose_bush_top"); + if (mc_name.contains("peony")) location = new ResourceLocation("block/peony_top"); + if (mc_name.contains("carpet")) + location = new ResourceLocation("block/" + mc_name.replace("carpet", "wool")); + return location; + } +} diff --git a/forge/src/main/java/net/sashiro/compressedblocks/registry/CBBlockRegister.java b/forge/src/main/java/net/sashiro/compressedblocks/registry/CBBlockRegister.java index e8eebad69..4ead04778 100644 --- a/forge/src/main/java/net/sashiro/compressedblocks/registry/CBBlockRegister.java +++ b/forge/src/main/java/net/sashiro/compressedblocks/registry/CBBlockRegister.java @@ -1017,6 +1017,20 @@ public static void register(RegisterEvent event) { registerBlock("c7_" + "WAXED_OXIDIZED_CUT_COPPER", WAXED_OXIDIZED_CUT_COPPER_7); registerBlock("c8_" + "WAXED_OXIDIZED_CUT_COPPER", WAXED_OXIDIZED_CUT_COPPER_8); registerBlock("c9_" + "WAXED_OXIDIZED_CUT_COPPER", WAXED_OXIDIZED_CUT_COPPER_9); + // ================================================== + // Version: 1.3.9 + // ================================================== + // BONE_BLOCK + registerBlock("c0_" + "BONE_BLOCK", BONE_BLOCK_0); + registerBlock("c1_" + "BONE_BLOCK", BONE_BLOCK_1); + registerBlock("c2_" + "BONE_BLOCK", BONE_BLOCK_2); + registerBlock("c3_" + "BONE_BLOCK", BONE_BLOCK_3); + registerBlock("c4_" + "BONE_BLOCK", BONE_BLOCK_4); + registerBlock("c5_" + "BONE_BLOCK", BONE_BLOCK_5); + registerBlock("c6_" + "BONE_BLOCK", BONE_BLOCK_6); + registerBlock("c7_" + "BONE_BLOCK", BONE_BLOCK_7); + registerBlock("c8_" + "BONE_BLOCK", BONE_BLOCK_8); + registerBlock("c9_" + "BONE_BLOCK", BONE_BLOCK_9); } } } diff --git a/gradle.properties b/gradle.properties index ba3551483..f6a134c04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -version=1.3.8 +version=1.3.9 group=net.sashiro.compressedblocks # Common diff --git a/update.json b/update.json index 323172ee9..640906021 100644 --- a/update.json +++ b/update.json @@ -17,11 +17,11 @@ "1.19.3-recommended": "1.3.5", "1.19.4-latest": "1.3.5", "1.19.4-recommended": "1.3.5", - "1.20-latest": "1.3.8", - "1.20-recommended": "1.3.8", - "1.20.1-latest": "1.3.8", - "1.20.1-recommended": "1.3.8", - "1.20.2-latest": "1.3.8", - "1.20.2-recommended": "1.3.8" + "1.20-latest": "1.3.9", + "1.20-recommended": "1.3.9", + "1.20.1-latest": "1.3.9", + "1.20.1-recommended": "1.3.9", + "1.20.2-latest": "1.3.9", + "1.20.2-recommended": "1.3.9" } }