Skip to content

Commit 9d6c068

Browse files
26.1.2 port
1 parent 3868f8c commit 9d6c068

3 files changed

Lines changed: 7 additions & 19 deletions

File tree

build.gradle

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ buildscript {
66
gradlePluginPortal()
77
}
88
dependencies {
9-
classpath group: 'net.neoforged.gradle', name: 'userdev', version: '7.1.11'
9+
classpath group: 'net.neoforged.gradle', name: 'userdev', version: '7.1.25'
1010
}
1111
}
1212

1313
apply plugin: 'net.neoforged.gradle.userdev'
1414
apply plugin: 'eclipse'
1515
apply plugin: 'maven-publish'
1616

17-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
17+
java.toolchain.languageVersion = JavaLanguageVersion.of(25)
1818

1919
String baseVersion = "1.3"
2020
if (!"release".equalsIgnoreCase(System.getProperty("target"))) {
@@ -24,15 +24,10 @@ if (!"release".equalsIgnoreCase(System.getProperty("target"))) {
2424
baseVersion += "-unknown"
2525
}
2626
}
27-
version = "1.21.8-neoforge-" + baseVersion
27+
version = "26.1-neoforge-" + baseVersion
2828
group = "trackapi" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2929
archivesBaseName = "TrackAPI"
3030

31-
configurations {
32-
minecraftLibrary
33-
implementation.extendsFrom minecraftLibrary
34-
}
35-
3631
java {
3732
withSourcesJar()
3833
}
@@ -52,10 +47,6 @@ runs {
5247
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
5348
systemProperty 'forge.logging.console.level', 'debug'
5449

55-
dependencies {
56-
runtime project.configurations.minecraftLibrary
57-
}
58-
5950
modSource project.sourceSets.main
6051
}
6152

@@ -88,8 +79,8 @@ runs {
8879
sourceSets.main.resources { srcDir 'src/generated/resources' }
8980

9081
dependencies {
91-
implementation 'net.neoforged:neoforge:21.8.52'
92-
minecraftLibrary "org.apache.maven.wagon:wagon-ssh:3.5.3"
82+
implementation 'net.neoforged:neoforge:26.1.2.29-beta'
83+
implementation "org.apache.maven.wagon:wagon-ssh:3.5.3"
9384
}
9485

9586
// Example for how to get properties into the manifest for reading by the runtime..

src/main/java/trackapi/compat/MinecraftRail.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22

33
import net.minecraft.world.phys.Vec3;
44
import net.minecraft.core.BlockPos;
5-
import net.minecraft.world.entity.vehicle.Minecart;
65
import net.minecraft.world.level.Level;
76
import net.minecraft.world.level.block.BaseRailBlock;
8-
import net.minecraft.world.phys.Vec3;
9-
import net.minecraft.core.BlockPos;
107
import net.minecraft.world.level.block.state.BlockState;
118
import net.minecraft.world.level.block.state.properties.RailShape;
129
import trackapi.lib.Gauges;

src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ description='''A common track interface for neoforge'''
1010
[[dependencies.trackapi]]
1111
modId="neoforge"
1212
type='required'
13-
versionRange="[21.8.1,)"
13+
versionRange="[26.1.2.29,)"
1414
ordering="NONE"
1515
side="BOTH"
1616
[[dependencies.trackapi]]
1717
modId="minecraft"
1818
type='required'
19-
versionRange="[1.21.8]"
19+
versionRange="[26.1.2, 26.2)"
2020
ordering="NONE"
2121
side="BOTH"

0 commit comments

Comments
 (0)