From 20e4d0afd041592f034fe2dcc68db6e414beddfa Mon Sep 17 00:00:00 2001 From: UnRealDinnerbone Date: Tue, 23 Apr 2024 21:26:05 -0500 Subject: [PATCH] Fix Neo --- CHANGELOG.md | 4 ++-- build.gradle | 5 +++++ .../trenzalore/TrenzaloreNeoRegistry.java | 14 +++++++++++++- .../META-INF/{mods.toml => neoforge.mods.toml} | 0 4 files changed, 20 insertions(+), 3 deletions(-) rename neo/src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13d06e7..5bb2100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -### 5.0.0 +### 5.0.1 -- Update to 1.20.5 \ No newline at end of file +- Fix NeoForge \ No newline at end of file diff --git a/build.gradle b/build.gradle index ebec17e..73023f0 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,11 @@ multiLoader.root() { splitSources.set(true) convertAccessWidener.set(true) accessWidenerFile.set(project(":common").file("src/main/resources/${mod_id}.accesswidener")) + + def get = filesToExpand.get() + def newList = new ArrayList<>(get) + newList.add("META-INF/neoforge.mods.toml") + filesToExpand.set(newList) } allprojects { diff --git a/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java b/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java index ed8ee05..e62dbe1 100644 --- a/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java +++ b/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java @@ -2,25 +2,37 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.PrimitiveCodec; import com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry; import com.unrealdinnerbone.trenzalore.api.registry.Regeneration; import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry; import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; import com.unrealdinnerbone.trenzalore.events.AddItemModifier; import com.unrealdinnerbone.trenzalore.events.ReplaceItemModifier; +import net.minecraft.core.Registry; +import net.minecraft.core.component.DataComponentType; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BeehiveBlockEntity; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.fml.loading.FMLLoader; +import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.common.loot.IGlobalLootModifier; import net.neoforged.neoforge.registries.NeoForgeRegistries; import java.util.List; +import java.util.function.UnaryOperator; public class TrenzaloreNeoRegistry implements IRegistry { private static final RegistryObjects> GLOBAL_LOOT_MODIFIERS = Regeneration.create(NeoForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS); public static final RegistryEntry> SIMPLE_LOOT_MODIFIER = GLOBAL_LOOT_MODIFIERS.register("replace", () -> ReplaceItemModifier.CODEC); public static final RegistryEntry> ADD_ITEM_MODIFIER = GLOBAL_LOOT_MODIFIERS.register("add", () -> AddItemModifier.CODEC); + @Override public List> getRegistryObjects() { - return List.of(); + return List.of(GLOBAL_LOOT_MODIFIERS); } @Override diff --git a/neo/src/main/resources/META-INF/mods.toml b/neo/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from neo/src/main/resources/META-INF/mods.toml rename to neo/src/main/resources/META-INF/neoforge.mods.toml