diff --git a/Allay-API/build.gradle.kts b/Allay-API/build.gradle.kts index 0348b6ff1..4be3f6361 100644 --- a/Allay-API/build.gradle.kts +++ b/Allay-API/build.gradle.kts @@ -4,7 +4,7 @@ plugins { group = "org.allaymc" description = "api" -version = "0.0.1" +version = "1.0.0" dependencies { api(libs.network) { diff --git a/Allay-CodeGen/build.gradle.kts b/Allay-CodeGen/build.gradle.kts index c15cb6f39..5119a8ff6 100644 --- a/Allay-CodeGen/build.gradle.kts +++ b/Allay-CodeGen/build.gradle.kts @@ -1,6 +1,6 @@ group = "org.allaymc" description = "codegen" -version = "0.0.1" +version = "1.0.0" dependencies { implementation(libs.javapoet) diff --git a/Allay-Data/build.gradle.kts b/Allay-Data/build.gradle.kts index a63533b1d..2c00379cd 100644 --- a/Allay-Data/build.gradle.kts +++ b/Allay-Data/build.gradle.kts @@ -1,6 +1,6 @@ group = "org.allaymc" description = "data" -version = "0.0.1" +version = "1.0.0" dependencies { implementation(project(":Allay-Server")) diff --git a/Allay-ExamplePlugin/build.gradle.kts b/Allay-ExamplePlugin/build.gradle.kts index abf50c4d1..237e17026 100644 --- a/Allay-ExamplePlugin/build.gradle.kts +++ b/Allay-ExamplePlugin/build.gradle.kts @@ -4,7 +4,7 @@ plugins { group = "org.allaymc" description = "example-plugin" -version = "0.0.1" +version = "1.0.0" dependencies { compileOnly(project(":Allay-API")) diff --git a/Allay-Server/build.gradle.kts b/Allay-Server/build.gradle.kts index 6213ce3c7..a951c7bea 100644 --- a/Allay-Server/build.gradle.kts +++ b/Allay-Server/build.gradle.kts @@ -10,7 +10,7 @@ plugins { group = "org.allaymc" description = "server" -version = "0.0.1" +version = "1.0.0" application { mainClass.set("org.allaymc.server.Allay") @@ -77,14 +77,6 @@ tasks.sourcesJar { dependsOn("generateGitProperties") } -tasks.jmh { - // Add the executed test case - includes.add("AABBTreeJMHTest") - // includes.add("BlockStateUpdateJMHTest") - // includes.add("ChunkJMHTest") - // includes.add("ThroughList2Array") -} - tasks.runShadow { workingDir = File("${rootProject.projectDir}/.run/") this.jarFile = file("build/libs/Allay-Server-$version-all.jar") diff --git a/Allay-Server/src/jmh/java/org/allaymc/server/BlockStateUpdateJMHTest.java b/Allay-Server/src/jmh/java/org/allaymc/server/BlockStateUpdateJMHTest.java index 63d5ad8d5..bc6099bec 100644 --- a/Allay-Server/src/jmh/java/org/allaymc/server/BlockStateUpdateJMHTest.java +++ b/Allay-Server/src/jmh/java/org/allaymc/server/BlockStateUpdateJMHTest.java @@ -1,7 +1,6 @@ package org.allaymc.server; -import org.allaymc.api.block.property.enums.PillarAxis; -import org.allaymc.api.block.property.enums.WoodType; +import org.allaymc.api.block.property.enums.MinecraftFacingDirection; import org.allaymc.api.block.type.BlockState; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.data.VanillaBlockPropertyTypes; @@ -22,23 +21,22 @@ @Fork(1) @OutputTimeUnit(TimeUnit.MILLISECONDS) public class BlockStateUpdateJMHTest { - private BlockState wood; + private BlockState observer; @Setup public void init() throws MissingImplementationException { Allay.initAllayAPI(); - wood = BlockTypes.WOOD_TYPE.getDefaultState(); + observer = BlockTypes.OBSERVER_TYPE.getDefaultState(); } @Benchmark public void test1() { - wood = wood.setProperty(VanillaBlockPropertyTypes.PILLAR_AXIS, PillarAxis.Z); + observer = observer.setProperty(VanillaBlockPropertyTypes.MINECRAFT_FACING_DIRECTION, MinecraftFacingDirection.UP); } @Benchmark public void test2() { - wood = wood.setProperty(VanillaBlockPropertyTypes.PILLAR_AXIS, PillarAxis.Z); - wood = wood.setProperty(VanillaBlockPropertyTypes.STRIPPED_BIT, true); - wood = wood.setProperty(VanillaBlockPropertyTypes.WOOD_TYPE, WoodType.DARK_OAK); + observer = observer.setProperty(VanillaBlockPropertyTypes.MINECRAFT_FACING_DIRECTION, MinecraftFacingDirection.UP); + observer = observer.setProperty(VanillaBlockPropertyTypes.POWERED_BIT, true); } } diff --git a/build.gradle.kts b/build.gradle.kts index 075c9b092..89ebb3cc1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,11 +18,6 @@ repositories { maven("https://storehouse.okaeri.eu/repository/maven-public/") } -// Do not build this root project, this is only used as a control submodule -tasks.forEach { - it.enabled = false -} - idea { module { isDownloadSources = true @@ -30,6 +25,11 @@ idea { } } +// Do not build this root project, this is only used as a control submodule +tasks.forEach { + it.enabled = false +} + // Enable gradle wrapper update task tasks.wrapper { enabled = true @@ -40,6 +40,10 @@ tasks.prepareKotlinBuildScriptModel { enabled = true } +tasks.build { + group = "alpha build" +} + // The build of the root module does not need to write logic, // and the build of the same name of all submodules will be automatically called tasks.register("fastBuild") { @@ -50,10 +54,6 @@ tasks.register("buildForGithubAction") { group = "alpha build" } -tasks.build { - group = "alpha build" -} - tasks.clean { group = "alpha build" enabled = true @@ -94,6 +94,11 @@ subprojects { withSourcesJar() } + tasks.build { + group = "alpha build" + dependsOn("shadowJar") + } + tasks.register("fastBuild") { dependsOn(tasks.build) group = "alpha build" @@ -114,11 +119,6 @@ subprojects { tasks["javadocJar"].enabled = false } - tasks.build { - group = "alpha build" - dependsOn("shadowJar") - } - tasks.clean { group = "alpha build" enabled = true