From 93d24525de4f84354389742565170d5f45fe8bd0 Mon Sep 17 00:00:00 2001 From: UnRealDinnerbone Date: Mon, 9 Dec 2024 21:39:08 -0600 Subject: [PATCH] Update to Minecraft 1.21.4 --- .gitignore | 4 ++++ CHANGELOG.md | 4 ++-- build.gradle | 4 ++-- .../24c604e7361a982a2bea871667e98f34c4afb7b4 | 2 -- .../5f92cc5f07a04d6b08018da612581f5847c7730f | 2 -- .../ccb9750293d453e5da7df32d4b120b6afcf6304e | 2 -- .../resources/assets/jags/items/grass_seed.json | 6 ++++++ common/src/generated/resources/pack.mcmeta | 2 +- .../com/unrealdinnerbone/jags/JAGSRegistry.java | 11 +++++++---- .../unrealdinnerbone/jags/item/GrassSeed.java | 11 +++-------- .../jags/client}/JAGSFabricData.java | 15 ++------------- .../jags/client}/JAGSModelProvider.java | 13 ++++++++----- .../jags/data/LangProvider.java | 2 +- .../jags/events/LootEvents.java | 7 ++++--- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- neo/build.gradle | 5 ++++- .../e16c144a59e517567359707d46e1bf777661f6a5 | 3 --- .../data/jags/loot_modifiers/grass_seed.json | 2 +- .../data/jags/loot_modifiers/tall_grass.json | 17 +++++++++++++++++ .../loot_modifiers/global_loot_modifiers.json | 1 + .../java/com/unrealdinnerbone/jags/JAGSNeo.java | 2 +- .../jags/data/LootModifierGenerator.java | 4 +++- 24 files changed, 75 insertions(+), 60 deletions(-) delete mode 100644 common/src/generated/resources/.cache/24c604e7361a982a2bea871667e98f34c4afb7b4 delete mode 100644 common/src/generated/resources/.cache/5f92cc5f07a04d6b08018da612581f5847c7730f delete mode 100644 common/src/generated/resources/.cache/ccb9750293d453e5da7df32d4b120b6afcf6304e create mode 100644 common/src/generated/resources/assets/jags/items/grass_seed.json rename fabric/src/{main/java/com/unrealdinnerbone/jags/data => client/java/com/unrealdinnerbone/jags/client}/JAGSFabricData.java (63%) rename fabric/src/{main/java/com/unrealdinnerbone/jags/data => client/java/com/unrealdinnerbone/jags/client}/JAGSModelProvider.java (64%) delete mode 100644 neo/src/generated/resources/.cache/e16c144a59e517567359707d46e1bf777661f6a5 create mode 100644 neo/src/generated/resources/data/jags/loot_modifiers/tall_grass.json diff --git a/.gitignore b/.gitignore index 3aea925..3642c88 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,7 @@ run neo2/runs/ neo/runs/ + +fabric/runs/ + +common/src/generated/resources/.cache/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a2f5bd..5f71676 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -### 21.0.1 +### 21.4.0 -- Update to 1.21 \ No newline at end of file +- Update to 1.21.4 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 684ba0c..4dac1e0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id("dev.nanite.mlp") version("0.3.0") + id("dev.nanite.mlp") version("0.4.1") id("java-library") id("maven-publish") - id("me.modmuss50.mod-publish-plugin") version "0.3.0" + id("me.modmuss50.mod-publish-plugin") version "0.8.1" id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0' } diff --git a/common/src/generated/resources/.cache/24c604e7361a982a2bea871667e98f34c4afb7b4 b/common/src/generated/resources/.cache/24c604e7361a982a2bea871667e98f34c4afb7b4 deleted file mode 100644 index 082e7b5..0000000 --- a/common/src/generated/resources/.cache/24c604e7361a982a2bea871667e98f34c4afb7b4 +++ /dev/null @@ -1,2 +0,0 @@ -// 1.21 2024-06-25T22:30:50.7296409 JAGS/Model Definitions -ef70040dfdcdf375b77325c54ee743c93218d78e assets\jags\models\item\grass_seed.json diff --git a/common/src/generated/resources/.cache/5f92cc5f07a04d6b08018da612581f5847c7730f b/common/src/generated/resources/.cache/5f92cc5f07a04d6b08018da612581f5847c7730f deleted file mode 100644 index 29a79e5..0000000 --- a/common/src/generated/resources/.cache/5f92cc5f07a04d6b08018da612581f5847c7730f +++ /dev/null @@ -1,2 +0,0 @@ -// 1.21 2024-06-25T22:30:50.7286327 JAGS/Language (en_us) -f9e1b180c2fc09ee0181a49bf7aff3b1add94856 assets\jags\lang\en_us.json diff --git a/common/src/generated/resources/.cache/ccb9750293d453e5da7df32d4b120b6afcf6304e b/common/src/generated/resources/.cache/ccb9750293d453e5da7df32d4b120b6afcf6304e deleted file mode 100644 index 27d37d3..0000000 --- a/common/src/generated/resources/.cache/ccb9750293d453e5da7df32d4b120b6afcf6304e +++ /dev/null @@ -1,2 +0,0 @@ -// 1.21 2024-06-25T22:30:50.7297624 JAGS/Pack Metadata -229d4808938263015c7ff9eeba366dda673a748c pack.mcmeta diff --git a/common/src/generated/resources/assets/jags/items/grass_seed.json b/common/src/generated/resources/assets/jags/items/grass_seed.json new file mode 100644 index 0000000..1d54195 --- /dev/null +++ b/common/src/generated/resources/assets/jags/items/grass_seed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "jags:item/grass_seed" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/pack.mcmeta b/common/src/generated/resources/pack.mcmeta index c93ec4b..f5ce389 100644 --- a/common/src/generated/resources/pack.mcmeta +++ b/common/src/generated/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "jags", - "pack_format": 48 + "pack_format": 61 } } \ No newline at end of file diff --git a/common/src/main/java/com/unrealdinnerbone/jags/JAGSRegistry.java b/common/src/main/java/com/unrealdinnerbone/jags/JAGSRegistry.java index 57dbc5f..13fa8d8 100644 --- a/common/src/main/java/com/unrealdinnerbone/jags/JAGSRegistry.java +++ b/common/src/main/java/com/unrealdinnerbone/jags/JAGSRegistry.java @@ -1,7 +1,9 @@ package com.unrealdinnerbone.jags; import com.unrealdinnerbone.jags.item.GrassSeed; +import com.unrealdinnerbone.trenzalore.api.platform.services.ICreativeTabRegister; import com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry; +import com.unrealdinnerbone.trenzalore.api.registry.ItemRegistryObjects; import com.unrealdinnerbone.trenzalore.api.registry.Regeneration; import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry; import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; @@ -11,16 +13,17 @@ import java.util.Arrays; import java.util.List; +import java.util.function.UnaryOperator; public class JAGSRegistry implements IRegistry { - private static final RegistryObjects ITEMS = Regeneration.create(Registries.ITEM); + private static final ItemRegistryObjects ITEMS = Regeneration.createItemRegistry(JAGS.MOD_ID); - public static final RegistryEntry GRASS_SEED = ITEMS.register("grass_seed", GrassSeed::new); + public static final RegistryEntry GRASS_SEED = ITEMS.register("grass_seed", GrassSeed::new, UnaryOperator.identity()); @Override - public void afterRegistered() { - Regeneration.addItemsToCreateTab(CreativeTabs.TOOLS_AND_UTILITIES, List.of(GRASS_SEED)); + public void afterRegistered(ICreativeTabRegister register) { + register.addItemToCreativeTab(CreativeTabs.TOOLS_AND_UTILITIES, List.of(GRASS_SEED)); } @Override diff --git a/common/src/main/java/com/unrealdinnerbone/jags/item/GrassSeed.java b/common/src/main/java/com/unrealdinnerbone/jags/item/GrassSeed.java index 1b7b381..6f16046 100644 --- a/common/src/main/java/com/unrealdinnerbone/jags/item/GrassSeed.java +++ b/common/src/main/java/com/unrealdinnerbone/jags/item/GrassSeed.java @@ -1,6 +1,5 @@ package com.unrealdinnerbone.jags.item; -import com.unrealdinnerbone.jags.JAGSRegistry; import net.minecraft.sounds.SoundEvents; import net.minecraft.tags.BlockTags; import net.minecraft.world.InteractionResult; @@ -11,8 +10,8 @@ public class GrassSeed extends Item { - public GrassSeed() { - super(new Properties()); + public GrassSeed(Item.Properties properties) { + super(properties); } @Override @@ -24,11 +23,7 @@ public InteractionResult useOn(UseOnContext context) { if (!context.getPlayer().getAbilities().instabuild) { context.getItemInHand().shrink(1); } -// if(context.getPlayer() instanceof ServerPlayer serverPlayer) { -// JAGSRegistry.INSTANCE.trigger(serverPlayer); -// } - - return InteractionResult.sidedSuccess(context.getLevel().isClientSide()); + return InteractionResult.CONSUME; }else { return super.useOn(context); } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jags/data/JAGSFabricData.java b/fabric/src/client/java/com/unrealdinnerbone/jags/client/JAGSFabricData.java similarity index 63% rename from fabric/src/main/java/com/unrealdinnerbone/jags/data/JAGSFabricData.java rename to fabric/src/client/java/com/unrealdinnerbone/jags/client/JAGSFabricData.java index db0c482..775e28f 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jags/data/JAGSFabricData.java +++ b/fabric/src/client/java/com/unrealdinnerbone/jags/client/JAGSFabricData.java @@ -1,12 +1,11 @@ -package com.unrealdinnerbone.jags.data; +package com.unrealdinnerbone.jags.client; import com.unrealdinnerbone.jags.JAGS; +import com.unrealdinnerbone.jags.data.LangProvider; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -import net.minecraft.core.RegistrySetBuilder; import net.minecraft.data.metadata.PackMetadataGenerator; import net.minecraft.network.chat.Component; -import org.jetbrains.annotations.Nullable; public class JAGSFabricData implements DataGeneratorEntrypoint { @Override @@ -16,14 +15,4 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(LangProvider::new); pack.addProvider((output, registriesFuture) -> PackMetadataGenerator.forFeaturePack(output, Component.literal(JAGS.MOD_ID))); } - - @Override - public @Nullable String getEffectiveModId() { - return DataGeneratorEntrypoint.super.getEffectiveModId(); - } - - @Override - public void buildRegistry(RegistrySetBuilder registryBuilder) { - DataGeneratorEntrypoint.super.buildRegistry(registryBuilder); - } } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jags/data/JAGSModelProvider.java b/fabric/src/client/java/com/unrealdinnerbone/jags/client/JAGSModelProvider.java similarity index 64% rename from fabric/src/main/java/com/unrealdinnerbone/jags/data/JAGSModelProvider.java rename to fabric/src/client/java/com/unrealdinnerbone/jags/client/JAGSModelProvider.java index beb4d8c..a895752 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jags/data/JAGSModelProvider.java +++ b/fabric/src/client/java/com/unrealdinnerbone/jags/client/JAGSModelProvider.java @@ -1,11 +1,11 @@ -package com.unrealdinnerbone.jags.data; +package com.unrealdinnerbone.jags.client; import com.unrealdinnerbone.jags.JAGSRegistry; +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.models.BlockModelGenerators; -import net.minecraft.data.models.ItemModelGenerators; -import net.minecraft.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.model.ModelTemplates; public class JAGSModelProvider extends FabricModelProvider { @@ -15,10 +15,13 @@ public JAGSModelProvider(FabricDataOutput output) { @Override public void generateBlockStateModels(BlockModelGenerators blockStateModelGenerator) { + } @Override public void generateItemModels(ItemModelGenerators itemModelGenerator) { itemModelGenerator.generateFlatItem(JAGSRegistry.GRASS_SEED.get(), ModelTemplates.FLAT_ITEM); + } + } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jags/data/LangProvider.java b/fabric/src/main/java/com/unrealdinnerbone/jags/data/LangProvider.java index c1ec683..b9f2679 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jags/data/LangProvider.java +++ b/fabric/src/main/java/com/unrealdinnerbone/jags/data/LangProvider.java @@ -10,7 +10,7 @@ public class LangProvider extends FabricLanguageProvider { - protected LangProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + public LangProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { super(dataOutput, registryLookup); } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jags/events/LootEvents.java b/fabric/src/main/java/com/unrealdinnerbone/jags/events/LootEvents.java index 72901bb..ff39620 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jags/events/LootEvents.java +++ b/fabric/src/main/java/com/unrealdinnerbone/jags/events/LootEvents.java @@ -2,7 +2,7 @@ import com.unrealdinnerbone.jags.JAGSRegistry; import com.unrealdinnerbone.trenzalore.lib.RLUtils; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.fabricmc.fabric.api.loot.v3.LootTableEvents; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.entries.LootItem; @@ -13,10 +13,11 @@ public class LootEvents { private static final List GRASS_BLOCKS = List.of( - RLUtils.rl("minecraft", "blocks/grass"), + RLUtils.rl("minecraft", "blocks/short_grass"), RLUtils.rl("minecraft", "blocks/tall_grass")); + public static void init() { - LootTableEvents.MODIFY.register((key, tableBuilder, source) -> { + LootTableEvents.MODIFY.register((key, tableBuilder, source, registries) -> { if(GRASS_BLOCKS.contains(key.location())) { LootPool poolBuilder = LootPool.lootPool() .when(LootItemRandomChanceCondition.randomChance(0.1f)) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5778e78..38928c9 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "com.unrealdinnerbone.jags.JAGSFabric" ], "fabric-datagen": [ - "com.unrealdinnerbone.jags.data.JAGSFabricData" + "com.unrealdinnerbone.jags.client.JAGSFabricData" ] }, "depends": { diff --git a/gradle.properties b/gradle.properties index 45f3294..7b54765 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version=21.1.0 +mod_version=21.4.0 maven_group=com.unrealdinnerbone curse_id=517003 mod_name=JAGS @@ -8,18 +8,18 @@ mod_id=jags # Common -minecraft_version=1.21.1 +minecraft_version=1.21.4 # Forge #forge_version=49.0.13 -neo_version=21.1.50 +neo_version=21.4.12-beta -fabric_version=0.104.0+1.21.1 -fabric_loader_version=0.16.5 +fabric_version=0.111.0+1.21.4 +fabric_loader_version=0.16.9 # Other -trenzalore_version=6.1.1 +trenzalore_version=21.4.2 # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d18421..e48eca5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neo/build.gradle b/neo/build.gradle index b17f2a2..e187c53 100644 --- a/neo/build.gradle +++ b/neo/build.gradle @@ -8,7 +8,10 @@ multiLoader.neo() { publishing.publications.mavenJava.from components.java -sourceSets.main.resources { srcDir project(":common").file('src/generated/resources') } +sourceSets.main.resources { + srcDir project(":common").file('src/generated/resources') + srcDir project(":neo").file('src/generated/resources') +} dependencies { implementation("com.unrealdinnerbone:trenzalore-neo:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}") diff --git a/neo/src/generated/resources/.cache/e16c144a59e517567359707d46e1bf777661f6a5 b/neo/src/generated/resources/.cache/e16c144a59e517567359707d46e1bf777661f6a5 deleted file mode 100644 index 0e5b954..0000000 --- a/neo/src/generated/resources/.cache/e16c144a59e517567359707d46e1bf777661f6a5 +++ /dev/null @@ -1,3 +0,0 @@ -// 1.21 2024-06-25T22:39:16.2452038 Global Loot Modifiers : jags -f10890236be8678e0501cf7b383027a97beb1166 data/jags/loot_modifiers/grass_seed.json -9204bf120a97ab50f2560dc20160aa35b993be2e data/neoforge/loot_modifiers/global_loot_modifiers.json diff --git a/neo/src/generated/resources/data/jags/loot_modifiers/grass_seed.json b/neo/src/generated/resources/data/jags/loot_modifiers/grass_seed.json index 60ccc8a..4063a82 100644 --- a/neo/src/generated/resources/data/jags/loot_modifiers/grass_seed.json +++ b/neo/src/generated/resources/data/jags/loot_modifiers/grass_seed.json @@ -7,7 +7,7 @@ }, { "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:blocks/grass" + "loot_table_id": "minecraft:blocks/short_grass" } ], "table": { diff --git a/neo/src/generated/resources/data/jags/loot_modifiers/tall_grass.json b/neo/src/generated/resources/data/jags/loot_modifiers/tall_grass.json new file mode 100644 index 0000000..b561287 --- /dev/null +++ b/neo/src/generated/resources/data/jags/loot_modifiers/tall_grass.json @@ -0,0 +1,17 @@ +{ + "type": "trenzalore:add", + "conditions": [ + { + "chance": 0.1, + "condition": "minecraft:random_chance" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:blocks/tall_grass" + } + ], + "table": { + "count": 1, + "id": "jags:grass_seed" + } +} \ No newline at end of file diff --git a/neo/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/neo/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json index ddf8882..63181cc 100644 --- a/neo/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json +++ b/neo/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json @@ -1,5 +1,6 @@ { "entries": [ + "jags:tall_grass", "jags:grass_seed" ], "replace": false diff --git a/neo/src/main/java/com/unrealdinnerbone/jags/JAGSNeo.java b/neo/src/main/java/com/unrealdinnerbone/jags/JAGSNeo.java index 2f043c2..f355c44 100644 --- a/neo/src/main/java/com/unrealdinnerbone/jags/JAGSNeo.java +++ b/neo/src/main/java/com/unrealdinnerbone/jags/JAGSNeo.java @@ -13,7 +13,7 @@ public JAGSNeo(IEventBus eventBus) { eventBus.addListener(JAGSNeo::onData); } - private static void onData(GatherDataEvent event) { + private static void onData(GatherDataEvent.Server event) { event.getGenerator().addProvider(true, new LootModifierGenerator(event.getGenerator().getPackOutput(), event.getLookupProvider())); } } \ No newline at end of file diff --git a/neo/src/main/java/com/unrealdinnerbone/jags/data/LootModifierGenerator.java b/neo/src/main/java/com/unrealdinnerbone/jags/data/LootModifierGenerator.java index 396be4d..3f81d9a 100644 --- a/neo/src/main/java/com/unrealdinnerbone/jags/data/LootModifierGenerator.java +++ b/neo/src/main/java/com/unrealdinnerbone/jags/data/LootModifierGenerator.java @@ -24,7 +24,9 @@ public LootModifierGenerator(PackOutput packOutput, CompletableFuture