diff --git a/build.gradle b/build.gradle index 39ada1e..e182fa4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.11-SNAPSHOT' + id 'fabric-loom' version "${loom_version}" id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 4b3f74e..dfcff30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,13 +5,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=1.21.10 -yarn_mappings=1.21.10+build.2 -loader_version=0.17.3 +yarn_mappings=1.21.10+build.3 +loader_version=0.18.1 +loom_version=1.13-SNAPSHOT # Mod Properties -mod_version=1.21.10.0 +mod_version=1.21.10.1 maven_group=de.jottyfan.quickiemod archives_base_name=quickiemod # Dependencies -fabric_version=0.136.0+1.21.10 +fabric_version=0.138.3+1.21.10 diff --git a/src/main/java/de/jottyfan/quickiemod/block/ModBlocks.java b/src/main/java/de/jottyfan/quickiemod/block/ModBlocks.java index 6da0221..01e6286 100644 --- a/src/main/java/de/jottyfan/quickiemod/block/ModBlocks.java +++ b/src/main/java/de/jottyfan/quickiemod/block/ModBlocks.java @@ -33,6 +33,8 @@ public class ModBlocks { ModIdentifiers.BLOCK_SALPETER, 1.5f, 1.5f, new ItemStack[] { new ItemStack(ModItems.ITEM_SALPETER, 9) })); public static final Block BLOCK_SULFOR = registerBlock(ModIdentifiers.BLOCK_SULFOR, new BlockBreakByTool( ModIdentifiers.BLOCK_SULFOR, 1.5f, 1.5f, new ItemStack[] { new ItemStack(ModItems.ITEM_SULFOR, 9) })); + public static final Block BLOCK_TURQUOISE = registerBlock(ModIdentifiers.BLOCK_TURQUOISE, new BlockBreakByTool( + ModIdentifiers.BLOCK_TURQUOISE, 1.5f, 1.5f, new ItemStack[] { new ItemStack(ModItems.ITEM_TURQUOISEINGOT, 9) })); public static final Block BLOCK_MONSTERHOARDER = registerBlock(ModIdentifiers.BLOCK_MONSTERHOARDER, new BlockMonsterhoarder(ModIdentifiers.BLOCK_MONSTERHOARDER)); public static final Block BLOCK_LAVAHOARDER = registerBlock(ModIdentifiers.BLOCK_LAVAHOARDER, @@ -112,6 +114,7 @@ public class ModBlocks { blocks.add(BLOCK_SPEEDPOWDER); blocks.add(BLOCK_SALPETER); blocks.add(BLOCK_SULFOR); + blocks.add(BLOCK_TURQUOISE); blocks.add(BLOCK_MONSTERHOARDER); blocks.add(BLOCK_EMPTYLAVAHOARDER); blocks.add(BLOCK_LAVAHOARDER); diff --git a/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java b/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java index 9a8ba60..a7f1f64 100644 --- a/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java +++ b/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java @@ -55,6 +55,7 @@ public class ModIdentifiers { public static final Identifier BLOCK_SPEEDPOWDER = Identifier.of(Quickiemod.MOD_ID, "blockspeedpowder"); public static final Identifier BLOCK_SALPETER = Identifier.of(Quickiemod.MOD_ID, "blocksalpeter"); public static final Identifier BLOCK_SULFOR = Identifier.of(Quickiemod.MOD_ID, "blocksulphor"); + public static final Identifier BLOCK_TURQUOISE = Identifier.of(Quickiemod.MOD_ID, "blockturquoise"); public static final Identifier BLOCK_MONSTERHOARDER = Identifier.of(Quickiemod.MOD_ID, "monsterhoarder"); public static final Identifier BLOCK_LAVAHOARDER = Identifier.of(Quickiemod.MOD_ID, "lavahoarder"); public static final Identifier BLOCK_EMPTYLAVAHOARDER = Identifier.of(Quickiemod.MOD_ID, "emptylavahoarder"); diff --git a/src/main/resources/assets/quickiemod/blockstates/blockturquoise.json b/src/main/resources/assets/quickiemod/blockstates/blockturquoise.json new file mode 100644 index 0000000..1f852d7 --- /dev/null +++ b/src/main/resources/assets/quickiemod/blockstates/blockturquoise.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiemod:block/blockturquoise" + } + } +} diff --git a/src/main/resources/assets/quickiemod/items/blockturquoise.json b/src/main/resources/assets/quickiemod/items/blockturquoise.json new file mode 100644 index 0000000..d35ee74 --- /dev/null +++ b/src/main/resources/assets/quickiemod/items/blockturquoise.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickiemod:block/blockturquoise" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/lang/de_de.json b/src/main/resources/assets/quickiemod/lang/de_de.json index a92247f..8516cb9 100644 --- a/src/main/resources/assets/quickiemod/lang/de_de.json +++ b/src/main/resources/assets/quickiemod/lang/de_de.json @@ -89,6 +89,7 @@ "block.quickiemod.blocksulphor": "Schwefelblock", "block.quickiemod.blocksalpeter": "Salpeterblock", "block.quickiemod.blockspeedpowder": "Fluchtpulverblock", + "block.quickiemod.blockturquoise": "Türkisblock", "block.quickiemod.blockquickiepowder": "Eilpulverblock", "block.quickiemod.drill": "Bohrer", "block.quickiemod.drilleast": "Ost-Bohrer", diff --git a/src/main/resources/assets/quickiemod/lang/en_us.json b/src/main/resources/assets/quickiemod/lang/en_us.json index 34e034b..79018f1 100644 --- a/src/main/resources/assets/quickiemod/lang/en_us.json +++ b/src/main/resources/assets/quickiemod/lang/en_us.json @@ -89,6 +89,7 @@ "block.quickiemod.blocksulphor": "block of sulfur", "block.quickiemod.blocksalpeter": "block of salpeter", "block.quickiemod.blockspeedpowder": "block of speedpowder", + "block.quickiemod.blockturquoise": "block of turquoise", "block.quickiemod.blockquickiepowder": "block of hurrypowder", "block.quickiemod.drill": "drill", "block.quickiemod.drilleast": "east drill", diff --git a/src/main/resources/assets/quickiemod/models/block/blockturquoise.json b/src/main/resources/assets/quickiemod/models/block/blockturquoise.json new file mode 100644 index 0000000..24cf0cb --- /dev/null +++ b/src/main/resources/assets/quickiemod/models/block/blockturquoise.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickiemod:block/blockturquoise" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/models/item/blockturquoise.json b/src/main/resources/assets/quickiemod/models/item/blockturquoise.json new file mode 100644 index 0000000..7c5cf3c --- /dev/null +++ b/src/main/resources/assets/quickiemod/models/item/blockturquoise.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiemod:block/blockturquoise", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/textures/block/blockturquoise.png b/src/main/resources/assets/quickiemod/textures/block/blockturquoise.png new file mode 100644 index 0000000..40a4fda Binary files /dev/null and b/src/main/resources/assets/quickiemod/textures/block/blockturquoise.png differ diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index 09a73b3..99a3aa1 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -3,6 +3,7 @@ "values": [ "quickiemod:blocksulphor", "quickiemod:blocksalpeter", + "quickiemod:blockturquoise", "quickiemod:monsterhoarder", "quickiemod:lavahoarder", "quickiemod:emptylavahoarder", diff --git a/src/main/resources/data/quickiemod/recipe/shaped_blockturquoise.json b/src/main/resources/data/quickiemod/recipe/shaped_blockturquoise.json new file mode 100644 index 0000000..e6faafc --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/shaped_blockturquoise.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ttt", + "ttt", + "ttt" + ], + "key": { + "t": "quickiemod:turquoiseingot" + }, + "result": { + "id": "quickiemod:blockturquoise", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json b/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json index 6f93470..17c1a42 100644 --- a/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json +++ b/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "oqo", - "qtq", - "oqo" + "tct", + "clc", + "tct" ], "key": { - "o": "quickiemod:quickieingot", - "t": "minecraft:torch", - "q": "quickiemod:copperstub" + "t": "quickiemod:turquoiseingot", + "l": "minecraft:soul_lantern", + "c": "quickiemod:copperstub" }, "result": { "id": "quickiemod:monsterhoarder", diff --git a/src/main/resources/data/quickiemod/recipe/shapeless_turquoise.json b/src/main/resources/data/quickiemod/recipe/shapeless_turquoise.json new file mode 100644 index 0000000..e214b84 --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/shapeless_turquoise.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickiemod:blockturquoise" + ], + "result": { + "id": "quickiemod:turquoiseingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiemod/worldgen/placed_feature/oreturquoise.json b/src/main/resources/data/quickiemod/worldgen/placed_feature/oreturquoise.json index 8b594ac..a965538 100644 --- a/src/main/resources/data/quickiemod/worldgen/placed_feature/oreturquoise.json +++ b/src/main/resources/data/quickiemod/worldgen/placed_feature/oreturquoise.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 16 + "count": 8 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 97f7113..25cf006 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,7 +28,7 @@ "mixins": [ ], "depends": { - "fabricloader": ">=0.17.3", + "fabricloader": ">=0.18.1", "minecraft": "~1.21.10", "java": ">=21", "fabric-api": "*"