Skip to content

Commit 1a80d3c

Browse files
QubiluxQubilux
committed
Updated
1 parent 76c073d commit 1a80d3c

File tree

9 files changed

+42
-35
lines changed

9 files changed

+42
-35
lines changed

‎build.gradle.kts

+28-21
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.8"
1919
}
2020

21-
group = "io.github.ultreon.craftmods"
21+
group = "dev.ultreon.craftmods"
2222
version = "0.1.0+snapshot." + DateTimeFormatter.ofPattern("yyy.MM.dd.HH.mm").format(Instant.now().atOffset(ZoneOffset.UTC))
2323

2424
println("Building version $version")
@@ -30,12 +30,36 @@ base {
3030
repositories {
3131
mavenCentral()
3232

33+
maven {
34+
name = "SonaType Snapshots"
35+
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
36+
37+
content {
38+
includeGroup("com.badlogicgames.gdx-video")
39+
}
40+
}
41+
42+
maven {
43+
name = "SonaType Releases"
44+
url = uri("https://oss.sonatype.org/content/repositories/releases")
45+
46+
content {
47+
includeGroup("com.badlogicgames.gdx-video")
48+
}
49+
}
50+
3351
maven {
3452
name = "JitPack"
3553
url = uri("https://jitpack.io")
3654

3755
content {
38-
includeGroup("com.github.Ultreon")
56+
includeGroup("dev.ultreon")
57+
includeGroup("dev.ultreon.quantum-voxel")
58+
includeGroup("dev.ultreon.ubo")
59+
includeGroup("dev.ultreon.corelibs")
60+
includeGroup("dev.ultreon.JNoiseJDK11")
61+
includeGroup("dev.ultreon.json5-api")
62+
includeGroup("dev.ultreon.quantum-fabric-loader")
3963
includeGroup("com.github.jagrosh")
4064
includeGroup("com.github.JnCrMx")
4165
includeGroup("com.github.mgsx-dev.gdx-gltf")
@@ -47,16 +71,6 @@ repositories {
4771
name = "FabricMC"
4872
url = uri("https://maven.fabricmc.net/")
4973
}
50-
51-
maven {
52-
name = "UltracraftMaven"
53-
url = uri("https://maven.pkg.github.com/Ultreon/ultracraft")
54-
55-
credentials {
56-
username = (project.findProperty("gpr.user") ?: System.getenv("USERNAME")) as String
57-
password = (project.findProperty("gpr.key") ?: System.getenv("TOKEN")) as String
58-
}
59-
}
6074
}
6175

6276
configurations {
@@ -72,7 +86,7 @@ dependencies {
7286
configurations["include"](compileOnly("org.scala-lang:scala-library:2.13.10")!!)
7387

7488
// api(implementation("io.github.ultreon.craft:ultracraft-api:0.1.+")!!)
75-
api(implementation("io.github.ultreon.craft:ultracraft-desktop:0.1.+")!!)
89+
api(implementation("dev.ultreon.quantum-voxel:quantum-desktop:ed398498ec")!!)
7690
}
7791

7892
tasks.jar {
@@ -208,13 +222,6 @@ publishing {
208222
}
209223

210224
repositories {
211-
maven {
212-
name = "GitHubPackages"
213-
url = uri("https://maven.pkg.github.com/Ultreon/ultracraft-scala")
214-
credentials {
215-
username = (project.findProperty("gpr.user") ?: System.getenv("USERNAME")) as String
216-
password = (project.findProperty("gpr.key") ?: System.getenv("TOKEN")) as String
217-
}
218-
}
225+
mavenLocal()
219226
}
220227
}

‎src/main/resources/fabric.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
"entrypoints": {
99
"init": [
10-
"com.ultreon.craft.scala.ScalaApiMod"
10+
"dev.ultreon.craft.scala.ScalaApiMod"
1111
]
1212
}
1313
}

‎src/main/scala/com/ultreon/craft/scala/ScalaApiMod.scala renamed to ‎src/main/scala/dev/ultreon/craft/scala/ScalaApiMod.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ultreon.craft.scala
1+
package dev.ultreon.craft.scala
22

33
import net.fabricmc.api.ModInitializer
44

‎src/main/scala/com/ultreon/craft/scala/registry/ObjectInit.scala renamed to ‎src/main/scala/dev/ultreon/craft/scala/registry/ObjectInit.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.ultreon.craft.scala.registry
1+
package dev.ultreon.craft.scala.registry
22

3-
import com.ultreon.craft.registry.{DeferRegistry, DeferredElement, Registry}
3+
import dev.ultreon.quantum.registry.{DeferRegistry, DeferredElement, Registry}
44

55
abstract class ObjectInit[T](namespace: String, registry: Registry[T]) {
66
private val deferRegister = DeferRegistry.of[T](namespace, registry)

‎src/test/scala/com/ultreon/craft/scala/testmod/Constants.scala renamed to ‎src/test/scala/dev/ultreon/craft/scala/testmod/Constants.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ultreon.craft.scala.testmod
1+
package dev.ultreon.craft.scala.testmod
22

33
import net.fabricmc.loader.api.{FabricLoader, ModContainer}
44

‎src/test/scala/com/ultreon/craft/scala/testmod/ScalaTestMod.scala renamed to ‎src/test/scala/dev/ultreon/craft/scala/testmod/ScalaTestMod.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.ultreon.craft.scala.testmod
1+
package dev.ultreon.craft.scala.testmod
22

3-
import com.ultreon.craft.scala.testmod.init.{ModBlocks, ModItems}
3+
import dev.ultreon.craft.scala.testmod.init.{ModBlocks, ModItems}
44
import net.fabricmc.api.ModInitializer
55

66
class ScalaTestMod extends ModInitializer {

‎src/test/scala/com/ultreon/craft/scala/testmod/client/ClientScalaTestMod.scala renamed to ‎src/test/scala/dev/ultreon/craft/scala/testmod/client/ClientScalaTestMod.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ultreon.craft.scala.testmod.client
1+
package dev.ultreon.craft.scala.testmod.client
22

33
import com.ultreon.craft.client.api.events.ClientLifecycleEvents
44
import com.ultreon.craft.client.{ClientModInit, UltracraftClient}

‎src/test/scala/com/ultreon/craft/scala/testmod/init/ModBlocks.scala renamed to ‎src/test/scala/dev/ultreon/craft/scala/testmod/init/ModBlocks.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.ultreon.craft.scala.testmod.init
1+
package dev.ultreon.craft.scala.testmod.init
22

33
import com.ultreon.craft.block.Block
44
import com.ultreon.craft.item.ItemStack
55
import com.ultreon.craft.registry.{DeferRegistry, DeferredElement, Registries}
6-
import com.ultreon.craft.scala.registry.ObjectInit
7-
import com.ultreon.craft.scala.testmod.Constants
6+
import dev.ultreon.craft.scala.registry.ObjectInit
7+
import dev.ultreon.craft.scala.testmod.Constants
88

99
import java.util.function.Supplier
1010
import scala.language.postfixOps

‎src/test/scala/com/ultreon/craft/scala/testmod/init/ModItems.scala renamed to ‎src/test/scala/dev/ultreon/craft/scala/testmod/init/ModItems.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.ultreon.craft.scala.testmod.init
1+
package dev.ultreon.craft.scala.testmod.init
22

33
import com.ultreon.craft.item.Item
44
import com.ultreon.craft.registry.{DeferRegistry, DeferredElement, Registries}
5-
import com.ultreon.craft.scala.registry.ObjectInit
6-
import com.ultreon.craft.scala.testmod.Constants
5+
import dev.ultreon.craft.scala.registry.ObjectInit
6+
import dev.ultreon.craft.scala.testmod.Constants
77

88
object ModItems extends ObjectInit[Item](Constants.MOD_ID, Registries.ITEM) {
99
final val TEST_ITEM: DeferredElement[Item] = register("test_item", { () =>

0 commit comments

Comments
 (0)