Skip to content

Added 1.21.8 support #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 12, 2025
Merged

Added 1.21.8 support #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8788eab
Added 1.21.8 bukkit support
OakLoaf Jul 17, 2025
953895a
Bumped dependencies
OakLoaf Jul 18, 2025
852f5aa
Bumped dependencies
OakLoaf Jul 18, 2025
4ddb741
Refactored packages for 1.21.8
OakLoaf Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ object Versions {
}

object Fabric {
const val fabricAPI = "0.128.1+${Mod.minecraft}"
const val fabricAPI = "0.129.0+${Mod.minecraft}"
const val cloud = "2.0.0-beta.11"
}
//
Expand All @@ -41,7 +41,7 @@ object Versions {
const val mixin = "0.15.5+mixin.0.8.7"
const val mixinExtras = "0.4.1"

const val minecraft = "1.21.7"
const val minecraft = "1.21.8"
const val yarn = "$minecraft+build.1"
const val fabricLoader = "0.16.14"

Expand All @@ -56,8 +56,8 @@ object Versions {
// }

object Bukkit {
const val minecraft = "1.21.7-R0.1"
const val paperBuild = "$minecraft-20250630.144242-1"
const val minecraft = "1.21.8-R0.1"
const val paperBuild = "$minecraft-20250717.233435-4"
const val paper = paperBuild
const val paperLib = "1.0.8"
const val reflectionRemapper = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion platforms/bukkit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle)

shaded(project(":platforms:bukkit:common"))
shaded(project(":platforms:bukkit:nms:v1_21_7"))
shaded(project(":platforms:bukkit:nms:v1_21_8"))
shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
}

Expand Down
4 changes: 2 additions & 2 deletions platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ static PlatformImpl init(TerraBukkitPlugin plugin) {
private static PlatformImpl constructPlatform(TerraBukkitPlugin plugin) {
try {
String packageVersion = NMS;
if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6")) {
packageVersion = "v1_21_7";
if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6") || NMS.equals("v1_21_7")) {
packageVersion = "v1_21_8";
}

Class<?> platformClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSPlatform");
Expand Down
0 ...forms/bukkit/nms/v1_21_7/build.gradle.kts → ...forms/bukkit/nms/v1_21_8/build.gradle.kts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../bukkit/nms/v1_21_7/AwfulBukkitHacks.java → .../bukkit/nms/v1_21_8/AwfulBukkitHacks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties;

import com.dfsek.terra.bukkit.world.BukkitBiomeInfo;

Expand Down
4 changes: 2 additions & 2 deletions ...ek/terra/bukkit/nms/v1_21_7/NMSAddon.java → ...ek/terra/bukkit/nms/v1_21_8/NMSAddon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.bukkit.BukkitAddon;
import com.dfsek.terra.bukkit.PlatformImpl;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties;


public class NMSAddon extends BukkitAddon {
Expand Down
2 changes: 1 addition & 1 deletion ...erra/bukkit/nms/v1_21_7/NMSBiomeInfo.java → ...erra/bukkit/nms/v1_21_8/NMSBiomeInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.biome.Biome;
Expand Down
4 changes: 2 additions & 2 deletions .../bukkit/nms/v1_21_7/NMSBiomeInjector.java → .../bukkit/nms/v1_21_8/NMSBiomeInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
Expand All @@ -12,7 +12,7 @@
import java.util.Optional;

import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties;


public class NMSBiomeInjector {
Expand Down
2 changes: 1 addition & 1 deletion .../bukkit/nms/v1_21_7/NMSBiomeProvider.java → .../bukkit/nms/v1_21_8/NMSBiomeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import com.mojang.serialization.MapCodec;
import net.minecraft.core.Holder;
Expand Down
2 changes: 1 addition & 1 deletion ...ms/v1_21_7/NMSChunkGeneratorDelegate.java → ...ms/v1_21_8/NMSChunkGeneratorDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import com.mojang.serialization.MapCodec;
import net.minecraft.core.BlockPos;
Expand Down
2 changes: 1 addition & 1 deletion ...bukkit/nms/v1_21_7/NMSInjectListener.java → ...bukkit/nms/v1_21_8/NMSInjectListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import net.minecraft.server.level.ChunkMap;
import net.minecraft.server.level.ServerLevel;
Expand Down
24 changes: 12 additions & 12 deletions ...terra/bukkit/nms/v1_21_7/NMSPlatform.java → ...terra/bukkit/nms/v1_21_8/NMSPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import com.dfsek.tectonic.api.TypeRegistry;

Expand All @@ -12,22 +12,22 @@
import com.dfsek.terra.bukkit.PlatformImpl;
import com.dfsek.terra.bukkit.TerraBukkitPlugin;

import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeAdditionsSoundTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeMoodSoundTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeParticleConfigTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.EntityTypeTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeAdditionsSoundTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeMoodSoundTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeParticleConfigTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.EntityTypeTemplate;

import com.dfsek.terra.bukkit.nms.v1_21_7.config.MusicSoundTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.MusicSoundTemplate;

import com.dfsek.terra.bukkit.nms.v1_21_7.config.SoundEventTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.SoundEventTemplate;

import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnCostConfig;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnCostConfig;

import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnEntryConfig;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnSettingsTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnTypeConfig;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnEntryConfig;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnSettingsTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnTypeConfig;

import com.dfsek.terra.bukkit.nms.v1_21_7.config.VillagerTypeTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_8.config.VillagerTypeTemplate;

import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.Music;
Expand Down
2 changes: 1 addition & 1 deletion ...ukkit/nms/v1_21_7/NMSWorldProperties.java → ...ukkit/nms/v1_21_8/NMSWorldProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import net.minecraft.world.level.LevelHeightAccessor;

Expand Down
2 changes: 1 addition & 1 deletion .../terra/bukkit/nms/v1_21_7/Reflection.java → .../terra/bukkit/nms/v1_21_8/Reflection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import net.minecraft.core.Holder;
import net.minecraft.core.Holder.Reference;
Expand Down
2 changes: 1 addition & 1 deletion ...a/bukkit/nms/v1_21_7/RegistryFetcher.java → ...a/bukkit/nms/v1_21_8/RegistryFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7;
package com.dfsek.terra.bukkit.nms.v1_21_8;

import net.minecraft.core.Registry;
import net.minecraft.core.registries.Registries;
Expand Down
2 changes: 1 addition & 1 deletion ...7/config/BiomeAdditionsSoundTemplate.java → ...8/config/BiomeAdditionsSoundTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...1_21_7/config/BiomeMoodSoundTemplate.java → ...1_21_8/config/BiomeMoodSoundTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
5 changes: 1 addition & 4 deletions ...7/config/BiomeParticleConfigTemplate.java → ...8/config/BiomeParticleConfigTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand All @@ -7,10 +7,7 @@
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.commands.arguments.ParticleArgument;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.HolderLookup.Provider;
import net.minecraft.core.HolderLookup.RegistryLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.level.biome.AmbientParticleSettings;

import java.util.stream.Stream;
Expand Down
2 changes: 1 addition & 1 deletion ...ms/v1_21_7/config/EntityTypeTemplate.java → ...ms/v1_21_8/config/EntityTypeTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...ms/v1_21_7/config/MusicSoundTemplate.java → ...ms/v1_21_8/config/MusicSoundTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...ms/v1_21_7/config/SoundEventTemplate.java → ...ms/v1_21_8/config/SoundEventTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...t/nms/v1_21_7/config/SpawnCostConfig.java → ...t/nms/v1_21_8/config/SpawnCostConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion .../nms/v1_21_7/config/SpawnEntryConfig.java → .../nms/v1_21_8/config/SpawnEntryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...v1_21_7/config/SpawnSettingsTemplate.java → ...v1_21_8/config/SpawnSettingsTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...t/nms/v1_21_7/config/SpawnTypeConfig.java → ...t/nms/v1_21_8/config/SpawnTypeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...1_21_7/config/VanillaBiomeProperties.java → ...1_21_8/config/VanillaBiomeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.ConfigTemplate;
import com.dfsek.tectonic.api.config.template.annotations.Default;
Expand Down
2 changes: 1 addition & 1 deletion .../v1_21_7/config/VillagerTypeTemplate.java → .../v1_21_8/config/VillagerTypeTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dfsek.terra.bukkit.nms.v1_21_7.config;
package com.dfsek.terra.bukkit.nms.v1_21_8.config;

import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
Expand Down