mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-08-16 00:15:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored packages for 1.21.8

Browse Source
This commit is contained in:
OakLoaf 2025-07-19 18:23:32 +01:00
parent 852f5aa610
commit 4ddb741d0d
26 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/bukkit/build.gradle.kts
View File

@ -8,7 +8,7 @@ dependencies {
paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle) paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle)
shaded(project(":platforms:bukkit:common")) 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) shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
} }

4
platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java
View File

@ -47,8 +47,8 @@ public interface Initializer {
private static PlatformImpl constructPlatform(TerraBukkitPlugin plugin) { private static PlatformImpl constructPlatform(TerraBukkitPlugin plugin) {
try { try {
String packageVersion = NMS; String packageVersion = NMS;
if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6") || NMS.equals("v1_21_8")) { if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6") || NMS.equals("v1_21_7")) {
packageVersion = "v1_21_7"; packageVersion = "v1_21_8";
} }
Class<?> platformClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSPlatform"); Class<?> platformClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSPlatform");

0
platforms/bukkit/nms/v1_21_7/build.gradle.kts → platforms/bukkit/nms/v1_21_8/build.gradle.kts
View File

4
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/AwfulBukkitHacks.java
View File

@ -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; import com.dfsek.terra.bukkit.world.BukkitBiomeInfo;

4
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSAddon.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSAddon.java
View File

@ -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.events.config.ConfigurationLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.bukkit.BukkitAddon; import com.dfsek.terra.bukkit.BukkitAddon;
import com.dfsek.terra.bukkit.PlatformImpl; 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 { public class NMSAddon extends BukkitAddon {

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInfo.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInfo.java
View File

@ -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.resources.ResourceKey;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;

4
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInjector.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInjector.java
View File

@ -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;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
@ -12,7 +12,7 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import com.dfsek.terra.api.config.ConfigPack; 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 { public class NMSBiomeInjector {

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeProvider.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeProvider.java
View File

@ -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 com.mojang.serialization.MapCodec;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSChunkGeneratorDelegate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSChunkGeneratorDelegate.java
View File

@ -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 com.mojang.serialization.MapCodec;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInjectListener.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSInjectListener.java
View File

@ -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.ChunkMap;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;

24
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSPlatform.java
View File

@ -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; import com.dfsek.tectonic.api.TypeRegistry;
@ -12,22 +12,22 @@ import com.dfsek.terra.api.world.biome.PlatformBiome;
import com.dfsek.terra.bukkit.PlatformImpl; import com.dfsek.terra.bukkit.PlatformImpl;
import com.dfsek.terra.bukkit.TerraBukkitPlugin; 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_8.config.BiomeAdditionsSoundTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeMoodSoundTemplate; import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeMoodSoundTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeParticleConfigTemplate; import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeParticleConfigTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.EntityTypeTemplate; 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_8.config.SpawnEntryConfig;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnSettingsTemplate; import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnSettingsTemplate;
import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnTypeConfig; 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.resources.ResourceLocation;
import net.minecraft.sounds.Music; import net.minecraft.sounds.Music;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSWorldProperties.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSWorldProperties.java
View File

@ -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; import net.minecraft.world.level.LevelHeightAccessor;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/Reflection.java
View File

@ -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;
import net.minecraft.core.Holder.Reference; import net.minecraft.core.Holder.Reference;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/RegistryFetcher.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/RegistryFetcher.java
View File

@ -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.Registry;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeAdditionsSoundTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeAdditionsSoundTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeMoodSoundTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeMoodSoundTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

5
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeParticleConfigTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;
@ -7,10 +7,7 @@ import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.commands.arguments.ParticleArgument; import net.minecraft.commands.arguments.ParticleArgument;
import net.minecraft.core.HolderLookup; 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.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.level.biome.AmbientParticleSettings; import net.minecraft.world.level.biome.AmbientParticleSettings;
import java.util.stream.Stream; import java.util.stream.Stream;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/EntityTypeTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/EntityTypeTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/MusicSoundTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/MusicSoundTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SoundEventTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SoundEventTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnCostConfig.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnCostConfig.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnEntryConfig.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnSettingsTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnTypeConfig.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnTypeConfig.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VanillaBiomeProperties.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VanillaBiomeProperties.java
View File

@ -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.ConfigTemplate;
import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Default;

2
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VillagerTypeTemplate.java → platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VillagerTypeTemplate.java
View File

@ -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.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;