Skip to content

Commit 7dccaeb

Browse files
Merge branch 'main' into scala
2 parents b776745 + 08b4a13 commit 7dccaeb

10 files changed

Lines changed: 29 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v6
16-
- name: Set up JDK 21
16+
- name: Set up JDK
1717
uses: actions/setup-java@v5
1818
with:
1919
java-version: '21'
2020
distribution: 'temurin'
2121
- uses: gradle/actions/setup-gradle@v5
2222
with:
23-
gradle-version: 9.2.1
23+
gradle-version: 9.3.1
2424
name: Set up Gradle
2525
- name: Add permission
2626
run: chmod +x ./gradlew

.github/workflows/release-to-cf-mr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616

17-
- name: Set up JDK 21
17+
- name: Set up JDK
1818
uses: actions/setup-java@v5
1919
with:
2020
java-version: '21'
2121
distribution: 'temurin'
2222

2323
- uses: gradle/actions/setup-gradle@v5
2424
with:
25-
gradle-version: 9.2.1
25+
gradle-version: 9.3.1
2626
name: Set up Gradle
2727

2828
- name: Add permission

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
contents: write
1313
steps:
1414
- uses: actions/checkout@v6
15-
- name: Set up JDK 21
15+
- name: Set up JDK
1616
uses: actions/setup-java@v5
1717
with:
1818
java-version: '21'
1919
distribution: 'temurin'
2020
- uses: gradle/actions/setup-gradle@v5
2121
with:
22-
gradle-version: 9.2.1
22+
gradle-version: 9.3.1
2323
name: Set up Gradle
2424
- name: Add permission
2525
run: chmod +x ./gradlew

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'java-library'
55
id 'maven-publish'
66
id 'com.gradleup.shadow' version '9.2.2'
7-
id 'xyz.wagyourtail.unimined' version '1.4.9-kappa'
7+
id 'xyz.wagyourtail.unimined' version '1.4.10-kappa'
88
id 'net.kyori.blossom' version '2.1.0'
99
}
1010

@@ -33,7 +33,7 @@ base {
3333
}
3434

3535
scala {
36-
scalaVersion = '3.8.0-RC4'
36+
scalaVersion = '3.8.2'
3737
}
3838

3939
java {
@@ -70,7 +70,7 @@ unimined.minecraft {
7070
if (propertyBool('use_access_transformer')) {
7171
accessTransformer "${rootProject.projectDir}/src/main/resources/${propertyString('access_transformer_locations')}"
7272
}
73-
loader "0.3.31-alpha"
73+
loader "0.4.4-alpha"
7474
runs.auth.username = minecraft_username
7575
runs.all {
7676
def extraArgs = propertyString('extra_jvm_args')

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
pluginManagement {
22
repositories {
33
mavenCentral()
4-
maven {
5-
url = "https://maven.neoforged.net/releases"
6-
}
74
maven {
85
url = "https://maven.minecraftforge.net/"
96
}

src/main/scala/com/example/modid/ExampleMod.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.example.modid
22

3-
import net.minecraftforge.fml.common.Mod
3+
import com.example.modid.proxy.IProxy
4+
import net.minecraftforge.fml.common.{Mod, SidedProxy}
45
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
56
import org.apache.logging.log4j.LogManager
67
import org.apache.logging.log4j.Logger
@@ -10,6 +11,8 @@ import org.apache.logging.log4j.Logger
1011
object ExampleMod {
1112

1213
val LOGGER: Logger = LogManager.getLogger(Reference.MOD_NAME)
14+
@SidedProxy(modId = Reference.MOD_ID, clientSide = "com.example.modid.proxy.ClientProxy", serverSide = "com.example.modid.proxy.CommonProxy")
15+
var proxy: IProxy = null;
1316
/**
1417
* <a href="https://cleanroommc.com/wiki/forge-mod-development/event#overview">
1518
* Take a look at how many FMLStateEvents you can listen to via the @Mod.EventHandler annotation here
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.example.modid.proxy
2+
3+
class ClientProxy extends IProxy{
4+
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.example.modid.proxy
2+
3+
class CommonProxy extends IProxy {
4+
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.example.modid.proxy
2+
3+
trait IProxy {
4+
5+
}

0 commit comments

Comments
 (0)