diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bb2100..6b5cc79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -### 5.0.1 +### 6.0.0 -- Fix NeoForge \ No newline at end of file +- Update to 1.21 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8a38666..94a613e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id("dev.nanite.mlp") version("0.1.8") + id("dev.nanite.mlp") version("0.1.10") id("java-library") id("maven-publish") id("me.modmuss50.mod-publish-plugin") version "0.3.0" @@ -54,8 +54,12 @@ subprojects { } repositories { maven { - name = "Creeperhost" - url = uri("https://maven.creeperhost.net/") + name = "NeoForge" + url = "https://maven.neoforged.net/" + } + maven { + name = "Fabric" + url = "https://maven.fabricmc.net/" } } tasks.withType(ProcessResources).configureEach { @@ -99,11 +103,6 @@ publishMods { modLoaders.add("fabric") } -// def forgeOptions = publishOptions { -// file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile } -// displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}" -// modLoaders.add("forge") -// } def neoOptions = publishOptions { file = project.provider { project(":neo").tasks.jar }.flatMap { it.archiveFile } @@ -125,10 +124,6 @@ publishMods { } } -// curseforge("curseforgeForge") { -// from(curseForgeOptions, forgeOptions) -// } - curseforge("curseforgeNeoForge") { from(curseForgeOptions, neoOptions) } diff --git a/common/src/main/java/com/unrealdinnerbone/trenzalore/Trenzalore.java b/common/src/main/java/com/unrealdinnerbone/trenzalore/Trenzalore.java index d59d535..869e36a 100644 --- a/common/src/main/java/com/unrealdinnerbone/trenzalore/Trenzalore.java +++ b/common/src/main/java/com/unrealdinnerbone/trenzalore/Trenzalore.java @@ -3,6 +3,8 @@ import com.unrealdinnerbone.trenzalore.api.platform.Services; import com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry; import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; +import com.unrealdinnerbone.trenzalore.lib.RLUtils; +import net.minecraft.resources.ResourceLocation; import java.util.List; import java.util.ServiceLoader; @@ -18,4 +20,8 @@ public static void init() { }); } + public static ResourceLocation rl(String value) { + return RLUtils.rl(MOD_ID, value); + } + } \ No newline at end of file diff --git a/common/src/main/java/com/unrealdinnerbone/trenzalore/api/platform/services/IPlatformHelper.java b/common/src/main/java/com/unrealdinnerbone/trenzalore/api/platform/services/IPlatformHelper.java index 30ce51c..474f66b 100644 --- a/common/src/main/java/com/unrealdinnerbone/trenzalore/api/platform/services/IPlatformHelper.java +++ b/common/src/main/java/com/unrealdinnerbone/trenzalore/api/platform/services/IPlatformHelper.java @@ -1,24 +1,13 @@ package com.unrealdinnerbone.trenzalore.api.platform.services; -import com.unrealdinnerbone.trenzalore.api.registry.Regeneration; import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; -import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceKey; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.portal.PortalInfo; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.Nullable; import java.nio.file.Path; import java.util.List; -import java.util.function.BiFunction; import java.util.function.Supplier; public interface IPlatformHelper { @@ -29,20 +18,10 @@ public interface IPlatformHelper { boolean isModLoaded(String modId); - @Nullable - @ApiStatus.Internal - Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo); - @ApiStatus.Internal void addItemToCreativeTab(ResourceKey tabResourceKey, List> item); @ApiStatus.Internal void registryRegistryObjects(String modId, RegistryObjects registryObjects); - @Deprecated(forRemoval = true) - @ApiStatus.ScheduledForRemoval(inVersion = "4.0.0") - default BlockEntityType createBlockEntityType(BiFunction creator, Block... validBlocks) { - return Regeneration.createBlockEntityType(creator, validBlocks); - } - } \ No newline at end of file diff --git a/common/src/main/java/com/unrealdinnerbone/trenzalore/lib/RLUtils.java b/common/src/main/java/com/unrealdinnerbone/trenzalore/lib/RLUtils.java new file mode 100644 index 0000000..20245f4 --- /dev/null +++ b/common/src/main/java/com/unrealdinnerbone/trenzalore/lib/RLUtils.java @@ -0,0 +1,14 @@ +package com.unrealdinnerbone.trenzalore.lib; + +import net.minecraft.resources.ResourceLocation; + +public class RLUtils +{ + public static ResourceLocation rl(String modId, String path) { + return ResourceLocation.fromNamespaceAndPath(modId, path); + } + + public static ResourceLocation rlFull(String namespaceAndPath) { + return ResourceLocation.tryParse(namespaceAndPath); + } +} diff --git a/fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java b/fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java index 1a31981..cefbdb2 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java +++ b/fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java @@ -3,35 +3,22 @@ import com.unrealdinnerbone.trenzalore.api.platform.services.IPlatformHelper; import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry; import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; -import net.fabricmc.fabric.api.dimension.v1.FabricDimensions; +import com.unrealdinnerbone.trenzalore.lib.RLUtils; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.advancements.CriterionTrigger; -import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.portal.PortalInfo; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.Nullable; import java.nio.file.Path; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.BiFunction; import java.util.function.Supplier; public class FabricPlatformHelper implements IPlatformHelper { @@ -67,15 +54,9 @@ public void registryRegistryObjects(String modId, RegistryObjects registr ResourceKey> registryKey = registryObjects.registryKey(); Registry registry = (Registry) BuiltInRegistries.REGISTRY.get(registryKey.location()); for (RegistryEntry object : registryObjects.objects()) { - ResourceLocation id = new ResourceLocation(modId, object.name()); + ResourceLocation id = RLUtils.rl(modId, object.name()); Registry.register(registry, id, object.get()); } } - @Override - @Nullable - public Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo) { - return FabricDimensions.teleport(entity, level, portalInfo); - } - } diff --git a/forge/build.gradle b/forge/build.gradle deleted file mode 100644 index 51e00c1..0000000 --- a/forge/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -multiLoader.forge() { - forgeVersion.set("${forge_version}") -} - -publishing.publications.mavenJava.artifact jar \ No newline at end of file diff --git a/forge/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreForge.java b/forge/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreForge.java deleted file mode 100644 index a33b44d..0000000 --- a/forge/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreForge.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.unrealdinnerbone.trenzalore; - -import com.unrealdinnerbone.trenzalore.platform.ForgePlatformHelper; -import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; - -@Mod(Trenzalore.MOD_ID) -public class TrenzaloreForge { - - public TrenzaloreForge() { - Trenzalore.init(); - FMLJavaModLoadingContext.get().getModEventBus().addListener(TrenzaloreForge::onCreativeTab); - } - - public static void onCreativeTab(BuildCreativeModeTabContentsEvent event) { - if(ForgePlatformHelper.getCreativeTabMap().containsKey(event.getTabKey())) { - ForgePlatformHelper.getCreativeTabMap().get(event.getTabKey()).forEach(event::accept); - } - } - -} \ No newline at end of file diff --git a/forge/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreForgeRegistry.java b/forge/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreForgeRegistry.java deleted file mode 100644 index 5764534..0000000 --- a/forge/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreForgeRegistry.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.unrealdinnerbone.trenzalore; - -import com.mojang.serialization.Codec; -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.minecraftforge.common.loot.IGlobalLootModifier; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.List; - -public class TrenzaloreForgeRegistry implements IRegistry { - private static final RegistryObjects> GLOBAL_LOOT_MODIFIERS = Regeneration.create(ForgeRegistries.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(GLOBAL_LOOT_MODIFIERS); - } - - @Override - public String getModID() { - return Trenzalore.MOD_ID; - } -} diff --git a/forge/src/main/java/com/unrealdinnerbone/trenzalore/events/AddItemModifier.java b/forge/src/main/java/com/unrealdinnerbone/trenzalore/events/AddItemModifier.java deleted file mode 100644 index e8efe05..0000000 --- a/forge/src/main/java/com/unrealdinnerbone/trenzalore/events/AddItemModifier.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.unrealdinnerbone.trenzalore.events; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.storage.loot.LootContext; -import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; -import net.minecraftforge.common.loot.IGlobalLootModifier; -import net.minecraftforge.common.loot.LootModifier; - -import javax.annotation.Nonnull; - -public class AddItemModifier extends LootModifier { - - private final ItemStack stack; - public static final Codec CODEC = RecordCodecBuilder.create((builder) -> - codecStart(builder) - .and(ItemStack.CODEC.fieldOf("stack") - .forGetter((modifier) -> modifier.stack)) - .apply(builder, AddItemModifier::new)); - - - public AddItemModifier(LootItemCondition[] conditionsIn, ItemStack itemStack) { - super(conditionsIn); - this.stack = itemStack; - } - - @Nonnull - @Override - protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { - generatedLoot.add(stack.copy()); - return generatedLoot; - } - - @Override - public Codec codec() { - return CODEC; - } -} diff --git a/forge/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java b/forge/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java deleted file mode 100644 index 9e4d70e..0000000 --- a/forge/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.unrealdinnerbone.trenzalore.events; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.storage.loot.LootContext; -import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; -import net.minecraftforge.common.loot.IGlobalLootModifier; -import net.minecraftforge.common.loot.LootModifier; -import org.jetbrains.annotations.NotNull; - -public class ReplaceItemModifier extends LootModifier { - - private final Ingredient ingredient; - private final ItemStack stack; - public static final Codec CODEC = RecordCodecBuilder.create(builder -> - codecStart(builder) - .and(Ingredient.CODEC.fieldOf("item") - .forGetter((modifier) -> modifier.ingredient)) - .and(ItemStack.CODEC.fieldOf("stack") - .forGetter((modifier) -> modifier.stack)) - .apply(builder, ReplaceItemModifier::new)); - - - public ReplaceItemModifier(LootItemCondition[] conditions, Ingredient ingredient, ItemStack itemStack) { - super(conditions); - this.ingredient = ingredient; - this.stack = itemStack; - } - - public ReplaceItemModifier of(Ingredient ingredient, ItemStack itemStack, LootItemCondition... conditions) { - return new ReplaceItemModifier(conditions, ingredient, itemStack); - } - - @NotNull - @Override - protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { - generatedLoot.replaceAll(itemStack -> ingredient.test(itemStack) ? stack.copyWithCount(itemStack.getCount()) : itemStack); - return generatedLoot; - } - - @Override - public Codec codec() { - return CODEC; - } -} diff --git a/forge/src/main/java/com/unrealdinnerbone/trenzalore/platform/ForgePlatformHelper.java b/forge/src/main/java/com/unrealdinnerbone/trenzalore/platform/ForgePlatformHelper.java deleted file mode 100644 index 2530156..0000000 --- a/forge/src/main/java/com/unrealdinnerbone/trenzalore/platform/ForgePlatformHelper.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.unrealdinnerbone.trenzalore.platform; - -import com.unrealdinnerbone.trenzalore.api.platform.services.IPlatformHelper; -import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.advancements.CriterionTrigger; -import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceKey; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.portal.PortalInfo; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ITeleporter; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fml.loading.FMLPaths; -import net.minecraftforge.registries.DeferredRegister; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.Nullable; - -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Supplier; - -@ApiStatus.Internal -public class ForgePlatformHelper implements IPlatformHelper { - - private static final Map, List>> CREATIVE_TAB_MAP = new HashMap<>(); - @Override - public String getPlatform() { - return "Forge"; - } - - @Override - public Path getConfigPath() { - return FMLPaths.CONFIGDIR.get(); - } - - @Override - public boolean isModLoaded(String modId) { - return ModList.get().isLoaded(modId); - } - - @Override - public void registryRegistryObjects(String modId, RegistryObjects registryObjects) { - DeferredRegister deferredRegister = DeferredRegister.create(registryObjects.registryKey(), modId); - registryObjects.objects().forEach(registryEntry -> deferredRegister.register(registryEntry.name(), registryEntry.entry())); - deferredRegister.register(FMLJavaModLoadingContext.get().getModEventBus()); - } - - @Override - public void addItemToCreativeTab(ResourceKey tabResourceKey, List> item) { - if(CREATIVE_TAB_MAP.containsKey(tabResourceKey)) { - CREATIVE_TAB_MAP.get(tabResourceKey).addAll(item); - }else { - CREATIVE_TAB_MAP.put(tabResourceKey, new ArrayList<>(item)); - } - } - - @Override - public @Nullable Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo) { - return entity.changeDimension(level, new SimpleTeleporter(portalInfo)); - } - public record SimpleTeleporter(PortalInfo portalInfo) implements ITeleporter { - - @Override - public @Nullable PortalInfo getPortalInfo(Entity entity, ServerLevel destWorld, Function defaultPortalInfo) { - return portalInfo; - } - } - - @ApiStatus.Internal - public static Map, List>> getCreativeTabMap() { - return CREATIVE_TAB_MAP; - } - -} \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index 32a5a2d..0000000 --- a/forge/src/main/resources/META-INF/accesstransformer.cfg +++ /dev/null @@ -1,16 +0,0 @@ -public net.minecraft.advancements.CriteriaTriggers m_10595_(Ljava/lang/String;Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger; -public net.minecraft.world.item.CreativeModeTabs f_256788_ -public net.minecraft.world.item.CreativeModeTabs f_256725_ -public net.minecraft.world.item.CreativeModeTabs f_256776_ -public net.minecraft.world.item.CreativeModeTabs f_256791_ -public net.minecraft.world.item.CreativeModeTabs f_257028_ -public net.minecraft.world.item.CreativeModeTabs f_256869_ -public net.minecraft.world.item.CreativeModeTabs f_256797_ -public net.minecraft.world.item.CreativeModeTabs f_256839_ -public net.minecraft.world.item.CreativeModeTabs f_256968_ -public net.minecraft.world.item.CreativeModeTabs f_256731_ -public net.minecraft.world.item.CreativeModeTabs f_256837_ -public net.minecraft.world.level.block.entity.BlockEntityType$Builder m_155273_(Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;[Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/entity/BlockEntityType$Builder; -public net.minecraft.world.level.block.entity.BlockEntityType$BlockEntitySupplier -public net.minecraft.world.inventory.MenuType (Lnet/minecraft/world/inventory/MenuType$MenuSupplier;Lnet/minecraft/world/flag/FeatureFlagSet;)V -public net.minecraft.world.inventory.MenuType$MenuSupplier diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 9df2c95..0000000 --- a/forge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,23 +0,0 @@ -modLoader="javafml" -loaderVersion="[44,)" -license="All Rights Reserved unless stated otherwise. Distribution permission is given to FeedTheBeast and CurseForge for use in modpacks" -[[mods]] -modId="trenzalore" -version="${mod_version}" -displayName="Trenzalore" -logoFile="assets/trenzalore/logo.png" -credits="Mikey for the help!" -authors="UnRealDinnerbone" -description="This mod adds a few small helpers to provide compatibility with Forge / Fabric." -[[dependencies.trenzalore]] - modId="forge" - mandatory=true - versionRange="[44,)" - ordering="NONE" - side="BOTH" -[[dependencies.trenzalore]] - modId="minecraft" - mandatory=true - versionRange="[${minecraft_version}]" - ordering="NONE" - side="BOTH" diff --git a/forge/src/main/resources/META-INF/services/com.unrealdinnerbone.trenzalore.api.platform.services.IPlatformHelper b/forge/src/main/resources/META-INF/services/com.unrealdinnerbone.trenzalore.api.platform.services.IPlatformHelper deleted file mode 100644 index fcdcf12..0000000 --- a/forge/src/main/resources/META-INF/services/com.unrealdinnerbone.trenzalore.api.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -com.unrealdinnerbone.trenzalore.platform.ForgePlatformHelper \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/services/com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry b/forge/src/main/resources/META-INF/services/com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry deleted file mode 100644 index 844bc04..0000000 --- a/forge/src/main/resources/META-INF/services/com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry +++ /dev/null @@ -1 +0,0 @@ -com.unrealdinnerbone.trenzalore.TrenzaloreForgeRegistry diff --git a/gradle.properties b/gradle.properties index 1fe0d6a..10e6a05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version=5.0.1 +mod_version=6.0.0 maven_group=com.unrealdinnerbone mod_name=Trenzalore mod_author=UnRealDinnerbone @@ -7,15 +7,15 @@ mod_id=trenzalore curse_id=870210 # Common -minecraft_version=1.20.5 +minecraft_version=1.21 # Forge #//forge_version=49.0.31 -neo_version=20.5.0-beta +neo_version=21.0.0-beta # Fabric -fabric_version=0.97.6+1.20.5 -fabric_loader_version=0.15.10 +fabric_version=0.100.1+1.21 +fabric_loader_version=0.15.11 # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48c0a02..0d18421 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeo.java b/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeo.java index 0073e9a..c2b7c86 100644 --- a/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeo.java +++ b/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeo.java @@ -9,6 +9,7 @@ public class TrenzaloreNeo { public TrenzaloreNeo(IEventBus modEventBus) { + NeoPlatformHelper.setEventBus(modEventBus); Trenzalore.init(); modEventBus.addListener(TrenzaloreNeo::onCreativeTab); } diff --git a/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java b/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java index e62dbe1..d225592 100644 --- a/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java +++ b/neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeoRegistry.java @@ -39,4 +39,5 @@ public List> getRegistryObjects() { public String getModID() { return Trenzalore.MOD_ID; } + } diff --git a/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/AddItemModifier.java b/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/AddItemModifier.java index 7238e30..adf6d6f 100644 --- a/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/AddItemModifier.java +++ b/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/AddItemModifier.java @@ -8,6 +8,7 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; import net.neoforged.neoforge.common.loot.IGlobalLootModifier; import net.neoforged.neoforge.common.loot.LootModifier; +import org.jetbrains.annotations.NotNull; import javax.annotation.Nonnull; @@ -27,12 +28,13 @@ public AddItemModifier(LootItemCondition[] conditionsIn, ItemStack itemStack) { @Nonnull @Override - protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { + protected ObjectArrayList doApply(ObjectArrayList generatedLoot, @NotNull LootContext context) { generatedLoot.add(stack.copy()); return generatedLoot; } @Override + @NotNull public MapCodec codec() { return CODEC; } diff --git a/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java b/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java index 2400de0..c646fad 100644 --- a/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java +++ b/neo/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java @@ -37,12 +37,13 @@ public ReplaceItemModifier of(Ingredient ingredient, ItemStack itemStack, LootIt @NotNull @Override - protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { + protected ObjectArrayList doApply(ObjectArrayList generatedLoot, @NotNull LootContext context) { generatedLoot.replaceAll(itemStack -> ingredient.test(itemStack) ? stack.copyWithCount(itemStack.getCount()) : itemStack); return generatedLoot; } @Override + @NotNull public MapCodec codec() { return CODEC; } diff --git a/neo/src/main/java/com/unrealdinnerbone/trenzalore/platform/NeoPlatformHelper.java b/neo/src/main/java/com/unrealdinnerbone/trenzalore/platform/NeoPlatformHelper.java index 94b053b..7b5b4fa 100644 --- a/neo/src/main/java/com/unrealdinnerbone/trenzalore/platform/NeoPlatformHelper.java +++ b/neo/src/main/java/com/unrealdinnerbone/trenzalore/platform/NeoPlatformHelper.java @@ -3,30 +3,25 @@ import com.unrealdinnerbone.trenzalore.api.platform.services.IPlatformHelper; import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; import net.minecraft.resources.ResourceKey; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraft.world.level.portal.PortalInfo; +import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModList; -import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; import net.neoforged.fml.loading.FMLPaths; -import net.neoforged.neoforge.common.util.ITeleporter; import net.neoforged.neoforge.registries.DeferredRegister; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.Nullable; import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Function; import java.util.function.Supplier; @ApiStatus.Internal public class NeoPlatformHelper implements IPlatformHelper { + private static IEventBus eventBus; private static final Map, List>> CREATIVE_TAB_MAP = new HashMap<>(); @Override @@ -48,7 +43,7 @@ public boolean isModLoaded(String modId) { public void registryRegistryObjects(String modId, RegistryObjects registryObjects) { DeferredRegister deferredRegister = DeferredRegister.create(registryObjects.registryKey(), modId); registryObjects.objects().forEach(registryEntry -> deferredRegister.register(registryEntry.name(), registryEntry.entry())); - deferredRegister.register(FMLJavaModLoadingContext.get().getModEventBus()); + deferredRegister.register(eventBus); } @Override @@ -60,22 +55,13 @@ public void addItemToCreativeTab(ResourceKey tabResourceKey, Li } } - @Override - public @Nullable Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo) { - return entity.changeDimension(level, new SimpleTeleporter(portalInfo)); - } - - public record SimpleTeleporter(PortalInfo portalInfo) implements ITeleporter { - - @Override - public @Nullable PortalInfo getPortalInfo(Entity entity, ServerLevel destWorld, Function defaultPortalInfo) { - return portalInfo; - } - } - @ApiStatus.Internal public static Map, List>> getCreativeTabMap() { return CREATIVE_TAB_MAP; } + public static void setEventBus(IEventBus eventBus) { + NeoPlatformHelper.eventBus = eventBus; + } + } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index b534184..9125412 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,8 +3,12 @@ pluginManagement { mavenLocal() gradlePluginPortal() maven { - name = 'Creeperhost' - url = 'https://maven.creeperhost.net/' + name = "NeoForge" + url = "https://maven.neoforged.net/" + } + maven { + name = "Fabric" + url = "https://maven.fabricmc.net/" } maven { name = 'Sponge Snapshots'