Skip to content

Commit 01da9e9

Browse files
gabizougabizou
committed
feat(minecraft): update game content to 1.21.9
See: https://minecraft.wiki/w/Java_Edition_1.21.9
2 parents d4ef097 + f5f8dd7 commit 01da9e9

File tree

201 files changed

+2536
-1120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+2536
-1120
lines changed

‎SpongeAPI‎

Submodule SpongeAPI updated 39 files

‎forge/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import net.minecraftforge.gradle.common.util.RunConfig
3-
import org.gradle.api.tasks.JavaExec
43
import org.gradle.internal.DefaultTaskExecutionRequest
54
import org.spongepowered.gradle.impl.AWToAT
65
import org.spongepowered.gradle.impl.IdeHelper
@@ -432,6 +431,7 @@ tasks {
432431
test {
433432
useJUnitPlatform()
434433

434+
maxHeapSize = "4G"
435435
testClassesDirs = commonTest.get().output.classesDirs + testSources.get().output.classesDirs
436436

437437
val runServer = minecraft.runs.getByName("server")

‎generator/src/main/java/org/spongepowered/vanilla/generator/BlockStatePropertiesGenerator.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import net.minecraft.core.FrontAndTop;
3333
import net.minecraft.core.registries.BuiltInRegistries;
3434
import net.minecraft.world.level.block.Block;
35+
import net.minecraft.world.level.block.CopperGolemStatueBlock;
36+
import net.minecraft.world.level.block.WeatheringCopper;
3537
import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState;
3638
import net.minecraft.world.level.block.entity.vault.VaultState;
3739
import net.minecraft.world.level.block.state.BlockState;
@@ -56,6 +58,7 @@
5658
import net.minecraft.world.level.block.state.properties.RailShape;
5759
import net.minecraft.world.level.block.state.properties.RedstoneSide;
5860
import net.minecraft.world.level.block.state.properties.SculkSensorPhase;
61+
import net.minecraft.world.level.block.state.properties.SideChainPart;
5962
import net.minecraft.world.level.block.state.properties.SlabType;
6063
import net.minecraft.world.level.block.state.properties.StairsShape;
6164
import net.minecraft.world.level.block.state.properties.StructureMode;
@@ -152,6 +155,10 @@ static PropertyType ofProperty(final Property<?> prop) {
152155
vanillaEnumTypeMapping.put(VaultState.class, BlockStatePropertiesGenerator.inDataTypePkg("VaultState"));
153156
vanillaEnumTypeMapping.put(CreakingHeartState.class, BlockStatePropertiesGenerator.inDataTypePkg("CreakingHeartState"));
154157
vanillaEnumTypeMapping.put(TestBlockMode.class, BlockStatePropertiesGenerator.inDataTypePkg("TestBlockMode"));
158+
vanillaEnumTypeMapping.put(SideChainPart.class, BlockStatePropertiesGenerator.inDataTypePkg("SideChain"));
159+
vanillaEnumTypeMapping.put(CopperGolemStatueBlock.Pose.class, BlockStatePropertiesGenerator.inDataTypePkg("CopperGolemPose"));
160+
vanillaEnumTypeMapping.put(WeatheringCopper.WeatherState.class, BlockStatePropertiesGenerator.inDataTypePkg("CopperOxidation"));
161+
155162

156163
// Custom Mapping required see StateHolderMixin_API
157164
final ClassName portionTypeClass = BlockStatePropertiesGenerator.inDataTypePkg("PortionType");

‎generator/src/main/java/org/spongepowered/vanilla/generator/BlockStatePropertyKeysGenerator.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import com.squareup.javapoet.TypeVariableName;
3434
import net.minecraft.core.Direction;
3535
import net.minecraft.core.FrontAndTop;
36+
import net.minecraft.world.level.block.CopperGolemStatueBlock;
37+
import net.minecraft.world.level.block.WeatheringCopper;
3638
import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState;
3739
import net.minecraft.world.level.block.entity.vault.VaultState;
3840
import net.minecraft.world.level.block.state.BlockState;
@@ -57,6 +59,7 @@
5759
import net.minecraft.world.level.block.state.properties.RailShape;
5860
import net.minecraft.world.level.block.state.properties.RedstoneSide;
5961
import net.minecraft.world.level.block.state.properties.SculkSensorPhase;
62+
import net.minecraft.world.level.block.state.properties.SideChainPart;
6063
import net.minecraft.world.level.block.state.properties.SlabType;
6164
import net.minecraft.world.level.block.state.properties.StairsShape;
6265
import net.minecraft.world.level.block.state.properties.StructureMode;
@@ -150,6 +153,9 @@ static BlockStatePropertyKeysGenerator.PropertyType ofProperty(final Property<?>
150153
vanillaEnumTypeMapping.put(VaultState.class, BlockStatePropertyKeysGenerator.inDataTypePkg("VaultState"));
151154
vanillaEnumTypeMapping.put(CreakingHeartState.class, BlockStatePropertyKeysGenerator.inDataTypePkg("CreakingHeartState"));
152155
vanillaEnumTypeMapping.put(TestBlockMode.class, BlockStatePropertyKeysGenerator.inDataTypePkg("TestBlockMode"));
156+
vanillaEnumTypeMapping.put(SideChainPart.class, BlockStatePropertyKeysGenerator.inDataTypePkg("SideChain"));
157+
vanillaEnumTypeMapping.put(CopperGolemStatueBlock.Pose.class, BlockStatePropertyKeysGenerator.inDataTypePkg("CopperGolemPose"));
158+
vanillaEnumTypeMapping.put(WeatheringCopper.WeatherState.class, BlockStatePropertyKeysGenerator.inDataTypePkg("CopperOxidation"));
153159

154160
// Custom Mapping required see StateHolderMixin_API
155161
final ClassName portionTypeClass = BlockStatePropertyKeysGenerator.inDataTypePkg("PortionType");

‎generator/src/main/java/org/spongepowered/vanilla/generator/Context.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,13 @@ public ClassName relativeClass(final String relativePackage, final String simple
8585

8686
public CompilationUnit compilationUnit(final String relativePackage, final String simpleName) {
8787
final String pkg = relativePackage.isBlank() ? Context.BASE_PACKAGE : String.join(".", Context.BASE_PACKAGE, relativePackage);
88-
final CompilationUnit unit = this.sourceRoot.parse(pkg, simpleName + ".java");
89-
LexicalPreservingPrinter.setup(unit);
90-
return unit;
88+
try {
89+
final CompilationUnit unit = this.sourceRoot.parse(pkg, simpleName + ".java");
90+
LexicalPreservingPrinter.setup(unit);
91+
return unit;
92+
} catch (Exception e) {
93+
throw new RuntimeException("Failed to parse " + simpleName + ".java", e);
94+
}
9195
}
9296

9397
/**

‎generator/src/main/java/org/spongepowered/vanilla/generator/world/level/block/BlockRegistries.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,15 @@
2626

2727
import net.minecraft.core.registries.Registries;
2828
import net.minecraft.world.level.Explosion;
29+
import net.minecraft.world.level.block.CopperGolemStatueBlock;
30+
import net.minecraft.world.level.block.WeatheringCopper;
2931
import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState;
3032
import net.minecraft.world.level.block.state.properties.BambooLeaves;
3133
import net.minecraft.world.level.block.state.properties.CreakingHeartState;
3234
import net.minecraft.world.level.block.state.properties.DripstoneThickness;
3335
import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
3436
import net.minecraft.world.level.block.state.properties.SculkSensorPhase;
37+
import net.minecraft.world.level.block.state.properties.SideChainPart;
3538
import net.minecraft.world.level.block.state.properties.TestBlockMode;
3639
import net.minecraft.world.level.block.state.properties.Tilt;
3740
import org.spongepowered.vanilla.generator.BlockStateDataProviderGenerator;
@@ -90,6 +93,27 @@ public static List<Generator> enumRegistries(final Context context) {
9093
TrialSpawnerState.class,
9194
"getSerializedName",
9295
"sponge"
96+
),
97+
new EnumEntriesValidator<>(
98+
"data.type",
99+
"CopperGolemPoses",
100+
CopperGolemStatueBlock.Pose.class,
101+
"getSerializedName",
102+
"sponge"
103+
),
104+
new EnumEntriesValidator<>(
105+
"data.type",
106+
"SideChains",
107+
SideChainPart.class,
108+
"getSerializedName",
109+
"sponge"
110+
),
111+
new EnumEntriesValidator<>(
112+
"data.type",
113+
"CopperOxidations",
114+
WeatheringCopper.WeatherState.class,
115+
"getSerializedName",
116+
"sponge"
93117
)
94118
);
95119
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
1212
mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json,mixins.sponge.test.json
1313
superClassChanges=common.superclasschange
1414

15-
minecraftVersion=1.21.8
15+
minecraftVersion=1.21.9
1616
recommendedVersion=0-SNAPSHOT
1717

1818
org.gradle.dependency.verification.console=verbose

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ asm = "9.8"
88
log4j = "2.24.1"
99
forgeAutoRenamingTool = "1.0.6"
1010
mixin = "0.8.7"
11-
mixinextras = "0.4.1"
11+
mixinextras = "0.5.0"
1212
modlauncher = "10.2.2"
1313
securemodules = "2.2.22"
1414
fancymodloader = "9.0.16"

‎gradle/verification-metadata.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,30 @@
15171517
<sha256 value="838545b541140fed5abec50a4530674caf6175def230f5277dffa6e99a011cfd" origin="Generated by Gradle"/>
15181518
</artifact>
15191519
</component>
1520+
<component group="com.mojang" name="authlib" version="6.0.59">
1521+
<artifact name="authlib-6.0.59.jar">
1522+
<sha256 value="dc7f41f1076c7b838d3d5ef9af8a0926d88fca595f135005ebda5563b734635e" origin="Generated by Gradle"/>
1523+
</artifact>
1524+
<artifact name="authlib-6.0.59.module">
1525+
<sha256 value="c65dce3f0f26ece6c4f879a2e9a144740adbcdc0623f1c9c0dfd9e38348e47e7" origin="Generated by Gradle"/>
1526+
</artifact>
1527+
</component>
1528+
<component group="com.mojang" name="authlib" version="7.0.60">
1529+
<artifact name="authlib-7.0.60.jar">
1530+
<sha256 value="4c2667278d1e95bf3930a7b9d592054f980b5d9ec6c30cdbdaab8ed8fcfe9792" origin="Generated by Gradle"/>
1531+
</artifact>
1532+
<artifact name="authlib-7.0.60.module">
1533+
<sha256 value="07952ca671dc41cbaf464ad7a2ced4f6ac3e8f02c0c79c0ad6f346fef42500bc" origin="Generated by Gradle"/>
1534+
</artifact>
1535+
</component>
1536+
<component group="com.mojang" name="authlib" version="7.0.61">
1537+
<artifact name="authlib-7.0.61.jar">
1538+
<sha256 value="09a152617bd23c86bf59db1f9ba82ede23ec8f691a824d6c5dec4f0175f82aa4" origin="Generated by Gradle"/>
1539+
</artifact>
1540+
<artifact name="authlib-7.0.61.module">
1541+
<sha256 value="4ecf4140249220cb574ff7cea1b8e32803a3cd4504a809208ff84c7723509c54" origin="Generated by Gradle"/>
1542+
</artifact>
1543+
</component>
15201544
<component group="com.mojang" name="blocklist" version="1.0.10">
15211545
<artifact name="blocklist-1.0.10.jar">
15221546
<sha256 value="830bfd639c8db49236bbd8e45d3a2b8c96c56ff654a10118654958a6235d4c44" origin="Generated by Gradle"/>
@@ -1594,6 +1618,23 @@
15941618
<sha256 value="85ba29742305205f32dc4f09c28573484ed2288614eb6ef0f23b236a2187759f" origin="Generated by Gradle"/>
15951619
</artifact>
15961620
</component>
1621+
<component group="com.mojang" name="jtracy" version="1.0.36">
1622+
<artifact name="jtracy-1.0.36-natives-linux.jar">
1623+
<sha256 value="2a0716b5b176f1590de64139cf55ef625e9e5e1fc3ccff68b3f45f2b8322070a" origin="Generated by Gradle"/>
1624+
</artifact>
1625+
<artifact name="jtracy-1.0.36-natives-macos-arm64.jar">
1626+
<sha256 value="4fef052bb6338c380cf93c5743fc1f029329b5bbf9af7fe872b079ab50f83586" origin="Generated by Gradle"/>
1627+
</artifact>
1628+
<artifact name="jtracy-1.0.36-natives-macos.jar">
1629+
<sha256 value="4f067d4a7f39c117a87fe32cb5a38ec141dc8faec653cd73eb360f1cdb80940c" origin="Generated by Gradle"/>
1630+
</artifact>
1631+
<artifact name="jtracy-1.0.36.jar">
1632+
<sha256 value="9c92b24db9be79f1c3631e0c39ab81d57c9dbb877e64bdffacd61a28f995afbc" origin="Generated by Gradle"/>
1633+
</artifact>
1634+
<artifact name="jtracy-1.0.36.module">
1635+
<sha256 value="db4c4a4b703833cb0cf9229508a24aab8f60bd97d7b9a046cf236f4496597f45" origin="Generated by Gradle"/>
1636+
</artifact>
1637+
</component>
15971638
<component group="com.mojang" name="logging" version="1.1.1">
15981639
<artifact name="logging-1.1.1.jar">
15991640
<sha256 value="c1756eaf0685da94142bacc84309bb7ccddf65e004638c3299ab645710b5938c" origin="Generated by Gradle"/>
@@ -2377,6 +2418,14 @@
23772418
<sha256 value="bc224bc9bb3c376b76a673e146f548dfb5152b15f2cf0a1f1df697cf1a3acc9e" origin="Generated by Gradle"/>
23782419
</artifact>
23792420
</component>
2421+
<component group="io.github.llamalad7" name="mixinextras-common" version="0.5.0">
2422+
<artifact name="mixinextras-common-0.5.0.jar">
2423+
<sha256 value="42c6bdf93c12cbf90f5451988dfed763ab8489ce2e40a1d843518b309ff0abaa" origin="Generated by Gradle"/>
2424+
</artifact>
2425+
<artifact name="mixinextras-common-0.5.0.pom">
2426+
<sha256 value="e2273bd2198d4ee243ec4f84c5feed1dcbb2c8a86586580a5849ed5b7608a005" origin="Generated by Gradle"/>
2427+
</artifact>
2428+
</component>
23802429
<component group="io.github.llamalad7" name="mixinextras-forge" version="0.4.1">
23812430
<artifact name="mixinextras-forge-0.4.1.jar">
23822431
<sha256 value="9d48cb0a40299d283248fdad8b02c6d175c45b27f9bec48ef63d7ee8a4ee3066" origin="Generated by Gradle"/>
@@ -2480,6 +2529,14 @@
24802529
<sha256 value="fb9f9476e733f09760c9d1860d25dee624e4a942e611623933b577807dbf413d" origin="Generated by Gradle"/>
24812530
</artifact>
24822531
</component>
2532+
<component group="io.netty" name="netty-codec-http" version="4.1.118.Final">
2533+
<artifact name="netty-codec-http-4.1.118.Final.jar">
2534+
<sha256 value="09822d785e9a794838031ddd5346cf419b30c036a981c2e277a062bea884174b" origin="Generated by Gradle"/>
2535+
</artifact>
2536+
<artifact name="netty-codec-http-4.1.118.Final.pom">
2537+
<sha256 value="efa0a65fa1bccbd98dd14def99fda66dae999f6efc4b6418803bb50c6713c716" origin="Generated by Gradle"/>
2538+
</artifact>
2539+
</component>
24832540
<component group="io.netty" name="netty-common" version="4.1.115.Final">
24842541
<artifact name="netty-common-4.1.115.Final.jar">
24852542
<sha256 value="39f1b5a2aaa4eab5d036dfd0486e35a4276df412e092d36b2d88b494705a134d" origin="Generated by Gradle"/>
@@ -3859,6 +3916,11 @@
38593916
<sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle"/>
38603917
</artifact>
38613918
</component>
3919+
<component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="4.3.0">
3920+
<artifact name="net.ltgt.errorprone.gradle.plugin-4.3.0.pom">
3921+
<sha256 value="3370e20ef3213ffce47f7fda31266c33e9cca3b1b7f4d54169b482277042654b" origin="Generated by Gradle"/>
3922+
</artifact>
3923+
</component>
38623924
<component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="3.1.0">
38633925
<artifact name="gradle-errorprone-plugin-3.1.0.jar">
38643926
<sha256 value="10fb66b55747ced1db9c89c8c3d0adb5dbd3f8f12f2a183bee2b5ff818d1fd6c" origin="Generated by Gradle"/>
@@ -3867,6 +3929,14 @@
38673929
<sha256 value="d393a0d3337193cb21b64a98714a1da8a966349be214cbb16171a9925a7985ee" origin="Generated by Gradle"/>
38683930
</artifact>
38693931
</component>
3932+
<component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="4.3.0">
3933+
<artifact name="gradle-errorprone-plugin-4.3.0.jar">
3934+
<sha256 value="42f89c1f582ecd09459586d3d19c0fa92a332035e4a70b5699a8ec6a81aec32c" origin="Generated by Gradle"/>
3935+
</artifact>
3936+
<artifact name="gradle-errorprone-plugin-4.3.0.module">
3937+
<sha256 value="6d2b0a7809ffde227ec15a4cf28e68929be22a1a12a0f56ad5e795d5058f2f6e" origin="Generated by Gradle"/>
3938+
</artifact>
3939+
</component>
38703940
<component group="net.md-5" name="SpecialSource" version="1.8.5">
38713941
<artifact name="SpecialSource-1.8.5.jar">
38723942
<sha256 value="0ac4b7acac8d927e75cf47061b0c067130dd3bd713c493205ea7607241df2813" origin="Generated by Gradle"/>

‎neoforge/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import net.neoforged.moddevgradle.internal.RunGameTask
3-
import org.gradle.api.tasks.JavaExec
43
import org.spongepowered.gradle.impl.AWToAT
54

65
buildscript {
@@ -405,6 +404,7 @@ tasks {
405404
test {
406405
useJUnitPlatform()
407406

407+
maxHeapSize = "4G"
408408
testClassesDirs = commonTest.get().output.classesDirs + testSources.get().output.classesDirs
409409

410410
jvmArgs(runServer.get().jvmArgs)

0 commit comments

Comments
 (0)