diff --git a/gradle.properties b/gradle.properties index e20f18d..8c9726b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,12 +7,12 @@ org.gradle.configuration-cache=false # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.1-rc-3 +minecraft_version=26.1 loader_version=0.18.4 loom_version=1.15-SNAPSHOT # Mod Properties -mod_version=26.1-rc-3 +mod_version=26.1.0 maven_group=de.jottyfan.minecraft archives_base_name=quickly diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index 92ca7d8..95f7a00 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -27,6 +27,7 @@ public class QuicklyItems { public static final Item COTTON = registerItem(ID.COTTON); public static final Item COTTONPLANT = registerItem(ID.COTTONPLANT); public static final Item COTTONSEED = registerItem(ID.COTTONSEED, QIP.of(ID.BLOCKCOTTONPLANT), Plant::new); + public static final Item PILLOW = registerItem(ID.PILLOW); public static final Item CANOLA = registerItem(ID.CANOLA); public static final Item CANOLAPLANT = registerItem(ID.CANOLAPLANT); public static final Item CANOLASEED = registerItem(ID.CANOLASEED, QIP.of(ID.BLOCKCANOLAPLANT), Plant::new); @@ -108,6 +109,7 @@ public class QuicklyItems { set.add(TURQUOISEINGOT); set.add(COTTON); set.add(COTTONSEED); + set.add(PILLOW); set.add(CANOLA); set.add(CANOLASEED); set.add(CANOLABOTTLE); diff --git a/src/main/java/de/jottyfan/minecraft/name/ID.java b/src/main/java/de/jottyfan/minecraft/name/ID.java index 48664cd..b5ecb81 100644 --- a/src/main/java/de/jottyfan/minecraft/name/ID.java +++ b/src/main/java/de/jottyfan/minecraft/name/ID.java @@ -16,6 +16,7 @@ public class ID { public static final Identifier COTTON = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "cotton"); public static final Identifier COTTONPLANT = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "cottonplant"); public static final Identifier COTTONSEED = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "cottonseed"); + public static final Identifier PILLOW = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "pillow"); public static final Identifier CANOLA = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "canola"); public static final Identifier CANOLAPLANT = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "canolaplant"); public static final Identifier CANOLASEED = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "canolaseed"); diff --git a/src/main/resources/assets/quickly/items/pillow.json b/src/main/resources/assets/quickly/items/pillow.json new file mode 100644 index 0000000..8d82675 --- /dev/null +++ b/src/main/resources/assets/quickly/items/pillow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/pillow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/lang/de_de.json b/src/main/resources/assets/quickly/lang/de_de.json index 66b7cd6..3ce420e 100644 --- a/src/main/resources/assets/quickly/lang/de_de.json +++ b/src/main/resources/assets/quickly/lang/de_de.json @@ -38,6 +38,7 @@ "item.quickly.oresulfor": "Schwefelgestein", "item.quickly.oreturquoise": "Türkiserz", "item.quickly.oxidizedcopperpowder": "oxidiertes Kupferpulver", + "item.quickly.pillow": "Kissen", "item.quickly.potatostack": "Kartoffelbündel", "item.quickly.quickieingot": "Eilpulverbarren", "item.quickly.quickiepowder": "Eilpulver", diff --git a/src/main/resources/assets/quickly/lang/en_us.json b/src/main/resources/assets/quickly/lang/en_us.json index 47225a9..5ac03cf 100644 --- a/src/main/resources/assets/quickly/lang/en_us.json +++ b/src/main/resources/assets/quickly/lang/en_us.json @@ -38,6 +38,7 @@ "item.quickly.oresulfor": "sulfor stone", "item.quickly.oreturquoise": "turquoise ore", "item.quickly.oxidizedcopperpowder": "oxidized copper powder", + "item.quickly.pillow": "pillow", "item.quickly.potatostack": "potato bundle", "item.quickly.quickieingot": "quickie powder ingot", "item.quickly.quickiepowder": "quickie powder", diff --git a/src/main/resources/assets/quickly/models/item/pillow.json b/src/main/resources/assets/quickly/models/item/pillow.json new file mode 100644 index 0000000..cfe3ff2 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/pillow.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/pillow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/textures/item/pillow.png b/src/main/resources/assets/quickly/textures/item/pillow.png new file mode 100644 index 0000000..62a32b2 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/pillow.png differ diff --git a/src/main/resources/data/quickly/recipe/shaped_bed.json b/src/main/resources/data/quickly/recipe/shaped_bed.json new file mode 100644 index 0000000..cf3186f --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shaped_bed.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ppp", + "www" + ], + "key": { + "p": "quickly:pillow", + "w": "#minecraft:planks" + }, + "result": { + "id": "minecraft:white_bed", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_pillow.json b/src/main/resources/data/quickly/recipe/shapeless_pillow.json new file mode 100644 index 0000000..5b2a5af --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_pillow.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickly:cotton", + "quickly:cotton", + "quickly:cotton", + "quickly:cotton" + ], + "result": { + "id": "quickly:pillow", + "count": 1 + } +} \ No newline at end of file