Skip to content

Commit 852fd00

Browse files
robotgryphonrobotgryphon
committed
Update to 21.1 latest
1 parent c5bff1c commit 852fd00

File tree

7 files changed

+138
-111
lines changed

7 files changed

+138
-111
lines changed

‎build.gradle.kts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
tasks.create("mcVersion") {
2-
doFirst {
3-
val mc = mojang.versions.minecraft.get()
4-
println("version=$mc")
5-
}
1+
plugins {
2+
id("org.jetbrains.gradle.plugin.idea-ext") version ("1.1.7")
3+
4+
// alias(neoforged.plugins.common)
5+
alias(neoforged.plugins.moddev).apply(false)
66
}
77

8-
tasks.create("neoVersion") {
9-
doFirst {
10-
val neo = neoforged.versions.neoforge.get()
11-
println("version=$neo")
8+
subprojects {
9+
repositories {
10+
mavenLocal()
1211
}
1312
}

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[versions]
2+
parchmentMC = "1.21"
3+
parchment = "2024.07.28"

‎gradle/mojang.versions.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[versions]
2+
minecraft = "1.21.1"
3+
4+
[versions.minecraftRange]
5+
require = "[1.21.1, 1.21.2)"
6+
prefer = "1.21.1"
7+

‎gradle/neoforged.versions.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[versions]
2+
neoforge = "21.1.122"
3+
mdg = "2.0.78"
4+
neoforgeRange = { require = "[21.1.122,)", prefer = "21.1.122" }
5+
6+
[libraries.testframework]
7+
module = "net.neoforged:testframework"
8+
version.ref = "neoforge"
9+
10+
[plugins.moddev]
11+
id = "net.neoforged.moddev"
12+
version.ref = "mdg"
13+

‎neoforge/build.gradle.kts‎

Lines changed: 72 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
@file:Suppress("SpellCheckingInspection")
22

3+
import org.slf4j.event.Level
34
import java.text.SimpleDateFormat
45
import java.util.*
56

7+
val modId: String = "simplehoney"
8+
69
var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
710
if (envVersion.startsWith("v"))
811
envVersion = envVersion.trimStart('v')
912

10-
val modId: String = property("mod_id") as String
11-
val isRelease: Boolean = (System.getenv("RELEASE") ?: "false").equals("true", true)
12-
1313
plugins {
14+
java
1415
id("idea")
1516
id("eclipse")
1617
id("maven-publish")
17-
id("java-library")
18-
// alias(neoforged.plugins.moddev)
19-
id("net.neoforged.gradle.userdev") version ("7.0.119")
18+
alias(neoforged.plugins.moddev)
2019
}
2120

2221
base {
23-
archivesName.set(modId)
22+
archivesName.set("simplehoney")
2423
group = "dev.compactmods.simplehoney"
2524
version = envVersion
2625
}
2726

2827
java {
28+
toolchain.vendor.set(JvmVendorSpec.JETBRAINS)
2929
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
3030
}
3131

@@ -50,56 +50,82 @@ sourceSets.test {
5050
}
5151
}
5252

53-
minecraft {
54-
modIdentifier.set(modId)
55-
// accessTransformers.file(project.file("src/main/resources/META-INF/accesstransformer.cfg"))
56-
}
53+
neoForge {
54+
version = neoforged.versions.neoforge.get()
55+
56+
val mainMod = this.mods.create(modId) {
57+
modSourceSets.add(sourceSets.main)
58+
59+
if(System.getenv().containsKey("CI")) {
60+
modSourceSets.add(sourceSets.test)
61+
}
62+
}
63+
64+
unitTest {
65+
enable()
66+
testedMod = mods.named(modId)
67+
}
5768

58-
runs {
59-
// applies to all the run configs below
60-
configureEach {
61-
// Recommended logging data for a userdev environment
62-
systemProperty("forge.logging.markers", "") // 'SCAN,REGISTRIES,REGISTRYDUMP'
69+
parchment {
70+
enabled = true
71+
mappingsVersion = libs.versions.parchment
72+
minecraftVersion = libs.versions.parchmentMC
73+
}
6374

64-
// Recommended logging level for the console
65-
systemProperty("forge.logging.console.level", "debug")
75+
runs {
76+
// applies to all the run configs below
77+
configureEach {
78+
logLevel.set(Level.DEBUG)
79+
sourceSet = project.sourceSets.main
6680

67-
if (!System.getenv().containsKey("CI")) {
6881
// JetBrains Runtime Hotswap
69-
// jvmArgument("-XX:+AllowEnhancedClassRedefinition")
82+
if (!System.getenv().containsKey("CI")) {
83+
jvmArgument("-XX:+AllowEnhancedClassRedefinition")
84+
}
85+
86+
systemProperties.put("terminal.ansi", "true")
7087
}
7188

72-
modSource(sourceSets.main.get())
73-
}
89+
create("client") {
90+
client()
91+
gameDirectory.set(file("runs/client"))
7492

75-
create("client") {
76-
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
77-
systemProperty("forge.enabledGameTestNamespaces", modId)
93+
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
94+
systemProperty("forge.enabledGameTestNamespaces", modId)
7895

79-
programArguments("--username", "Nano")
80-
programArguments("--width", "1920")
81-
programArguments("--height", "1080")
82-
}
96+
programArguments.addAll("--username", "Nano")
97+
programArguments.addAll("--width", "1920")
98+
programArguments.addAll("--height", "1080")
99+
}
83100

84-
create("server") {
85-
systemProperty("forge.enabledGameTestNamespaces", modId)
86-
environmentVariables("TEST_RESOURCES", project.file("src/test/resources").path)
87-
modSource(project.sourceSets.test.get())
88-
}
101+
create("client2") {
102+
client()
103+
gameDirectory.set(file("runs/client"))
89104

90-
create("data") {
91-
dataGenerator(true)
105+
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
106+
systemProperty("forge.enabledGameTestNamespaces", modId)
92107

93-
programArguments("--mod", modId)
94-
programArguments("--all")
95-
programArguments("--output", file("src/generated/resources").absolutePath)
96-
programArguments("--existing", file("src/main/resources").absolutePath)
97-
}
108+
programArguments.addAll("--username", "Nano2")
109+
programArguments.addAll("--width", "1920")
110+
programArguments.addAll("--height", "1080")
111+
}
98112

99-
create("gameTestServer") {
100-
systemProperty("forge.enabledGameTestNamespaces", modId)
101-
environmentVariable("TEST_RESOURCES", file("src/test/resources").path)
102-
modSource(project.sourceSets.test.get())
113+
this.create("data") {
114+
this.data()
115+
116+
this.gameDirectory.set(file("runs/data"))
117+
118+
programArguments.addAll("--mod", modId)
119+
programArguments.addAll("--all")
120+
programArguments.addAll("--output", file("src/generated/resources").absolutePath)
121+
programArguments.addAll("--existing", file("src/main/resources").absolutePath)
122+
}
123+
124+
create("server") {
125+
server()
126+
gameDirectory.set(file("runs/server"))
127+
programArgument("nogui")
128+
}
103129
}
104130
}
105131

@@ -124,8 +150,7 @@ repositories {
124150
}
125151

126152
dependencies {
127-
// implementation(neoforged.neoforge)
128-
implementation("net.neoforged", "neoforge", "21.0.143")
153+
129154
}
130155

131156
tasks.withType<ProcessResources> {

‎neoforge/src/main/java/dev/compactmods/simplehoney/SimpleHoney.java‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,32 +52,34 @@ public SimpleHoney(IEventBus modEventBus) {
5252
ITEMS.register(modEventBus);
5353
modEventBus.addListener(this::registerCaps);
5454

55-
// NeoForge.EVENT_BUS.addListener(this::debugTickListener);
55+
if(!FMLEnvironment.production) {
56+
NeoForge.EVENT_BUS.addListener(this::debugTickListener);
57+
}
58+
}
59+
60+
private void debugTickListener(LevelTickEvent.Pre event) {
61+
final var level = event.getLevel();
62+
63+
if(level.tickRateManager().runsNormally() && level.getGameTime() % 10 == 0) {
64+
final var allPlayers = level.players();
65+
allPlayers.stream()
66+
.filter(player -> player.isCreative() && player.getMainHandItem().is(HONEY_DROP))
67+
.forEach(this::tickNearbyHives);
68+
}
5669
}
57-
//
58-
// private void debugTickListener(LevelTickEvent.Pre event) {
59-
// final var level = event.getLevel();
60-
//
61-
// if(level.tickRateManager().runsNormally() && level.getGameTime() % 10 == 0) {
62-
// final var allPlayers = level.players();
63-
// allPlayers.stream()
64-
// .filter(player -> player.isCreative() && player.getMainHandItem().is(HONEY_DROP))
65-
// .forEach(this::tickNearbyHives);
66-
// }
67-
// }
6870

69-
// private void tickNearbyHives(Player player) {
70-
// final var level = player.level();
71-
// final var nearbyStates = BlockPos.betweenClosedStream(AABB.ofSize(player.position(), 10, 10, 10));
72-
// nearbyStates
73-
// .map(pos -> new Tuple<>(pos, level.getBlockState(pos)))
74-
// .filter(posAndState -> posAndState.getB().is(Blocks.BEEHIVE) || posAndState.getB().is(Blocks.BEE_NEST))
75-
// .filter(posAndHive -> posAndHive.getB().getValue(BeehiveBlock.HONEY_LEVEL) < BeehiveBlock.MAX_HONEY_LEVELS)
76-
// .forEach(posAndHive -> {
77-
// var newState = posAndHive.getB().setValue(BeehiveBlock.HONEY_LEVEL, posAndHive.getB().getValue(BeehiveBlock.HONEY_LEVEL) + 1);
78-
// level.setBlock(posAndHive.getA(), newState, BeehiveBlock.UPDATE_ALL);
79-
// });
80-
// }
71+
private void tickNearbyHives(Player player) {
72+
final var level = player.level();
73+
final var nearbyStates = BlockPos.betweenClosedStream(AABB.ofSize(player.position(), 10, 10, 10));
74+
nearbyStates
75+
.map(pos -> new Tuple<>(pos, level.getBlockState(pos)))
76+
.filter(posAndState -> posAndState.getB().is(Blocks.BEEHIVE) || posAndState.getB().is(Blocks.BEE_NEST))
77+
.filter(posAndHive -> posAndHive.getB().getValue(BeehiveBlock.HONEY_LEVEL) < BeehiveBlock.MAX_HONEY_LEVELS)
78+
.forEach(posAndHive -> {
79+
var newState = posAndHive.getB().setValue(BeehiveBlock.HONEY_LEVEL, posAndHive.getB().getValue(BeehiveBlock.HONEY_LEVEL) + 1);
80+
level.setBlock(posAndHive.getA(), newState, BeehiveBlock.UPDATE_ALL);
81+
});
82+
}
8183

8284
private void registerCaps(final RegisterCapabilitiesEvent event) {
8385
event.registerBlock(Capabilities.ItemHandler.BLOCK, this::honeyCap, Blocks.BEEHIVE, Blocks.BEE_NEST);

‎settings.gradle.kts‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,8 @@
11
dependencyResolutionManagement {
2-
3-
versionCatalogs.create("neoforged") {
4-
version("mdg", "1.0.14")
5-
version("neoforge", "21.0.143")
6-
version("neogradle", "7.0.157")
7-
8-
version("neoforgeRange") {
9-
require("[21.0,22)")
10-
prefer("21.0.143")
11-
}
12-
13-
plugin("moddev", "net.neoforged.gradle.userdev")
14-
.versionRef("neogradle")
15-
16-
// plugin("moddev", "net.neoforged.moddev")
17-
// .versionRef("mdg")
18-
19-
library("neoforged", "net.neoforged", "neoforge")
20-
.versionRef("neoforge")
21-
22-
library("testframework", "net.neoforged", "testframework")
23-
.versionRef("neoforge")
24-
}
25-
26-
versionCatalogs.create("mojang") {
27-
version("minecraft", "1.21.0")
28-
version("minecraftRange") {
29-
this.require("[1.21, 1.21.1)")
30-
this.prefer("1.21")
31-
}
32-
}
2+
addVersionCatalog(this, "neoforged")
3+
addVersionCatalog(this, "mojang")
4+
// addVersionCatalog(this, "compactmods")
5+
// addVersionCatalog(this, "mods")
336
}
347

358
pluginManagement {
@@ -67,3 +40,8 @@ plugins {
6740

6841
include("neoforge")
6942

43+
fun addVersionCatalog(dependencyResolutionManagement: DependencyResolutionManagement, name: String) {
44+
dependencyResolutionManagement.versionCatalogs.create(name) {
45+
from(files("./gradle/$name.versions.toml"))
46+
}
47+
}

0 commit comments

Comments
 (0)