diff --git a/gradle.properties b/gradle.properties index 09d9618..bdcf52b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ loader_version_range=[2,) mod_id=l2core mod_name=L2Core mod_license=LGPL-2.1 -mod_version=3.0.6-pre19 +mod_version=3.0.6 mod_group_id=dev.xkmc mod_authors=lcy0x1 mod_description=Core Library mod for all L2 mods @@ -32,4 +32,4 @@ patchouli_ver = 1.21-87-NEOFORGE-SNAPSHOT lljij = false rootMod = false -l2serial_ver = 3.0.1 \ No newline at end of file +l2serial_ver = 3.0.9 \ No newline at end of file diff --git a/libs/l2serial-3.0.1-sources.jar b/libs/l2serial-3.0.1-sources.jar deleted file mode 100644 index 754ae7b..0000000 Binary files a/libs/l2serial-3.0.1-sources.jar and /dev/null differ diff --git a/libs/l2serial-3.0.1.jar b/libs/l2serial-3.0.1.jar deleted file mode 100644 index 3b61687..0000000 Binary files a/libs/l2serial-3.0.1.jar and /dev/null differ diff --git a/libs/l2serial-3.0.9-sources.jar b/libs/l2serial-3.0.9-sources.jar new file mode 100644 index 0000000..289f852 Binary files /dev/null and b/libs/l2serial-3.0.9-sources.jar differ diff --git a/libs/l2serial-3.0.9.jar b/libs/l2serial-3.0.9.jar new file mode 100644 index 0000000..67f010c Binary files /dev/null and b/libs/l2serial-3.0.9.jar differ diff --git a/src/main/java/dev/xkmc/l2core/compat/patchouli/PatchouliProvider.java b/src/main/java/dev/xkmc/l2core/compat/patchouli/PatchouliProvider.java index 0fcf44e..383733c 100644 --- a/src/main/java/dev/xkmc/l2core/compat/patchouli/PatchouliProvider.java +++ b/src/main/java/dev/xkmc/l2core/compat/patchouli/PatchouliProvider.java @@ -4,7 +4,6 @@ import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.providers.RegistrateProvider; import dev.xkmc.l2core.serial.config.RecordDataProvider; import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.neoforged.fml.LogicalSide; diff --git a/src/main/java/dev/xkmc/l2core/events/ClientScheduler.java b/src/main/java/dev/xkmc/l2core/events/ClientScheduler.java index 680c919..746a67c 100644 --- a/src/main/java/dev/xkmc/l2core/events/ClientScheduler.java +++ b/src/main/java/dev/xkmc/l2core/events/ClientScheduler.java @@ -5,11 +5,11 @@ import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.ClientTickEvent; -import net.neoforged.neoforge.event.tick.ServerTickEvent; import java.util.ArrayList; import java.util.List; import java.util.function.BooleanSupplier; + @EventBusSubscriber(value = Dist.CLIENT, modid = L2Core.MODID, bus = EventBusSubscriber.Bus.GAME) public class ClientScheduler { diff --git a/src/main/java/dev/xkmc/l2core/init/reg/ench/LegacyEnchantment.java b/src/main/java/dev/xkmc/l2core/init/reg/ench/LegacyEnchantment.java index f9a291d..2848f9b 100644 --- a/src/main/java/dev/xkmc/l2core/init/reg/ench/LegacyEnchantment.java +++ b/src/main/java/dev/xkmc/l2core/init/reg/ench/LegacyEnchantment.java @@ -2,11 +2,9 @@ package dev.xkmc.l2core.init.reg.ench; import dev.xkmc.l2core.init.L2LibReg; import dev.xkmc.l2serial.util.Wrappers; -import net.minecraft.ChatFormatting; import net.minecraft.core.Holder; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/dev/xkmc/l2core/init/reg/registrate/L2Registrate.java b/src/main/java/dev/xkmc/l2core/init/reg/registrate/L2Registrate.java index 9ff60a6..a0b3243 100644 --- a/src/main/java/dev/xkmc/l2core/init/reg/registrate/L2Registrate.java +++ b/src/main/java/dev/xkmc/l2core/init/reg/registrate/L2Registrate.java @@ -14,6 +14,7 @@ import dev.xkmc.l2core.init.L2Core; import dev.xkmc.l2core.init.reg.simple.Val; import dev.xkmc.l2core.util.ConfigInit; import dev.xkmc.l2serial.serialization.custom_handler.CodecHandler; +import dev.xkmc.l2serial.util.ModContainerHack; import dev.xkmc.l2serial.util.Wrappers; import net.minecraft.client.particle.ParticleEngine; import net.minecraft.client.particle.ParticleProvider; @@ -34,7 +35,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.Potion; import net.neoforged.api.distmarker.Dist; import net.neoforged.fml.ModContainer; -import net.neoforged.fml.ModLoadingContext; import net.neoforged.fml.config.ModConfig; import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent; import net.neoforged.neoforge.data.loading.DatagenModLoader; @@ -57,7 +57,7 @@ public class L2Registrate extends AbstractRegistrate { public L2Registrate(String modid) { super(modid); - var mod = ModLoadingContext.get().getActiveContainer(); + var mod = ModContainerHack.getMod(modid); var bus = mod.getEventBus(); if (bus != null) registerEventListeners(bus); else L2Core.LOGGER.error("Failed to register mod {}", modid); diff --git a/src/main/java/dev/xkmc/l2core/init/reg/simple/Reg.java b/src/main/java/dev/xkmc/l2core/init/reg/simple/Reg.java index 56ff07a..205e8cf 100644 --- a/src/main/java/dev/xkmc/l2core/init/reg/simple/Reg.java +++ b/src/main/java/dev/xkmc/l2core/init/reg/simple/Reg.java @@ -4,11 +4,11 @@ import com.mojang.serialization.Codec; import dev.xkmc.l2core.init.reg.datapack.DataMapReg; import dev.xkmc.l2core.init.reg.datapack.DatapackReg; import dev.xkmc.l2serial.serialization.codec.CodecAdaptor; +import dev.xkmc.l2serial.util.ModContainerHack; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.neoforged.bus.api.IEventBus; -import net.neoforged.fml.ModLoadingContext; import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.datamaps.DataMapType; @@ -19,10 +19,7 @@ public final class Reg { public Reg(String modid) { this.modid = modid; - - var cont = ModLoadingContext.get().getActiveContainer(); - if (!cont.getModId().equals(modid)) - throw new IllegalStateException("Class Initialized from wrong thread for " + modid); + var cont = ModContainerHack.getMod(modid); var bus = cont.getEventBus(); if (bus != null) this.bus = bus; else throw new IllegalStateException("Event bus is null for " + modid); diff --git a/src/main/java/dev/xkmc/l2core/serial/advancements/AdvancementGenerator.java b/src/main/java/dev/xkmc/l2core/serial/advancements/AdvancementGenerator.java index 41e8103..8dbdd6b 100644 --- a/src/main/java/dev/xkmc/l2core/serial/advancements/AdvancementGenerator.java +++ b/src/main/java/dev/xkmc/l2core/serial/advancements/AdvancementGenerator.java @@ -6,8 +6,6 @@ import dev.xkmc.l2core.init.reg.registrate.L2Registrate; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementType; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/dev/xkmc/l2core/serial/advancements/RewardBuilder.java b/src/main/java/dev/xkmc/l2core/serial/advancements/RewardBuilder.java index b3799b9..c230dc9 100644 --- a/src/main/java/dev/xkmc/l2core/serial/advancements/RewardBuilder.java +++ b/src/main/java/dev/xkmc/l2core/serial/advancements/RewardBuilder.java @@ -16,7 +16,7 @@ public record RewardBuilder(L2Registrate reg, int exp, ResourceKey lo Supplier sup) implements IAdvBuilder { public RewardBuilder(L2Registrate reg, int exp, ResourceKey loot, - Supplier sup){ + Supplier sup) { this.reg = reg; this.exp = exp; this.loot = loot; diff --git a/src/main/java/dev/xkmc/l2core/serial/config/RecordDataProvider.java b/src/main/java/dev/xkmc/l2core/serial/config/RecordDataProvider.java index 1d594b8..96ebac8 100644 --- a/src/main/java/dev/xkmc/l2core/serial/config/RecordDataProvider.java +++ b/src/main/java/dev/xkmc/l2core/serial/config/RecordDataProvider.java @@ -4,7 +4,6 @@ import com.google.gson.JsonElement; import dev.xkmc.l2serial.serialization.codec.JsonCodec; import net.minecraft.core.HolderLookup; import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; diff --git a/src/main/java/dev/xkmc/l2core/util/ConfigInit.java b/src/main/java/dev/xkmc/l2core/util/ConfigInit.java index 5c1f263..a136faa 100644 --- a/src/main/java/dev/xkmc/l2core/util/ConfigInit.java +++ b/src/main/java/dev/xkmc/l2core/util/ConfigInit.java @@ -3,9 +3,9 @@ package dev.xkmc.l2core.util; import com.tterrag.registrate.providers.RegistrateLangProvider; import com.tterrag.registrate.util.RegistrateDistExecutor; import dev.xkmc.l2core.init.reg.registrate.L2Registrate; +import dev.xkmc.l2serial.util.ModContainerHack; import net.neoforged.api.distmarker.Dist; import net.neoforged.fml.ModContainer; -import net.neoforged.fml.ModLoadingContext; import net.neoforged.fml.config.IConfigSpec; import net.neoforged.fml.config.ModConfig; import net.neoforged.neoforge.client.gui.ConfigurationScreen; @@ -68,7 +68,7 @@ public class ConfigInit { private static void register(L2Registrate reg, ModConfig.Type type, IConfigSpec spec, ConfigInit val) { if (val.folder == null) throw new IllegalStateException("Config must specify folder"); - var mod = ModLoadingContext.get().getActiveContainer(); + var mod = ModContainerHack.getMod(reg.getModid()); String path = val.folder + mod.getModId() + "-" + type.extension() + ".toml"; mod.registerConfig(type, spec, path); val.path = path;