From 820eb91a5e2947582a4bc1d028d8cd7b5d1122a6 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Tue, 31 Dec 2024 15:31:54 +0100 Subject: [PATCH 1/4] 1.21.4 update --- build.gradle | 2 +- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../craemon/betterchromakey/datagen/ModModelProvider.java | 6 +++--- .../assets/betterchromakey/items/black_chroma_block.json | 6 ++++++ src/main/resources/fabric.mod.json | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/betterchromakey/items/black_chroma_block.json diff --git a/build.gradle b/build.gradle index 13b5799..ac1306c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index d5c512b..95d0b16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.1 loader_version=0.16.9 # Mod Properties -mod_version=1.0.1 +mod_version=1.0.2 maven_group=com.craemon.betterchromakey archives_base_name=betterchromakey # Dependencies -fabric_version=0.107.0+1.21.3 \ No newline at end of file +fabric_version=0.110.5+1.21.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/craemon/betterchromakey/datagen/ModModelProvider.java b/src/main/java/com/craemon/betterchromakey/datagen/ModModelProvider.java index 7e29412..b77c1a9 100644 --- a/src/main/java/com/craemon/betterchromakey/datagen/ModModelProvider.java +++ b/src/main/java/com/craemon/betterchromakey/datagen/ModModelProvider.java @@ -1,9 +1,9 @@ package com.craemon.betterchromakey.datagen; +import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; -import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.ItemModelGenerator; +import net.minecraft.client.data.ItemModelGenerator; +import net.minecraft.client.data.BlockStateModelGenerator; public class ModModelProvider extends FabricModelProvider { public ModModelProvider(FabricDataOutput output) { diff --git a/src/main/resources/assets/betterchromakey/items/black_chroma_block.json b/src/main/resources/assets/betterchromakey/items/black_chroma_block.json new file mode 100644 index 0000000..09f240c --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/black_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/black_chroma_block" + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 106b2d4..37a2b2c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ ], "depends": { "fabricloader": ">=0.16.9", - "minecraft": "~1.21.3", + "minecraft": "~1.21.4", "java": ">=21", "fabric-api": "*" }, From 3edf2bb09bfe2f2100ea9efbc74d6aaf48f3a6cd Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Tue, 31 Dec 2024 15:34:04 +0100 Subject: [PATCH 2/4] 1.21.4 update v2 electric boogaloo --- .../loot_table/blocks/black_chroma_block.json | 20 +++++++++++++++++++ .../loot_table/blocks/black_chroma_lamp.json | 20 +++++++++++++++++++ .../loot_table/blocks/blue_chroma_block.json | 20 +++++++++++++++++++ .../loot_table/blocks/blue_chroma_lamp.json | 20 +++++++++++++++++++ .../loot_table/blocks/green_chroma_block.json | 20 +++++++++++++++++++ .../loot_table/blocks/green_chroma_lamp.json | 20 +++++++++++++++++++ .../blocks/light_blue_chroma_block.json | 20 +++++++++++++++++++ .../blocks/light_blue_chroma_lamp.json | 20 +++++++++++++++++++ .../blocks/magenta_chroma_block.json | 20 +++++++++++++++++++ .../blocks/magenta_chroma_lamp.json | 20 +++++++++++++++++++ .../loot_table/blocks/red_chroma_block.json | 20 +++++++++++++++++++ .../loot_table/blocks/red_chroma_lamp.json | 20 +++++++++++++++++++ .../loot_table/blocks/replace_me_block.json | 20 +++++++++++++++++++ .../loot_table/blocks/replace_me_lamp.json | 20 +++++++++++++++++++ .../loot_table/blocks/white_chroma_block.json | 20 +++++++++++++++++++ .../loot_table/blocks/white_chroma_lamp.json | 20 +++++++++++++++++++ .../blocks/yellow_chroma_block.json | 20 +++++++++++++++++++ .../loot_table/blocks/yellow_chroma_lamp.json | 20 +++++++++++++++++++ .../items/black_chroma_lamp.json | 6 ++++++ .../items/blue_chroma_block.json | 6 ++++++ .../items/blue_chroma_lamp.json | 6 ++++++ .../items/green_chroma_block.json | 6 ++++++ .../items/green_chroma_lamp.json | 6 ++++++ .../items/light_blue_chroma_block.json | 6 ++++++ .../items/light_blue_chroma_lamp.json | 6 ++++++ .../items/magenta_chroma_block.json | 6 ++++++ .../items/magenta_chroma_lamp.json | 6 ++++++ .../items/red_chroma_block.json | 6 ++++++ .../items/red_chroma_lamp.json | 6 ++++++ .../items/replace_me_block.json | 6 ++++++ .../items/replace_me_lamp.json | 6 ++++++ .../items/white_chroma_block.json | 6 ++++++ .../items/white_chroma_lamp.json | 6 ++++++ .../items/yellow_chroma_block.json | 6 ++++++ .../items/yellow_chroma_lamp.json | 6 ++++++ 35 files changed, 462 insertions(+) create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_lamp.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_block.json create mode 100644 src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/black_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/blue_chroma_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/blue_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/green_chroma_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/green_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/light_blue_chroma_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/light_blue_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/magenta_chroma_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/magenta_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/red_chroma_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/red_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/replace_me_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/replace_me_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/white_chroma_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/white_chroma_lamp.json create mode 100644 src/main/resources/assets/betterchromakey/items/yellow_chroma_block.json create mode 100644 src/main/resources/assets/betterchromakey/items/yellow_chroma_lamp.json diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_block.json new file mode 100644 index 0000000..6691bd3 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:black_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_lamp.json new file mode 100644 index 0000000..901c40c --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/black_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:black_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_block.json new file mode 100644 index 0000000..8e3fd2a --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:blue_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_lamp.json new file mode 100644 index 0000000..60560a0 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/blue_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:blue_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_block.json new file mode 100644 index 0000000..2c2453e --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:green_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_lamp.json new file mode 100644 index 0000000..7aa5504 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/green_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:green_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_block.json new file mode 100644 index 0000000..d5bcb47 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:light_blue_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_lamp.json new file mode 100644 index 0000000..34b292c --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/light_blue_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:light_blue_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_block.json new file mode 100644 index 0000000..7f0579a --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:magenta_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_lamp.json new file mode 100644 index 0000000..fb67568 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/magenta_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:magenta_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_block.json new file mode 100644 index 0000000..5777317 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:red_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_lamp.json new file mode 100644 index 0000000..dfc5a08 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/red_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:red_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_block.json new file mode 100644 index 0000000..89565ae --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:replace_me_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_lamp.json new file mode 100644 index 0000000..5765fc0 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/replace_me_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:replace_me_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_block.json new file mode 100644 index 0000000..92f696e --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:white_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_lamp.json new file mode 100644 index 0000000..b4121b5 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/white_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:white_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_block.json b/src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_block.json new file mode 100644 index 0000000..1ef8985 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:yellow_chroma_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_lamp.json b/src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_lamp.json new file mode 100644 index 0000000..1caab13 --- /dev/null +++ b/src/main/generated/data/betterchromakey/loot_table/blocks/yellow_chroma_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterchromakey:yellow_chroma_lamp" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterchromakey/items/black_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/black_chroma_lamp.json new file mode 100644 index 0000000..774142b --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/black_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/black_chroma_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/blue_chroma_block.json b/src/main/resources/assets/betterchromakey/items/blue_chroma_block.json new file mode 100644 index 0000000..5bdf60d --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/blue_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/blue_chroma_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/blue_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/blue_chroma_lamp.json new file mode 100644 index 0000000..9d782b5 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/blue_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/blue_chroma_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/green_chroma_block.json b/src/main/resources/assets/betterchromakey/items/green_chroma_block.json new file mode 100644 index 0000000..e20f32d --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/green_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/green_chroma_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/green_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/green_chroma_lamp.json new file mode 100644 index 0000000..1ee8b62 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/green_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/green_chroma_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/light_blue_chroma_block.json b/src/main/resources/assets/betterchromakey/items/light_blue_chroma_block.json new file mode 100644 index 0000000..58dbdf2 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/light_blue_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/light_blue_chroma_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/light_blue_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/light_blue_chroma_lamp.json new file mode 100644 index 0000000..c8f1888 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/light_blue_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/light_blue_chroma_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/magenta_chroma_block.json b/src/main/resources/assets/betterchromakey/items/magenta_chroma_block.json new file mode 100644 index 0000000..3c3327e --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/magenta_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/magenta_chroma_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/magenta_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/magenta_chroma_lamp.json new file mode 100644 index 0000000..2dcca15 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/magenta_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/magenta_chroma_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/red_chroma_block.json b/src/main/resources/assets/betterchromakey/items/red_chroma_block.json new file mode 100644 index 0000000..880caf1 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/red_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/red_chroma_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/red_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/red_chroma_lamp.json new file mode 100644 index 0000000..01a753c --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/red_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/red_chroma_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/replace_me_block.json b/src/main/resources/assets/betterchromakey/items/replace_me_block.json new file mode 100644 index 0000000..838ea31 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/replace_me_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/replace_me_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/replace_me_lamp.json b/src/main/resources/assets/betterchromakey/items/replace_me_lamp.json new file mode 100644 index 0000000..ac86fef --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/replace_me_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/replace_me_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/white_chroma_block.json b/src/main/resources/assets/betterchromakey/items/white_chroma_block.json new file mode 100644 index 0000000..6484172 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/white_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/white_chroma_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/white_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/white_chroma_lamp.json new file mode 100644 index 0000000..114adf3 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/white_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/white_chroma_lamp" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/yellow_chroma_block.json b/src/main/resources/assets/betterchromakey/items/yellow_chroma_block.json new file mode 100644 index 0000000..e814dae --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/yellow_chroma_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/yellow_chroma_block" + } +} diff --git a/src/main/resources/assets/betterchromakey/items/yellow_chroma_lamp.json b/src/main/resources/assets/betterchromakey/items/yellow_chroma_lamp.json new file mode 100644 index 0000000..b32f457 --- /dev/null +++ b/src/main/resources/assets/betterchromakey/items/yellow_chroma_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "betterchromakey:item/yellow_chroma_lamp" + } +} From ecc746cae8df4015627dab8bfe454ce8e33b9c75 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 00:50:39 +0100 Subject: [PATCH 3/4] 1.21.5 Update --- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index ac1306c..371c41c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.9-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 95d0b16..084e446 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.1 -loader_version=0.16.9 +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 +loader_version=0.16.10 # Mod Properties -mod_version=1.0.2 +mod_version=1.0.3 maven_group=com.craemon.betterchromakey archives_base_name=betterchromakey # Dependencies -fabric_version=0.110.5+1.21.4 \ No newline at end of file +fabric_version=0.119.5+1.21.5 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f2..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From aaf318267140753e2b6287717afdf8de80131d97 Mon Sep 17 00:00:00 2001 From: Henning Raudzis <121398546+Craemon@users.noreply.github.com> Date: Tue, 17 Jun 2025 21:23:20 +0200 Subject: [PATCH 4/4] 1.0.4 - 1.21.6 --- gradle.properties | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 084e446..c2fd63d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,15 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.5 -yarn_mappings=1.21.5+build.1 -loader_version=0.16.10 +minecraft_version=1.21.6 +yarn_mappings=1.21.6+build.1 +loader_version=0.16.14 +loom_version=1.10-SNAPSHOT # Mod Properties -mod_version=1.0.3 +mod_version=1.0.4 maven_group=com.craemon.betterchromakey archives_base_name=betterchromakey # Dependencies -fabric_version=0.119.5+1.21.5 \ No newline at end of file +fabric_version=0.127.0+1.21.6 \ No newline at end of file