* This executor runs tasks on a single thread to ensure delayed tasks run in a separate thread from the main thread. *
* * @since 1.0.0 */ - public static final ScheduledExecutorService SCHEDULER = Executors.newScheduledThreadPool(1); + public static ScheduledExecutorService SCHEDULER = Executors.newScheduledThreadPool(1); /** * A {@code public static final} {@link String} representing the Mod ID for the {@code BlueLib} mod. diff --git a/fabric/src/main/java/software/bluelib/example/event/ReloadHandler.java b/fabric/src/main/java/software/bluelib/example/event/ReloadHandler.java index b96a2d0c..56c69e4a 100644 --- a/fabric/src/main/java/software/bluelib/example/event/ReloadHandler.java +++ b/fabric/src/main/java/software/bluelib/example/event/ReloadHandler.java @@ -11,6 +11,7 @@ import java.util.Arrays; import java.util.List; +import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** @@ -50,6 +51,7 @@ public class ReloadHandler extends ReloadEventHandler { * @since 1.0.0 */ public static void onServerStart(MinecraftServer pServer) { + BlueLibConstants.SCHEDULER = new ScheduledThreadPoolExecutor(1); server = pServer; ReloadHandler.LoadEntityVariants(server); BaseLogger.log(BaseLogLevel.INFO, "Entity variants loaded.", true); diff --git a/Forge/build.gradle b/forge/build.gradle similarity index 100% rename from Forge/build.gradle rename to forge/build.gradle diff --git a/Forge/src/main/java/software/bluelib/BlueLib.java b/forge/src/main/java/software/bluelib/BlueLib.java similarity index 100% rename from Forge/src/main/java/software/bluelib/BlueLib.java rename to forge/src/main/java/software/bluelib/BlueLib.java diff --git a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java b/forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java rename to forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java diff --git a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java b/forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java rename to forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java diff --git a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java b/forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java rename to forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java diff --git a/Forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java b/forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java rename to forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java diff --git a/Forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java b/forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java rename to forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java diff --git a/Forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java b/forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java rename to forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java diff --git a/Forge/src/main/java/software/bluelib/example/event/ClientEvents.java b/forge/src/main/java/software/bluelib/example/event/ClientEvents.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/event/ClientEvents.java rename to forge/src/main/java/software/bluelib/example/event/ClientEvents.java diff --git a/Forge/src/main/java/software/bluelib/example/event/CommonModEvent.java b/forge/src/main/java/software/bluelib/example/event/CommonModEvent.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/event/CommonModEvent.java rename to forge/src/main/java/software/bluelib/example/event/CommonModEvent.java diff --git a/Forge/src/main/java/software/bluelib/example/event/ReloadHandler.java b/forge/src/main/java/software/bluelib/example/event/ReloadHandler.java similarity index 97% rename from Forge/src/main/java/software/bluelib/example/event/ReloadHandler.java rename to forge/src/main/java/software/bluelib/example/event/ReloadHandler.java index 8fc6be4a..f0b70730 100644 --- a/Forge/src/main/java/software/bluelib/example/event/ReloadHandler.java +++ b/forge/src/main/java/software/bluelib/example/event/ReloadHandler.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** @@ -55,6 +56,7 @@ public class ReloadHandler extends ReloadEventHandler { */ @SubscribeEvent public static void onServerStart(ServerStartingEvent pEvent) { + BlueLibConstants.SCHEDULER = new ScheduledThreadPoolExecutor(1); server = pEvent.getServer(); ReloadHandler.LoadEntityVariants(server); BaseLogger.log(BaseLogLevel.INFO, "Entity variants loaded.", true); diff --git a/Forge/src/main/java/software/bluelib/example/init/ModEntities.java b/forge/src/main/java/software/bluelib/example/init/ModEntities.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/init/ModEntities.java rename to forge/src/main/java/software/bluelib/example/init/ModEntities.java diff --git a/Forge/src/main/java/software/bluelib/example/proxy/ClientProxy.java b/forge/src/main/java/software/bluelib/example/proxy/ClientProxy.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/proxy/ClientProxy.java rename to forge/src/main/java/software/bluelib/example/proxy/ClientProxy.java diff --git a/Forge/src/main/java/software/bluelib/example/proxy/CommonProxy.java b/forge/src/main/java/software/bluelib/example/proxy/CommonProxy.java similarity index 100% rename from Forge/src/main/java/software/bluelib/example/proxy/CommonProxy.java rename to forge/src/main/java/software/bluelib/example/proxy/CommonProxy.java diff --git a/Forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml similarity index 100% rename from Forge/src/main/resources/META-INF/mods.toml rename to forge/src/main/resources/META-INF/mods.toml diff --git a/Forge/src/main/resources/assets/bluelib/animations/dragon.animation.json b/forge/src/main/resources/assets/bluelib/animations/dragon.animation.json similarity index 100% rename from Forge/src/main/resources/assets/bluelib/animations/dragon.animation.json rename to forge/src/main/resources/assets/bluelib/animations/dragon.animation.json diff --git a/Forge/src/main/resources/assets/bluelib/animations/rex.animation.json b/forge/src/main/resources/assets/bluelib/animations/rex.animation.json similarity index 100% rename from Forge/src/main/resources/assets/bluelib/animations/rex.animation.json rename to forge/src/main/resources/assets/bluelib/animations/rex.animation.json diff --git a/Forge/src/main/resources/assets/bluelib/geo/dragon.geo.json b/forge/src/main/resources/assets/bluelib/geo/dragon.geo.json similarity index 100% rename from Forge/src/main/resources/assets/bluelib/geo/dragon.geo.json rename to forge/src/main/resources/assets/bluelib/geo/dragon.geo.json diff --git a/Forge/src/main/resources/assets/bluelib/geo/rex.geo.json b/forge/src/main/resources/assets/bluelib/geo/rex.geo.json similarity index 100% rename from Forge/src/main/resources/assets/bluelib/geo/rex.geo.json rename to forge/src/main/resources/assets/bluelib/geo/rex.geo.json diff --git a/Forge/src/main/resources/assets/bluelib/lang/en_us.json b/forge/src/main/resources/assets/bluelib/lang/en_us.json similarity index 100% rename from Forge/src/main/resources/assets/bluelib/lang/en_us.json rename to forge/src/main/resources/assets/bluelib/lang/en_us.json diff --git a/Forge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png b/forge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png similarity index 100% rename from Forge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png rename to forge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png diff --git a/Forge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png b/forge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png similarity index 100% rename from Forge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png rename to forge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png diff --git a/Forge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png b/forge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png similarity index 100% rename from Forge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png rename to forge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png diff --git a/Forge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png b/forge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png similarity index 100% rename from Forge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png rename to forge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png diff --git a/Forge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png b/forge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png similarity index 100% rename from Forge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png rename to forge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png diff --git a/Forge/src/main/resources/assets/bluelib/textures/entity/rex/green.png b/forge/src/main/resources/assets/bluelib/textures/entity/rex/green.png similarity index 100% rename from Forge/src/main/resources/assets/bluelib/textures/entity/rex/green.png rename to forge/src/main/resources/assets/bluelib/textures/entity/rex/green.png diff --git a/Forge/src/main/resources/data/bluelib.variant/entity/dragon/blue.json b/forge/src/main/resources/data/bluelib.variant/entity/dragon/blue.json similarity index 100% rename from Forge/src/main/resources/data/bluelib.variant/entity/dragon/blue.json rename to forge/src/main/resources/data/bluelib.variant/entity/dragon/blue.json diff --git a/Forge/src/main/resources/data/bluelib.variant/entity/dragon/dragon.json b/forge/src/main/resources/data/bluelib.variant/entity/dragon/dragon.json similarity index 100% rename from Forge/src/main/resources/data/bluelib.variant/entity/dragon/dragon.json rename to forge/src/main/resources/data/bluelib.variant/entity/dragon/dragon.json diff --git a/Forge/src/main/resources/data/bluelib.variant/entity/dragon/pink.json b/forge/src/main/resources/data/bluelib.variant/entity/dragon/pink.json similarity index 100% rename from Forge/src/main/resources/data/bluelib.variant/entity/dragon/pink.json rename to forge/src/main/resources/data/bluelib.variant/entity/dragon/pink.json diff --git a/Forge/src/main/resources/data/bluelib.variant/entity/rex/rex.json b/forge/src/main/resources/data/bluelib.variant/entity/rex/rex.json similarity index 100% rename from Forge/src/main/resources/data/bluelib.variant/entity/rex/rex.json rename to forge/src/main/resources/data/bluelib.variant/entity/rex/rex.json diff --git a/gradle.properties b/gradle.properties index 64d4bab2..ff313997 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ forge_version_range=[51,) forge_loader_version_range=[0,) # NeoForge -neoforge_version=21.0.167 +neoforge_version=21.1.72 neoforge_loader_version_range=[4,) neoforge_version_range=[21.0.0-beta,) diff --git a/NeoForge/build.gradle b/neoforge/build.gradle similarity index 90% rename from NeoForge/build.gradle rename to neoforge/build.gradle index 3715ccc8..a56ce00b 100644 --- a/NeoForge/build.gradle +++ b/neoforge/build.gradle @@ -37,8 +37,8 @@ neoForge { } dependencies { - compileOnly("curse.maven:geckolib-388172:5605715") - runtimeOnly("curse.maven:geckolib-388172:5605715") + compileOnly("curse.maven:geckolib-388172:5763144") + runtimeOnly("curse.maven:geckolib-388172:5763144") } sourceSets.main.resources { srcDir 'src/generated/resources' } \ No newline at end of file diff --git a/NeoForge/src/main/java/software/bluelib/BlueLib.java b/neoforge/src/main/java/software/bluelib/BlueLib.java similarity index 95% rename from NeoForge/src/main/java/software/bluelib/BlueLib.java rename to neoforge/src/main/java/software/bluelib/BlueLib.java index a294bf24..d1e1d113 100644 --- a/NeoForge/src/main/java/software/bluelib/BlueLib.java +++ b/neoforge/src/main/java/software/bluelib/BlueLib.java @@ -6,12 +6,15 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent; import net.neoforged.fml.loading.FMLEnvironment; import org.spongepowered.asm.launch.MixinBootstrap; import software.bluelib.example.event.ClientEvents; import software.bluelib.example.init.ModEntities; +import java.util.concurrent.ScheduledThreadPoolExecutor; + /** * The main class of the {@code BlueLib} mod. *diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java b/neoforge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java rename to neoforge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java b/neoforge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java rename to neoforge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java b/neoforge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java rename to neoforge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java b/neoforge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java rename to neoforge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexModel.java b/neoforge/src/main/java/software/bluelib/example/entity/rex/RexModel.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/entity/rex/RexModel.java rename to neoforge/src/main/java/software/bluelib/example/entity/rex/RexModel.java diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexRender.java b/neoforge/src/main/java/software/bluelib/example/entity/rex/RexRender.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/entity/rex/RexRender.java rename to neoforge/src/main/java/software/bluelib/example/entity/rex/RexRender.java diff --git a/NeoForge/src/main/java/software/bluelib/example/event/ClientEvents.java b/neoforge/src/main/java/software/bluelib/example/event/ClientEvents.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/event/ClientEvents.java rename to neoforge/src/main/java/software/bluelib/example/event/ClientEvents.java diff --git a/NeoForge/src/main/java/software/bluelib/example/event/ReloadHandler.java b/neoforge/src/main/java/software/bluelib/example/event/ReloadHandler.java similarity index 97% rename from NeoForge/src/main/java/software/bluelib/example/event/ReloadHandler.java rename to neoforge/src/main/java/software/bluelib/example/event/ReloadHandler.java index 3d56a476..41cfec7b 100644 --- a/NeoForge/src/main/java/software/bluelib/example/event/ReloadHandler.java +++ b/neoforge/src/main/java/software/bluelib/example/event/ReloadHandler.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** @@ -58,6 +59,7 @@ public class ReloadHandler extends ReloadEventHandler { */ @SubscribeEvent public static void onServerStart(ServerStartingEvent pEvent) { + BlueLibConstants.SCHEDULER = new ScheduledThreadPoolExecutor(1); server = pEvent.getServer(); ReloadHandler.LoadEntityVariants(server); BaseLogger.log(BaseLogLevel.INFO, "Entity variants loaded.", true); diff --git a/NeoForge/src/main/java/software/bluelib/example/init/ModEntities.java b/neoforge/src/main/java/software/bluelib/example/init/ModEntities.java similarity index 100% rename from NeoForge/src/main/java/software/bluelib/example/init/ModEntities.java rename to neoforge/src/main/java/software/bluelib/example/init/ModEntities.java diff --git a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from NeoForge/src/main/resources/META-INF/neoforge.mods.toml rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml diff --git a/NeoForge/src/main/resources/assets/bluelib/animations/dragon.animation.json b/neoforge/src/main/resources/assets/bluelib/animations/dragon.animation.json similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/animations/dragon.animation.json rename to neoforge/src/main/resources/assets/bluelib/animations/dragon.animation.json diff --git a/NeoForge/src/main/resources/assets/bluelib/animations/rex.animation.json b/neoforge/src/main/resources/assets/bluelib/animations/rex.animation.json similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/animations/rex.animation.json rename to neoforge/src/main/resources/assets/bluelib/animations/rex.animation.json diff --git a/NeoForge/src/main/resources/assets/bluelib/geo/dragon.geo.json b/neoforge/src/main/resources/assets/bluelib/geo/dragon.geo.json similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/geo/dragon.geo.json rename to neoforge/src/main/resources/assets/bluelib/geo/dragon.geo.json diff --git a/NeoForge/src/main/resources/assets/bluelib/geo/rex.geo.json b/neoforge/src/main/resources/assets/bluelib/geo/rex.geo.json similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/geo/rex.geo.json rename to neoforge/src/main/resources/assets/bluelib/geo/rex.geo.json diff --git a/NeoForge/src/main/resources/assets/bluelib/lang/en_us.json b/neoforge/src/main/resources/assets/bluelib/lang/en_us.json similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/lang/en_us.json rename to neoforge/src/main/resources/assets/bluelib/lang/en_us.json diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png b/neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png rename to neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/blue.png diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png b/neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png rename to neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png b/neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png rename to neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png b/neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png rename to neoforge/src/main/resources/assets/bluelib/textures/entity/dragon/pink.png diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png b/neoforge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png rename to neoforge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/green.png b/neoforge/src/main/resources/assets/bluelib/textures/entity/rex/green.png similarity index 100% rename from NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/green.png rename to neoforge/src/main/resources/assets/bluelib/textures/entity/rex/green.png diff --git a/NeoForge/src/main/resources/data/bluelib/variant/entity/dragon/blue.json b/neoforge/src/main/resources/data/bluelib/variant/entity/dragon/blue.json similarity index 100% rename from NeoForge/src/main/resources/data/bluelib/variant/entity/dragon/blue.json rename to neoforge/src/main/resources/data/bluelib/variant/entity/dragon/blue.json diff --git a/NeoForge/src/main/resources/data/bluelib/variant/entity/dragon/dragon.json b/neoforge/src/main/resources/data/bluelib/variant/entity/dragon/dragon.json similarity index 100% rename from NeoForge/src/main/resources/data/bluelib/variant/entity/dragon/dragon.json rename to neoforge/src/main/resources/data/bluelib/variant/entity/dragon/dragon.json diff --git a/NeoForge/src/main/resources/data/bluelib/variant/entity/dragon/pink.json b/neoforge/src/main/resources/data/bluelib/variant/entity/dragon/pink.json similarity index 100% rename from NeoForge/src/main/resources/data/bluelib/variant/entity/dragon/pink.json rename to neoforge/src/main/resources/data/bluelib/variant/entity/dragon/pink.json diff --git a/NeoForge/src/main/resources/data/bluelib/variant/entity/rex/rex.json b/neoforge/src/main/resources/data/bluelib/variant/entity/rex/rex.json similarity index 100% rename from NeoForge/src/main/resources/data/bluelib/variant/entity/rex/rex.json rename to neoforge/src/main/resources/data/bluelib/variant/entity/rex/rex.json