From 49df4ae7b38c53159aa0360c2bda4b4d52b275c1 Mon Sep 17 00:00:00 2001 From: JayCeeCreates Date: Sun, 8 Aug 2021 12:27:40 +0800 Subject: [PATCH] Update to 1.17.x-1.1.0 --- CHANGELOG.md | 6 ++ README.md | 3 +- gradle.properties | 2 +- .../earlygame/block/CobbledCalcite.java | 13 ++++ .../earlygame/block/CobbledTuff.java | 13 ++++ .../earlygame/init/BlocksInit.java | 33 ++++++++--- .../earlygame/init/ItemsInit.java | 3 + .../blockstates/andesite_cobblestone.json | 7 --- .../blockstates/calcite_rock_block.json | 7 +++ .../blockstates/cobbled_andesite.json | 7 +++ .../blockstates/cobbled_calcite.json | 7 +++ .../blockstates/cobbled_diorite.json | 7 +++ .../blockstates/cobbled_granite.json | 7 +++ .../earlygame/blockstates/cobbled_tuff.json | 7 +++ .../blockstates/deepslate_rock_block.json | 7 +++ .../blockstates/diorite_cobblestone.json | 7 --- .../blockstates/granite_cobblestone.json | 7 --- .../blockstates/tuff_rock_block.json | 7 +++ .../assets/earlygame/lang/en_us.json | 11 +++- .../models/block/calcite_rock_block.json | 6 ++ ...cobblestone.json => cobbled_andesite.json} | 2 +- ..._cobblestone.json => cobbled_calcite.json} | 2 +- ..._cobblestone.json => cobbled_diorite.json} | 2 +- .../models/block/cobbled_granite.json | 6 ++ .../earlygame/models/block/cobbled_tuff.json | 6 ++ .../models/block/deepslate_rock_block.json | 6 ++ .../models/block/tuff_rock_block.json | 6 ++ .../models/item/andesite_cobblestone.json | 3 - .../earlygame/models/item/calcite_rock.json | 6 ++ .../models/item/cobbled_andesite.json | 3 + .../models/item/cobbled_calcite.json | 3 + .../models/item/cobbled_diorite.json | 3 + .../models/item/cobbled_granite.json | 3 + .../earlygame/models/item/cobbled_tuff.json | 3 + .../earlygame/models/item/deepslate_rock.json | 6 ++ .../models/item/diorite_cobblestone.json | 3 - .../models/item/granite_cobblestone.json | 3 - .../earlygame/models/item/tuff_rock.json | 6 ++ ...e_cobblestone.png => cobbled_andesite.png} | Bin .../textures/block/cobbled_calcite.png | Bin 0 -> 1245 bytes ...te_cobblestone.png => cobbled_diorite.png} | Bin ...te_cobblestone.png => cobbled_granite.png} | Bin .../earlygame/textures/block/cobbled_tuff.png | Bin 0 -> 1296 bytes .../earlygame/textures/item/calcite_rock.png | Bin 0 -> 944 bytes .../textures/item/deepslate_rock.png | Bin 0 -> 867 bytes .../earlygame/textures/item/tuff_rock.png | Bin 0 -> 933 bytes .../andesite_from_cobblestone.json | 2 +- .../calcite_from_cobblestone.json | 32 ++++++++++ ...cobblestone.json => cobbled_andesite.json} | 4 +- .../advancements/cobbled_calcite.json | 32 ++++++++++ .../advancements/cobbled_deepslate.json | 32 ++++++++++ ..._cobblestone.json => cobbled_diorite.json} | 4 +- ..._cobblestone.json => cobbled_granite.json} | 4 +- .../earlygame/advancements/cobbled_tuff.json | 32 ++++++++++ .../diorite_from_cobblestone.json | 2 +- .../granite_from_cobblestone.json | 2 +- .../advancements/tuff_from_cobblestone.json | 32 ++++++++++ .../blocks/calcite_rock_block.json | 19 ++++++ ...cobblestone.json => cobbled_andesite.json} | 2 +- ..._cobblestone.json => cobbled_calcite.json} | 2 +- ..._cobblestone.json => cobbled_diorite.json} | 2 +- .../loot_tables/blocks/cobbled_granite.json | 19 ++++++ .../loot_tables/blocks/cobbled_tuff.json | 19 ++++++ .../blocks/deepslate_rock_block.json | 19 ++++++ .../loot_tables/blocks/tuff_rock_block.json | 19 ++++++ .../recipes/andesite_from_cobblestone.json | 2 +- .../recipes/calcite_from_cobblestone.json | 9 +++ ...cobblestone.json => cobbled_andesite.json} | 2 +- .../earlygame/recipes/cobbled_calcite.json | 16 +++++ .../earlygame/recipes/cobbled_deepslate.json | 16 +++++ ..._cobblestone.json => cobbled_diorite.json} | 2 +- ..._cobblestone.json => cobbled_granite.json} | 2 +- .../data/earlygame/recipes/cobbled_tuff.json | 16 +++++ .../recipes/diorite_from_cobblestone.json | 2 +- .../recipes/granite_from_cobblestone.json | 2 +- .../recipes/tuff_from_cobblestone.json | 9 +++ .../earlygame/tags/blocks/cobblestone.json | 9 ++- .../minecraft/loot_tables/blocks/calcite.json | 56 ++++++++++++++++++ .../loot_tables/blocks/deepslate.json | 56 ++++++++++++++++++ .../minecraft/loot_tables/blocks/tuff.json | 56 ++++++++++++++++++ .../tags/items/stone_crafting_materials.json | 8 ++- .../tags/items/stone_tool_materials.json | 10 ++++ src/main/resources/fabric.mod.json | 2 +- 83 files changed, 720 insertions(+), 73 deletions(-) create mode 100644 src/main/java/jayceecreates/earlygame/block/CobbledCalcite.java create mode 100644 src/main/java/jayceecreates/earlygame/block/CobbledTuff.java delete mode 100644 src/main/resources/assets/earlygame/blockstates/andesite_cobblestone.json create mode 100644 src/main/resources/assets/earlygame/blockstates/calcite_rock_block.json create mode 100644 src/main/resources/assets/earlygame/blockstates/cobbled_andesite.json create mode 100644 src/main/resources/assets/earlygame/blockstates/cobbled_calcite.json create mode 100644 src/main/resources/assets/earlygame/blockstates/cobbled_diorite.json create mode 100644 src/main/resources/assets/earlygame/blockstates/cobbled_granite.json create mode 100644 src/main/resources/assets/earlygame/blockstates/cobbled_tuff.json create mode 100644 src/main/resources/assets/earlygame/blockstates/deepslate_rock_block.json delete mode 100644 src/main/resources/assets/earlygame/blockstates/diorite_cobblestone.json delete mode 100644 src/main/resources/assets/earlygame/blockstates/granite_cobblestone.json create mode 100644 src/main/resources/assets/earlygame/blockstates/tuff_rock_block.json create mode 100644 src/main/resources/assets/earlygame/models/block/calcite_rock_block.json rename src/main/resources/assets/earlygame/models/block/{andesite_cobblestone.json => cobbled_andesite.json} (55%) rename src/main/resources/assets/earlygame/models/block/{granite_cobblestone.json => cobbled_calcite.json} (58%) rename src/main/resources/assets/earlygame/models/block/{diorite_cobblestone.json => cobbled_diorite.json} (58%) create mode 100644 src/main/resources/assets/earlygame/models/block/cobbled_granite.json create mode 100644 src/main/resources/assets/earlygame/models/block/cobbled_tuff.json create mode 100644 src/main/resources/assets/earlygame/models/block/deepslate_rock_block.json create mode 100644 src/main/resources/assets/earlygame/models/block/tuff_rock_block.json delete mode 100644 src/main/resources/assets/earlygame/models/item/andesite_cobblestone.json create mode 100644 src/main/resources/assets/earlygame/models/item/calcite_rock.json create mode 100644 src/main/resources/assets/earlygame/models/item/cobbled_andesite.json create mode 100644 src/main/resources/assets/earlygame/models/item/cobbled_calcite.json create mode 100644 src/main/resources/assets/earlygame/models/item/cobbled_diorite.json create mode 100644 src/main/resources/assets/earlygame/models/item/cobbled_granite.json create mode 100644 src/main/resources/assets/earlygame/models/item/cobbled_tuff.json create mode 100644 src/main/resources/assets/earlygame/models/item/deepslate_rock.json delete mode 100644 src/main/resources/assets/earlygame/models/item/diorite_cobblestone.json delete mode 100644 src/main/resources/assets/earlygame/models/item/granite_cobblestone.json create mode 100644 src/main/resources/assets/earlygame/models/item/tuff_rock.json rename src/main/resources/assets/earlygame/textures/block/{andesite_cobblestone.png => cobbled_andesite.png} (100%) create mode 100644 src/main/resources/assets/earlygame/textures/block/cobbled_calcite.png rename src/main/resources/assets/earlygame/textures/block/{diorite_cobblestone.png => cobbled_diorite.png} (100%) rename src/main/resources/assets/earlygame/textures/block/{granite_cobblestone.png => cobbled_granite.png} (100%) create mode 100644 src/main/resources/assets/earlygame/textures/block/cobbled_tuff.png create mode 100644 src/main/resources/assets/earlygame/textures/item/calcite_rock.png create mode 100644 src/main/resources/assets/earlygame/textures/item/deepslate_rock.png create mode 100644 src/main/resources/assets/earlygame/textures/item/tuff_rock.png create mode 100755 src/main/resources/data/earlygame/advancements/calcite_from_cobblestone.json rename src/main/resources/data/earlygame/advancements/{andesite_cobblestone.json => cobbled_andesite.json} (85%) create mode 100644 src/main/resources/data/earlygame/advancements/cobbled_calcite.json create mode 100644 src/main/resources/data/earlygame/advancements/cobbled_deepslate.json rename src/main/resources/data/earlygame/advancements/{diorite_cobblestone.json => cobbled_diorite.json} (85%) rename src/main/resources/data/earlygame/advancements/{granite_cobblestone.json => cobbled_granite.json} (85%) create mode 100644 src/main/resources/data/earlygame/advancements/cobbled_tuff.json create mode 100755 src/main/resources/data/earlygame/advancements/tuff_from_cobblestone.json create mode 100644 src/main/resources/data/earlygame/loot_tables/blocks/calcite_rock_block.json rename src/main/resources/data/earlygame/loot_tables/blocks/{diorite_cobblestone.json => cobbled_andesite.json} (85%) rename src/main/resources/data/earlygame/loot_tables/blocks/{granite_cobblestone.json => cobbled_calcite.json} (85%) rename src/main/resources/data/earlygame/loot_tables/blocks/{andesite_cobblestone.json => cobbled_diorite.json} (85%) create mode 100644 src/main/resources/data/earlygame/loot_tables/blocks/cobbled_granite.json create mode 100644 src/main/resources/data/earlygame/loot_tables/blocks/cobbled_tuff.json create mode 100644 src/main/resources/data/earlygame/loot_tables/blocks/deepslate_rock_block.json create mode 100644 src/main/resources/data/earlygame/loot_tables/blocks/tuff_rock_block.json create mode 100755 src/main/resources/data/earlygame/recipes/calcite_from_cobblestone.json rename src/main/resources/data/earlygame/recipes/{andesite_cobblestone.json => cobbled_andesite.json} (81%) create mode 100644 src/main/resources/data/earlygame/recipes/cobbled_calcite.json create mode 100644 src/main/resources/data/earlygame/recipes/cobbled_deepslate.json rename src/main/resources/data/earlygame/recipes/{diorite_cobblestone.json => cobbled_diorite.json} (82%) rename src/main/resources/data/earlygame/recipes/{granite_cobblestone.json => cobbled_granite.json} (82%) create mode 100644 src/main/resources/data/earlygame/recipes/cobbled_tuff.json create mode 100755 src/main/resources/data/earlygame/recipes/tuff_from_cobblestone.json create mode 100644 src/main/resources/data/minecraft/loot_tables/blocks/calcite.json create mode 100644 src/main/resources/data/minecraft/loot_tables/blocks/deepslate.json create mode 100644 src/main/resources/data/minecraft/loot_tables/blocks/tuff.json create mode 100644 src/main/resources/data/minecraft/tags/items/stone_tool_materials.json diff --git a/CHANGELOG.md b/CHANGELOG.md index a7c832c..dd4b3a0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ *** +## 1.17.x-1.1.0 +- (+) Added cobblestone and rock variants for the new stone blocks (deepslate, calcite, tuff) +- (*) Adjusted the height of stick block to prevent possible Z-fighting +- (*) Fixed a bug where you cannot mine modded blocks due to the changes in mining in 1.17 (#25) +- (*) Renamed all cobblestone variants to match the official naming convention (e.g. Cobbled Diorite) + ## 1.17.x-1.0.3 EarlyGame has successfully been ported to 1.17! - (+) All features from [1.16.x](https://github.com/JayCeeCreates/earlygame/blob/1.16/CHANGELOG.md) versions diff --git a/README.md b/README.md index ca11c50..5270ba1 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@

- - +

diff --git a/gradle.properties b/gradle.properties index 3e6df79..c5afb5e 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.3 # Mod Properties - mod_version = 1.17.x-1.0.4-S1 + mod_version = 1.17.x-1.1.0 maven_group = jayceecreates.earlygame archives_base_name = earlygame diff --git a/src/main/java/jayceecreates/earlygame/block/CobbledCalcite.java b/src/main/java/jayceecreates/earlygame/block/CobbledCalcite.java new file mode 100644 index 0000000..ef7b5c2 --- /dev/null +++ b/src/main/java/jayceecreates/earlygame/block/CobbledCalcite.java @@ -0,0 +1,13 @@ +package jayceecreates.earlygame.block; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; + +public class CobbledCalcite extends Block { + + public CobbledCalcite() { + super(FabricBlockSettings.copy(Blocks.CALCITE).strength(1.25F)); + } + +} \ No newline at end of file diff --git a/src/main/java/jayceecreates/earlygame/block/CobbledTuff.java b/src/main/java/jayceecreates/earlygame/block/CobbledTuff.java new file mode 100644 index 0000000..d4dbe48 --- /dev/null +++ b/src/main/java/jayceecreates/earlygame/block/CobbledTuff.java @@ -0,0 +1,13 @@ +package jayceecreates.earlygame.block; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; + +public class CobbledTuff extends Block { + + public CobbledTuff() { + super(FabricBlockSettings.copy(Blocks.TUFF).strength(2.0F, 6.0F)); + } + +} \ No newline at end of file diff --git a/src/main/java/jayceecreates/earlygame/init/BlocksInit.java b/src/main/java/jayceecreates/earlygame/init/BlocksInit.java index 626dfac..56d6c67 100644 --- a/src/main/java/jayceecreates/earlygame/init/BlocksInit.java +++ b/src/main/java/jayceecreates/earlygame/init/BlocksInit.java @@ -15,13 +15,18 @@ public class BlocksInit { public static final Block ANDESITE_ROCK_BLOCK = new RockBlock(); public static final Block DIORITE_ROCK_BLOCK = new RockBlock(); public static final Block GRANITE_ROCK_BLOCK = new RockBlock(); + public static final Block DEEPSLATE_ROCK_BLOCK = new RockBlock(); + public static final Block CALCITE_ROCK_BLOCK = new RockBlock(); + public static final Block TUFF_ROCK_BLOCK = new RockBlock(); public static final Block SANDSTONE_ROCK_BLOCK = new RockBlock(); public static final Block RED_SANDSTONE_ROCK_BLOCK = new RockBlock(); // cobblestone - public static final Block ANDESITE_COBBLESTONE = new Cobblestone(); - public static final Block DIORITE_COBBLESTONE = new Cobblestone(); - public static final Block GRANITE_COBBLESTONE = new Cobblestone(); + public static final Block COBBLED_ANDESITE = new Cobblestone(); + public static final Block COBBLED_DIORITE = new Cobblestone(); + public static final Block COBBLED_GRANITE = new Cobblestone(); + public static final Block COBBLED_CALCITE = new CobbledCalcite(); + public static final Block COBBLED_TUFF = new CobbledTuff(); // stick public static final Block STICK_TWIG_BLOCK = new StickTwigBlock(); @@ -33,22 +38,32 @@ public static void init() { Registry.register(Registry.ITEM, new Identifier("earlygame", "andesite_rock"), ItemsInit.ANDESITE_STONE_ROCK); Registry.register(Registry.ITEM, new Identifier("earlygame", "diorite_rock"), ItemsInit.DIORITE_STONE_ROCK); Registry.register(Registry.ITEM, new Identifier("earlygame", "granite_rock"), ItemsInit.GRANITE_STONE_ROCK); + Registry.register(Registry.ITEM, new Identifier("earlygame", "deepslate_rock"), ItemsInit.DEEPSLATE_STONE_ROCK); + Registry.register(Registry.ITEM, new Identifier("earlygame", "calcite_rock"), ItemsInit.CALCITE_STONE_ROCK); + Registry.register(Registry.ITEM, new Identifier("earlygame", "tuff_rock"), ItemsInit.TUFF_STONE_ROCK); Registry.register(Registry.ITEM, new Identifier("earlygame", "sandstone_rock"), ItemsInit.SANDSTONE_ROCK); Registry.register(Registry.ITEM, new Identifier("earlygame", "red_sandstone_rock"), ItemsInit.RED_SANDSTONE_ROCK); Registry.register(Registry.BLOCK, new Identifier("earlygame", "stone_rock_block"), STONE_ROCK_BLOCK); Registry.register(Registry.BLOCK, new Identifier("earlygame", "andesite_rock_block"), ANDESITE_ROCK_BLOCK); Registry.register(Registry.BLOCK, new Identifier("earlygame", "diorite_rock_block"), DIORITE_ROCK_BLOCK); Registry.register(Registry.BLOCK, new Identifier("earlygame", "granite_rock_block"), GRANITE_ROCK_BLOCK); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "deepslate_rock_block"), DEEPSLATE_ROCK_BLOCK); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "calcite_rock_block"), CALCITE_ROCK_BLOCK); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "tuff_rock_block"), TUFF_ROCK_BLOCK); Registry.register(Registry.BLOCK, new Identifier("earlygame", "sandstone_rock_block"), SANDSTONE_ROCK_BLOCK); Registry.register(Registry.BLOCK, new Identifier("earlygame", "red_sandstone_rock_block"), RED_SANDSTONE_ROCK_BLOCK); // cobblestone - Registry.register(Registry.ITEM, new Identifier("earlygame", "andesite_cobblestone"), new BlockItem(ANDESITE_COBBLESTONE, new Item.Settings().group(ModItemGroup.EARLYGAME))); - Registry.register(Registry.ITEM, new Identifier("earlygame", "diorite_cobblestone"), new BlockItem(DIORITE_COBBLESTONE, new Item.Settings().group(ModItemGroup.EARLYGAME))); - Registry.register(Registry.ITEM, new Identifier("earlygame", "granite_cobblestone"), new BlockItem(GRANITE_COBBLESTONE, new Item.Settings().group(ModItemGroup.EARLYGAME))); - Registry.register(Registry.BLOCK, new Identifier("earlygame", "andesite_cobblestone"), ANDESITE_COBBLESTONE); - Registry.register(Registry.BLOCK, new Identifier("earlygame", "diorite_cobblestone"), DIORITE_COBBLESTONE); - Registry.register(Registry.BLOCK, new Identifier("earlygame", "granite_cobblestone"), GRANITE_COBBLESTONE); + Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_andesite"), new BlockItem(COBBLED_ANDESITE, new Item.Settings().group(ModItemGroup.EARLYGAME))); + Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_diorite"), new BlockItem(COBBLED_DIORITE, new Item.Settings().group(ModItemGroup.EARLYGAME))); + Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_granite"), new BlockItem(COBBLED_GRANITE, new Item.Settings().group(ModItemGroup.EARLYGAME))); + Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_calcite"), new BlockItem(COBBLED_CALCITE, new Item.Settings().group(ModItemGroup.EARLYGAME))); + Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_tuff"), new BlockItem(COBBLED_TUFF, new Item.Settings().group(ModItemGroup.EARLYGAME))); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_andesite"), COBBLED_ANDESITE); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_diorite"), COBBLED_DIORITE); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_granite"), COBBLED_GRANITE); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_calcite"), COBBLED_CALCITE); + Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_tuff"), COBBLED_TUFF); // stick Registry.register(Registry.BLOCK, new Identifier("earlygame", "stick_twig"), STICK_TWIG_BLOCK); diff --git a/src/main/java/jayceecreates/earlygame/init/ItemsInit.java b/src/main/java/jayceecreates/earlygame/init/ItemsInit.java index bf103a7..df8d16d 100755 --- a/src/main/java/jayceecreates/earlygame/init/ItemsInit.java +++ b/src/main/java/jayceecreates/earlygame/init/ItemsInit.java @@ -28,6 +28,9 @@ public class ItemsInit { public static final Item ANDESITE_STONE_ROCK = new BlockItem(BlocksInit.ANDESITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); public static final Item DIORITE_STONE_ROCK = new BlockItem(BlocksInit.DIORITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); public static final Item GRANITE_STONE_ROCK = new BlockItem(BlocksInit.GRANITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); + public static final Item DEEPSLATE_STONE_ROCK = new BlockItem(BlocksInit.DEEPSLATE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); + public static final Item CALCITE_STONE_ROCK = new BlockItem(BlocksInit.CALCITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); + public static final Item TUFF_STONE_ROCK = new BlockItem(BlocksInit.TUFF_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); public static final Item SANDSTONE_ROCK = new BlockItem(BlocksInit.SANDSTONE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); public static final Item RED_SANDSTONE_ROCK = new BlockItem(BlocksInit.RED_SANDSTONE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME)); diff --git a/src/main/resources/assets/earlygame/blockstates/andesite_cobblestone.json b/src/main/resources/assets/earlygame/blockstates/andesite_cobblestone.json deleted file mode 100644 index 40fb9db..0000000 --- a/src/main/resources/assets/earlygame/blockstates/andesite_cobblestone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "earlygame:block/andesite_cobblestone" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/calcite_rock_block.json b/src/main/resources/assets/earlygame/blockstates/calcite_rock_block.json new file mode 100644 index 0000000..03de4a1 --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/calcite_rock_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/calcite_rock_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/cobbled_andesite.json b/src/main/resources/assets/earlygame/blockstates/cobbled_andesite.json new file mode 100644 index 0000000..6782114 --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/cobbled_andesite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/cobbled_andesite" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/cobbled_calcite.json b/src/main/resources/assets/earlygame/blockstates/cobbled_calcite.json new file mode 100644 index 0000000..094b3d7 --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/cobbled_calcite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/cobbled_calcite" + } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/cobbled_diorite.json b/src/main/resources/assets/earlygame/blockstates/cobbled_diorite.json new file mode 100644 index 0000000..c0629a7 --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/cobbled_diorite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/cobbled_diorite" + } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/cobbled_granite.json b/src/main/resources/assets/earlygame/blockstates/cobbled_granite.json new file mode 100644 index 0000000..8c11154 --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/cobbled_granite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/cobbled_granite" + } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/cobbled_tuff.json b/src/main/resources/assets/earlygame/blockstates/cobbled_tuff.json new file mode 100644 index 0000000..8b62ef5 --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/cobbled_tuff.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/cobbled_tuff" + } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/deepslate_rock_block.json b/src/main/resources/assets/earlygame/blockstates/deepslate_rock_block.json new file mode 100644 index 0000000..7919520 --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/deepslate_rock_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/deepslate_rock_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/diorite_cobblestone.json b/src/main/resources/assets/earlygame/blockstates/diorite_cobblestone.json deleted file mode 100644 index cb0bf19..0000000 --- a/src/main/resources/assets/earlygame/blockstates/diorite_cobblestone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "earlygame:block/diorite_cobblestone" - } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/granite_cobblestone.json b/src/main/resources/assets/earlygame/blockstates/granite_cobblestone.json deleted file mode 100644 index f6650de..0000000 --- a/src/main/resources/assets/earlygame/blockstates/granite_cobblestone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "earlygame:block/granite_cobblestone" - } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/blockstates/tuff_rock_block.json b/src/main/resources/assets/earlygame/blockstates/tuff_rock_block.json new file mode 100644 index 0000000..6b9c22d --- /dev/null +++ b/src/main/resources/assets/earlygame/blockstates/tuff_rock_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "earlygame:block/tuff_rock_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/lang/en_us.json b/src/main/resources/assets/earlygame/lang/en_us.json index 50d777e..3cec150 100755 --- a/src/main/resources/assets/earlygame/lang/en_us.json +++ b/src/main/resources/assets/earlygame/lang/en_us.json @@ -130,11 +130,16 @@ "block.earlygame.andesite_rock_block": "Andesite Rock", "block.earlygame.diorite_rock_block": "Diorite Rock", "block.earlygame.granite_rock_block": "Granite Rock", + "block.earlygame.deepslate_rock_block": "Deepslate Rock", + "block.earlygame.calcite_rock_block": "Calcite Rock", + "block.earlygame.tuff_rock_block": "Tuff Rock", "block.earlygame.sandstone_rock_block": "Sandstone Rock", "block.earlygame.red_sandstone_rock_block": "Red Sandstone Rock", - "block.earlygame.andesite_cobblestone": "Andesite Cobblestone", - "block.earlygame.diorite_cobblestone": "Diorite Cobblestone", - "block.earlygame.granite_cobblestone": "Granite Cobblestone", + "block.earlygame.cobbled_andesite": "Cobbled Andesite", + "block.earlygame.cobbled_diorite": "Cobbled Diorite", + "block.earlygame.cobbled_granite": "Cobbled Granite", + "block.earlygame.cobbled_calcite": "Cobbled Calcite", + "block.earlygame.cobbled_tuff": "Cobbled Tuff", "itemGroup.earlygame.eggroup": "EarlyGame" } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/calcite_rock_block.json b/src/main/resources/assets/earlygame/models/block/calcite_rock_block.json new file mode 100644 index 0000000..0160938 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/block/calcite_rock_block.json @@ -0,0 +1,6 @@ +{ + "parent": "earlygame:block/rock_block", + "textures": { + "all": "minecraft:block/calcite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/andesite_cobblestone.json b/src/main/resources/assets/earlygame/models/block/cobbled_andesite.json similarity index 55% rename from src/main/resources/assets/earlygame/models/block/andesite_cobblestone.json rename to src/main/resources/assets/earlygame/models/block/cobbled_andesite.json index 782e65b..ca2fa76 100644 --- a/src/main/resources/assets/earlygame/models/block/andesite_cobblestone.json +++ b/src/main/resources/assets/earlygame/models/block/cobbled_andesite.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "earlygame:block/andesite_cobblestone" + "all": "earlygame:block/cobbled_andesite" } } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/granite_cobblestone.json b/src/main/resources/assets/earlygame/models/block/cobbled_calcite.json similarity index 58% rename from src/main/resources/assets/earlygame/models/block/granite_cobblestone.json rename to src/main/resources/assets/earlygame/models/block/cobbled_calcite.json index 87f5797..4d49ebf 100644 --- a/src/main/resources/assets/earlygame/models/block/granite_cobblestone.json +++ b/src/main/resources/assets/earlygame/models/block/cobbled_calcite.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "earlygame:block/granite_cobblestone" + "all": "earlygame:block/cobbled_calcite" } } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/diorite_cobblestone.json b/src/main/resources/assets/earlygame/models/block/cobbled_diorite.json similarity index 58% rename from src/main/resources/assets/earlygame/models/block/diorite_cobblestone.json rename to src/main/resources/assets/earlygame/models/block/cobbled_diorite.json index 8bb20bc..59c9c72 100644 --- a/src/main/resources/assets/earlygame/models/block/diorite_cobblestone.json +++ b/src/main/resources/assets/earlygame/models/block/cobbled_diorite.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "earlygame:block/diorite_cobblestone" + "all": "earlygame:block/cobbled_diorite" } } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/cobbled_granite.json b/src/main/resources/assets/earlygame/models/block/cobbled_granite.json new file mode 100644 index 0000000..63e15d7 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/block/cobbled_granite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "earlygame:block/cobbled_granite" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/cobbled_tuff.json b/src/main/resources/assets/earlygame/models/block/cobbled_tuff.json new file mode 100644 index 0000000..89c503f --- /dev/null +++ b/src/main/resources/assets/earlygame/models/block/cobbled_tuff.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "earlygame:block/cobbled_tuff" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/deepslate_rock_block.json b/src/main/resources/assets/earlygame/models/block/deepslate_rock_block.json new file mode 100644 index 0000000..7c7ad7c --- /dev/null +++ b/src/main/resources/assets/earlygame/models/block/deepslate_rock_block.json @@ -0,0 +1,6 @@ +{ + "parent": "earlygame:block/rock_block", + "textures": { + "all": "minecraft:block/deepslate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/block/tuff_rock_block.json b/src/main/resources/assets/earlygame/models/block/tuff_rock_block.json new file mode 100644 index 0000000..75226a3 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/block/tuff_rock_block.json @@ -0,0 +1,6 @@ +{ + "parent": "earlygame:block/rock_block", + "textures": { + "all": "minecraft:block/tuff" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/andesite_cobblestone.json b/src/main/resources/assets/earlygame/models/item/andesite_cobblestone.json deleted file mode 100644 index dee275c..0000000 --- a/src/main/resources/assets/earlygame/models/item/andesite_cobblestone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "earlygame:block/andesite_cobblestone" -} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/calcite_rock.json b/src/main/resources/assets/earlygame/models/item/calcite_rock.json new file mode 100644 index 0000000..1e87db5 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/calcite_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "earlygame:item/calcite_rock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/cobbled_andesite.json b/src/main/resources/assets/earlygame/models/item/cobbled_andesite.json new file mode 100644 index 0000000..f02782e --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/cobbled_andesite.json @@ -0,0 +1,3 @@ +{ + "parent": "earlygame:block/cobbled_andesite" +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/cobbled_calcite.json b/src/main/resources/assets/earlygame/models/item/cobbled_calcite.json new file mode 100644 index 0000000..81a7f12 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/cobbled_calcite.json @@ -0,0 +1,3 @@ +{ + "parent": "earlygame:block/cobbled_calcite" + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/cobbled_diorite.json b/src/main/resources/assets/earlygame/models/item/cobbled_diorite.json new file mode 100644 index 0000000..8c0c446 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/cobbled_diorite.json @@ -0,0 +1,3 @@ +{ + "parent": "earlygame:block/cobbled_diorite" + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/cobbled_granite.json b/src/main/resources/assets/earlygame/models/item/cobbled_granite.json new file mode 100644 index 0000000..cae2deb --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/cobbled_granite.json @@ -0,0 +1,3 @@ +{ + "parent": "earlygame:block/cobbled_granite" + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/cobbled_tuff.json b/src/main/resources/assets/earlygame/models/item/cobbled_tuff.json new file mode 100644 index 0000000..08672eb --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/cobbled_tuff.json @@ -0,0 +1,3 @@ +{ + "parent": "earlygame:block/cobbled_tuff" + } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/deepslate_rock.json b/src/main/resources/assets/earlygame/models/item/deepslate_rock.json new file mode 100644 index 0000000..ece5665 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/deepslate_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "earlygame:item/deepslate_rock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/diorite_cobblestone.json b/src/main/resources/assets/earlygame/models/item/diorite_cobblestone.json deleted file mode 100644 index 108af6c..0000000 --- a/src/main/resources/assets/earlygame/models/item/diorite_cobblestone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "earlygame:block/diorite_cobblestone" - } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/granite_cobblestone.json b/src/main/resources/assets/earlygame/models/item/granite_cobblestone.json deleted file mode 100644 index 95c19b0..0000000 --- a/src/main/resources/assets/earlygame/models/item/granite_cobblestone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "earlygame:block/granite_cobblestone" - } \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/models/item/tuff_rock.json b/src/main/resources/assets/earlygame/models/item/tuff_rock.json new file mode 100644 index 0000000..2a40e91 --- /dev/null +++ b/src/main/resources/assets/earlygame/models/item/tuff_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "earlygame:item/tuff_rock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/earlygame/textures/block/andesite_cobblestone.png b/src/main/resources/assets/earlygame/textures/block/cobbled_andesite.png similarity index 100% rename from src/main/resources/assets/earlygame/textures/block/andesite_cobblestone.png rename to src/main/resources/assets/earlygame/textures/block/cobbled_andesite.png diff --git a/src/main/resources/assets/earlygame/textures/block/cobbled_calcite.png b/src/main/resources/assets/earlygame/textures/block/cobbled_calcite.png new file mode 100644 index 0000000000000000000000000000000000000000..2119d941e1b64e500ffc765ed99fd044881662d6 GIT binary patch literal 1245 zcmV<31S0#1P)*%&}98a5#$ zY#b?;Na8BLC6!;Dyg2y-DOV*Gt8B*@*=RQ~3_>gdW`@~v(aUsK_nmvcKIbTB@82b+ z7E>(ODDM_{^T(eQcde&=wSIuRTCxcO_79&k8QGNf>cruOlH4z5Gt|&ulF1cO6^)y_ zK7~S_Zs#1UQpZf2L~+FF>5pU#gV}tHecNMlf6u@k5hpQvCXDSXP5K5`}m!A7P9?Cj)t{rVMIStmkJsg@bfmZZ~ZPEOk> zp^M<4YAK;fvDpNu&E_*2hlixiyu9_8e6dKyD&qP9|8=_DTzw^z$?!1xhNkN%fy>3$ zbGqFN7V{-~yZs8^cS)(A@B}|sD6n*W647NlWha{xWSdPCQ!16{U0&1ad?A-N`Q_K2 z(TDv@6f=jeYlKp?RoM4j9v5@6xg4$55sIE7ibBpld}Jo~&E`IVXp;m!`u$|Wbbih8 z_b+LP@3uW;`naH#HO2oJGy^lcLt4`r4Eh+RDH+J)MG9_&5R4p7PTK76RmFiN^YtUO zl7&57$s6ZScIjfDuA3~EOTK$?Bm~b1l!VUNKj?<0;W#65*%T9@QAFj7+iOYPh?V?M z+uI{6BF2%2RmidQJ#lT#v@BB6uv97&2BEmSwKvQEJx7>rMxIy400000NkvXX Hu0mjfevnyX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/earlygame/textures/block/diorite_cobblestone.png b/src/main/resources/assets/earlygame/textures/block/cobbled_diorite.png similarity index 100% rename from src/main/resources/assets/earlygame/textures/block/diorite_cobblestone.png rename to src/main/resources/assets/earlygame/textures/block/cobbled_diorite.png diff --git a/src/main/resources/assets/earlygame/textures/block/granite_cobblestone.png b/src/main/resources/assets/earlygame/textures/block/cobbled_granite.png similarity index 100% rename from src/main/resources/assets/earlygame/textures/block/granite_cobblestone.png rename to src/main/resources/assets/earlygame/textures/block/cobbled_granite.png diff --git a/src/main/resources/assets/earlygame/textures/block/cobbled_tuff.png b/src/main/resources/assets/earlygame/textures/block/cobbled_tuff.png new file mode 100644 index 0000000000000000000000000000000000000000..9f821d09c0cd58dd61c37731b013d30137db4f68 GIT binary patch literal 1296 zcmV+r1@HQaP)IhZ!J!U1V;4%GThb&advkKKoaFc` zcmIq3{NCkxeVI(kGlNkQQ%RC@Nq+zB8M^9Ht2g=ahwpKf2*un!2M6yc7RoFvWq9<} z2CsKtVObT_h57mIsp$n&O`%e;U|>@$RoHs`E$MWMe8FPp#S7Y-fUr-K^nChL$61(Zp$Gb!@((r5kQMY zOwRM?Y^>fP`~H;Su#e*Flg++mFc_lgDwmf%+<{Jfe2hfGhdVU+Z*N}?sVI&(NK8)f z^5tJdA`$Matdd?{BA+jy8#;DtNZ8bP`1KdW$3DR)Q9sKh*xY(Tzb|4BzuDv@XYqJz zlS1i&v*SIQVmmf=ovza-6x3K-TOlW17)FngkubqPh`)DtnVn0axvq;cZ1dC4zc7_p z;P%aw#Bez{I>9vfsPcSg7hM}*hQll`-QbVsuc%lB0?BE#4@Y}=YD7NhICh=$Tu!2d zsW%!p5+P{%NTm|^&1?L*^9&CI&%5dgq2Nckw0m4u^E`O4iV-l#U6gs7Jwa6zW|DE% z*Y4Bp3~4t@%+JnIEmsA1gMlZ4f>t&C%J$97A~ne!5U!p(!0$KdID&2H(d$VM(J=Y* zJZ;;d*{CozJx^+Jf}^7>+G6?^R;iAp#j3QKo*bu8DA8&Uz_Vo&Eo{f3>-y;SZK0qN z4k?tX4I!36NvD$Nx<=FXaN0H}r{^>->!cTF1>KjDJ=*8sy%+6=ETcxe^(j$LCcKFYi78NMgqZF*L< zhR^e)Je}ptU9yM!AKzE2i^t;9M~(f1EUpxqxxGP4aG$(C6afui=GKyD2K=&jN0xO% zR;Hl{cZUv!*Cm5aQ7bIAWZ>VN}Ts8Ol_0000_|iVqh9w2Ho~YA}~cH@z(xBH$_HuAw+Fu>WsVN?Ck8voS8Yj zb7Bs=S=Syoa1Q5ro_U}5eFix0l}QVjdvH(Ivbgw|M^S`0ju6E$R+g6}E(I;WTo*^> zZwC(-9`P%eujA)V8MeKTo0HRMw_7}pVr*=z9}(&jn4e$ZHzsc3?YlP^J70o%GKY_! zwqWQ6ip3JzL5ttLbH7WZr?UbUhVcD5fiFNePN26}!P&wvbj^V0xlri7_G*cDa-_iQ z>>R&#bsT=94i*IP>mF)Es?}VmnhwSoCdMZbh76tkk^)}6Mr2@%nPQ8}>b z&B31aM>JhsBUxR0!8Pi*+GoP`Eac50WVH-vdf2ziNgmK_HSzSxGs!y=jFr{ryhXs_ zp)phse+iOC_Ur=-=SGWoy}2nkX%hb#1%V@8mwF S(B6Om0000?Fvd`+JnXIGHP-(G#o`^y<=N>AHakKgZmUg%+HMbc(QGy&5{VS_1c-w literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/earlygame/textures/item/tuff_rock.png b/src/main/resources/assets/earlygame/textures/item/tuff_rock.png new file mode 100644 index 0000000000000000000000000000000000000000..2d152e76e3bbb528ed5155f63a3a82dc4bd2c284 GIT binary patch literal 933 zcmV;W16urvP)Q&s8*U4-vasoWcb#D5c4A3hL^ z^WozsesqWI)m!wfo~-?dIU|E{!T1Fq*bb#q2~E=?8BqyBQ5YS1lrH5^VhZj+quuUE zK$^IO-@Ja6>1mbs+uL+|gGqqr9&+Q>0zEmtIKC|Z9LB7MrYA}1IvX2RbX~=l{c(nW z0Aq8#zp^4dFoRG+T*t#KiogMBhEwQz^`CnI#&F9JEM