SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remap CraftBukkit to Mojang+Yarn Mappings

Browse Source 
By: Initial Source <noreply+automated@papermc.io>
This commit is contained in:
CraftBukkit/Spigot
2024-12-11 22:26:55 +01:00
parent a265d64138
commit 30e4583dbe
1780 changed files with 44628 additions and 41274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
paper-server/src/test/java/org/bukkit/entity/EnderDragonPhaseTest.java
View File

@@ -1,7 +1,8 @@
package org.bukkit.entity;
import static org.junit.jupiter.api.Assertions.*;
import net.minecraft.world.entity.boss.enderdragon.phases.DragonControllerPhase;
import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase;
import org.bukkit.craftbukkit.entity.CraftEnderDragon;
import org.bukkit.support.environment.Normal;
import org.junit.jupiter.api.Test;
@@ -12,7 +13,7 @@ public class EnderDragonPhaseTest {
@Test
public void testNotNull() {
for (EnderDragon.Phase phase : EnderDragon.Phase.values()) {
DragonControllerPhase dragonControllerPhase = CraftEnderDragon.getMinecraftPhase(phase);
EnderDragonPhase dragonControllerPhase = CraftEnderDragon.getMinecraftPhase(phase);
assertNotNull(dragonControllerPhase, phase.name());
assertNotNull(CraftEnderDragon.getBukkitPhase(dragonControllerPhase), phase.name());
}
@@ -20,31 +21,31 @@ public class EnderDragonPhaseTest {
@Test
public void testBukkitToMinecraft() {
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.CIRCLING), DragonControllerPhase.HOLDING_PATTERN, "CIRCLING");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.STRAFING), DragonControllerPhase.STRAFE_PLAYER, "STRAFING");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.FLY_TO_PORTAL), DragonControllerPhase.LANDING_APPROACH, "FLY_TO_PORTAL");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.LAND_ON_PORTAL), DragonControllerPhase.LANDING, "LAND_ON_PORTAL");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.LEAVE_PORTAL), DragonControllerPhase.TAKEOFF, "LEAVE_PORTAL");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.BREATH_ATTACK), DragonControllerPhase.SITTING_FLAMING, "BREATH_ATTACK");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.SEARCH_FOR_BREATH_ATTACK_TARGET), DragonControllerPhase.SITTING_SCANNING, "SEARCH_FOR_BREATH_ATTACK_TARGET");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.ROAR_BEFORE_ATTACK), DragonControllerPhase.SITTING_ATTACKING, "ROAR_BEFORE_ATTACK");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.CHARGE_PLAYER), DragonControllerPhase.CHARGING_PLAYER, "CHARGE_PLAYER");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.DYING), DragonControllerPhase.DYING, "DYING");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.HOVER), DragonControllerPhase.HOVERING, "HOVER");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.CIRCLING), EnderDragonPhase.HOLDING_PATTERN, "CIRCLING");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.STRAFING), EnderDragonPhase.STRAFE_PLAYER, "STRAFING");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.FLY_TO_PORTAL), EnderDragonPhase.LANDING_APPROACH, "FLY_TO_PORTAL");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.LAND_ON_PORTAL), EnderDragonPhase.LANDING, "LAND_ON_PORTAL");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.LEAVE_PORTAL), EnderDragonPhase.TAKEOFF, "LEAVE_PORTAL");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.BREATH_ATTACK), EnderDragonPhase.SITTING_FLAMING, "BREATH_ATTACK");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.SEARCH_FOR_BREATH_ATTACK_TARGET), EnderDragonPhase.SITTING_SCANNING, "SEARCH_FOR_BREATH_ATTACK_TARGET");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.ROAR_BEFORE_ATTACK), EnderDragonPhase.SITTING_ATTACKING, "ROAR_BEFORE_ATTACK");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.CHARGE_PLAYER), EnderDragonPhase.CHARGING_PLAYER, "CHARGE_PLAYER");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.DYING), EnderDragonPhase.DYING, "DYING");
assertEquals(CraftEnderDragon.getMinecraftPhase(EnderDragon.Phase.HOVER), EnderDragonPhase.HOVERING, "HOVER");
}
@Test
public void testMinecraftToBukkit() {
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.HOLDING_PATTERN), EnderDragon.Phase.CIRCLING, "CIRCLING");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.STRAFE_PLAYER), EnderDragon.Phase.STRAFING, "STRAFING");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.LANDING_APPROACH), EnderDragon.Phase.FLY_TO_PORTAL, "FLY_TO_PORTAL");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.LANDING), EnderDragon.Phase.LAND_ON_PORTAL, "LAND_ON_PORTAL");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.TAKEOFF), EnderDragon.Phase.LEAVE_PORTAL, "LEAVE_PORTAL");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.SITTING_FLAMING), EnderDragon.Phase.BREATH_ATTACK, "BREATH_ATTACK");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.SITTING_SCANNING), EnderDragon.Phase.SEARCH_FOR_BREATH_ATTACK_TARGET, "SEARCH_FOR_BREATH_ATTACK_TARGET");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.SITTING_ATTACKING), EnderDragon.Phase.ROAR_BEFORE_ATTACK, "ROAR_BEFORE_ATTACK");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.CHARGING_PLAYER), EnderDragon.Phase.CHARGE_PLAYER, "CHARGE_PLAYER");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.DYING), EnderDragon.Phase.DYING, "DYING");
assertEquals(CraftEnderDragon.getBukkitPhase(DragonControllerPhase.HOVERING), EnderDragon.Phase.HOVER, "HOVER");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.HOLDING_PATTERN), EnderDragon.Phase.CIRCLING, "CIRCLING");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.STRAFE_PLAYER), EnderDragon.Phase.STRAFING, "STRAFING");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.LANDING_APPROACH), EnderDragon.Phase.FLY_TO_PORTAL, "FLY_TO_PORTAL");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.LANDING), EnderDragon.Phase.LAND_ON_PORTAL, "LAND_ON_PORTAL");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.TAKEOFF), EnderDragon.Phase.LEAVE_PORTAL, "LEAVE_PORTAL");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.SITTING_FLAMING), EnderDragon.Phase.BREATH_ATTACK, "BREATH_ATTACK");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.SITTING_SCANNING), EnderDragon.Phase.SEARCH_FOR_BREATH_ATTACK_TARGET, "SEARCH_FOR_BREATH_ATTACK_TARGET");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.SITTING_ATTACKING), EnderDragon.Phase.ROAR_BEFORE_ATTACK, "ROAR_BEFORE_ATTACK");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.CHARGING_PLAYER), EnderDragon.Phase.CHARGE_PLAYER, "CHARGE_PLAYER");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.DYING), EnderDragon.Phase.DYING, "DYING");
assertEquals(CraftEnderDragon.getBukkitPhase(EnderDragonPhase.HOVERING), EnderDragon.Phase.HOVER, "HOVER");
}
}

9
paper-server/src/test/java/org/bukkit/entity/EntityPoseTest.java
View File

@@ -1,7 +1,8 @@
package org.bukkit.entity;
import static org.junit.jupiter.api.Assertions.*;
import net.minecraft.world.entity.EntityPose;
import net.minecraft.world.entity.Pose;
import org.bukkit.support.environment.Normal;
import org.junit.jupiter.api.Test;
@@ -11,14 +12,14 @@ public class EntityPoseTest {
@Test
public void testBukkitToMinecraft() {
for (Pose pose : Pose.values()) {
assertNotNull(EntityPose.values()[pose.ordinal()], pose.name());
assertNotNull(Pose.values()[pose.ordinal()], pose.name());
}
}
@Test
public void testMinecraftToBukkit() {
for (EntityPose entityPose : EntityPose.values()) {
assertNotNull(Pose.values()[entityPose.ordinal()], entityPose.name());
for (Pose entityPose : Pose.values()) {
assertNotNull(org.bukkit.entity.Pose.values()[entityPose.ordinal()], entityPose.name());
}
}
}

12
paper-server/src/test/java/org/bukkit/entity/EntityTypesTest.java
View File

@@ -5,8 +5,8 @@ import java.util.Arrays;
import java.util.Set;
import java.util.stream.Collectors;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.MinecraftKey;
import net.minecraft.world.entity.EntityTypes;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import org.bukkit.support.environment.AllFeatures;
import org.junit.jupiter.api.Test;
@@ -17,10 +17,10 @@ public class EntityTypesTest {
public void testMaps() {
Set<EntityType> allBukkit = Arrays.stream(EntityType.values()).filter((b) -> b.getName() != null).collect(Collectors.toSet());
for (EntityTypes<?> nms : BuiltInRegistries.ENTITY_TYPE) {
MinecraftKey key = EntityTypes.getKey(nms);
for (EntityType<?> nms : BuiltInRegistries.ENTITY_TYPE) {
ResourceLocation key = EntityType.getKey(nms);
EntityType bukkit = EntityType.fromName(key.getPath());
org.bukkit.entity.EntityType bukkit = org.bukkit.entity.EntityType.fromName(key.getPath());
assertNotNull(bukkit, "Missing nms->bukkit " + key);
assertTrue(allBukkit.remove(bukkit), "Duplicate entity nms->" + bukkit);
@@ -31,7 +31,7 @@ public class EntityTypesTest {
@Test
public void testTranslationKey() {
for (EntityType entityType : EntityType.values()) {
for (org.bukkit.entity.EntityType entityType : org.bukkit.entity.EntityType.values()) {
// Currently EntityType#getTranslationKey has a validation for null name then for test skip this and check correct names.
if (entityType.getName() != null) {
assertNotNull(entityType.getTranslationKey(), "Nulllable translation key for " + entityType);

9
paper-server/src/test/java/org/bukkit/entity/PandaGeneTest.java
View File

@@ -1,7 +1,8 @@
package org.bukkit.entity;
import static org.junit.jupiter.api.Assertions.*;
import net.minecraft.world.entity.animal.EntityPanda;
import net.minecraft.world.entity.animal.Panda;
import org.bukkit.craftbukkit.entity.CraftPanda;
import org.bukkit.support.environment.Normal;
import org.junit.jupiter.api.Test;
@@ -12,7 +13,7 @@ public class PandaGeneTest {
@Test
public void testBukkit() {
for (Panda.Gene gene : Panda.Gene.values()) {
EntityPanda.Gene nms = CraftPanda.toNms(gene);
Panda.Gene nms = CraftPanda.toNms(gene);
assertNotNull(nms, "NMS gene null for " + gene);
assertEquals(gene.isRecessive(), nms.isRecessive(), "Recessive status did not match " + gene);
@@ -22,8 +23,8 @@ public class PandaGeneTest {
@Test
public void testNMS() {
for (EntityPanda.Gene gene : EntityPanda.Gene.values()) {
Panda.Gene bukkit = CraftPanda.fromNms(gene);
for (Panda.Gene gene : Panda.Gene.values()) {
org.bukkit.entity.Panda.Gene bukkit = CraftPanda.fromNms(gene);
assertNotNull(bukkit, "Bukkit gene null for " + gene);
assertEquals(gene.isRecessive(), bukkit.isRecessive(), "Recessive status did not match " + gene);

6
paper-server/src/test/java/org/bukkit/entity/SpawnCategoryTest.java
View File

@@ -1,6 +1,6 @@
package org.bukkit.entity;
import net.minecraft.world.entity.EnumCreatureType;
import net.minecraft.world.entity.MobCategory;
import org.bukkit.craftbukkit.util.CraftSpawnCategory;
import org.bukkit.support.environment.Normal;
import org.junit.jupiter.api.Test;
@@ -10,7 +10,7 @@ public class SpawnCategoryTest {
@Test
public void testMatch() {
for (EnumCreatureType enumCreatureType : EnumCreatureType.values()) {
for (MobCategory enumCreatureType : MobCategory.values()) {
// If it is missing a convert to Bukkit then throw a UnsupportedOperationException
SpawnCategory spawnCategory = CraftSpawnCategory.toBukkit(enumCreatureType);
@@ -23,7 +23,7 @@ public class SpawnCategoryTest {
for (SpawnCategory spawnCategory : SpawnCategory.values()) {
// If it is missing a convert to NMS then throw a UnsupportedOperationException
EnumCreatureType enumCreatureType = CraftSpawnCategory.toNMS(spawnCategory);
MobCategory enumCreatureType = CraftSpawnCategory.toNMS(spawnCategory);
}
}
}

44
paper-server/src/test/java/org/bukkit/entity/TropicalFishTest.java
View File

@@ -13,28 +13,28 @@ public class TropicalFishTest {
@Test
public void testVariants() {
testVariant(65536, DyeColor.ORANGE, DyeColor.WHITE, Pattern.KOB);
testVariant(917504, DyeColor.RED, DyeColor.WHITE, Pattern.KOB);
testVariant(918273, DyeColor.RED, DyeColor.WHITE, Pattern.BLOCKFISH);
testVariant(918529, DyeColor.RED, DyeColor.WHITE, Pattern.BETTY);
testVariant(16778497, DyeColor.WHITE, DyeColor.ORANGE, Pattern.CLAYFISH);
testVariant(50660352, DyeColor.LIME, DyeColor.LIGHT_BLUE, Pattern.BRINELY);
testVariant(50726144, DyeColor.PINK, DyeColor.LIGHT_BLUE, Pattern.SPOTTY);
testVariant(50790656, DyeColor.GRAY, DyeColor.LIGHT_BLUE, Pattern.SUNSTREAK);
testVariant(67108865, DyeColor.WHITE, DyeColor.YELLOW, Pattern.FLOPPER);
testVariant(67110144, DyeColor.WHITE, DyeColor.YELLOW, Pattern.SPOTTY);
testVariant(67371265, DyeColor.YELLOW, DyeColor.YELLOW, Pattern.STRIPEY);
testVariant(67764993, DyeColor.PURPLE, DyeColor.YELLOW, Pattern.BLOCKFISH);
testVariant(101253888, DyeColor.CYAN, DyeColor.PINK, Pattern.DASHER);
testVariant(117441025, DyeColor.WHITE, DyeColor.GRAY, Pattern.GLITTER);
testVariant(117441280, DyeColor.WHITE, DyeColor.GRAY, Pattern.DASHER);
testVariant(117441536, DyeColor.WHITE, DyeColor.GRAY, Pattern.BRINELY);
testVariant(117506305, DyeColor.ORANGE, DyeColor.GRAY, Pattern.STRIPEY);
testVariant(117899265, DyeColor.GRAY, DyeColor.GRAY, Pattern.FLOPPER);
testVariant(118161664, DyeColor.BLUE, DyeColor.GRAY, Pattern.SUNSTREAK);
testVariant(134217984, DyeColor.WHITE, DyeColor.LIGHT_GRAY, Pattern.SUNSTREAK);
testVariant(234882305, DyeColor.WHITE, DyeColor.RED, Pattern.CLAYFISH);
testVariant(235340288, DyeColor.GRAY, DyeColor.RED, Pattern.SNOOPER);
this.testVariant(65536, DyeColor.ORANGE, DyeColor.WHITE, Pattern.KOB);
this.testVariant(917504, DyeColor.RED, DyeColor.WHITE, Pattern.KOB);
this.testVariant(918273, DyeColor.RED, DyeColor.WHITE, Pattern.BLOCKFISH);
this.testVariant(918529, DyeColor.RED, DyeColor.WHITE, Pattern.BETTY);
this.testVariant(16778497, DyeColor.WHITE, DyeColor.ORANGE, Pattern.CLAYFISH);
this.testVariant(50660352, DyeColor.LIME, DyeColor.LIGHT_BLUE, Pattern.BRINELY);
this.testVariant(50726144, DyeColor.PINK, DyeColor.LIGHT_BLUE, Pattern.SPOTTY);
this.testVariant(50790656, DyeColor.GRAY, DyeColor.LIGHT_BLUE, Pattern.SUNSTREAK);
this.testVariant(67108865, DyeColor.WHITE, DyeColor.YELLOW, Pattern.FLOPPER);
this.testVariant(67110144, DyeColor.WHITE, DyeColor.YELLOW, Pattern.SPOTTY);
this.testVariant(67371265, DyeColor.YELLOW, DyeColor.YELLOW, Pattern.STRIPEY);
this.testVariant(67764993, DyeColor.PURPLE, DyeColor.YELLOW, Pattern.BLOCKFISH);
this.testVariant(101253888, DyeColor.CYAN, DyeColor.PINK, Pattern.DASHER);
this.testVariant(117441025, DyeColor.WHITE, DyeColor.GRAY, Pattern.GLITTER);
this.testVariant(117441280, DyeColor.WHITE, DyeColor.GRAY, Pattern.DASHER);
this.testVariant(117441536, DyeColor.WHITE, DyeColor.GRAY, Pattern.BRINELY);
this.testVariant(117506305, DyeColor.ORANGE, DyeColor.GRAY, Pattern.STRIPEY);
this.testVariant(117899265, DyeColor.GRAY, DyeColor.GRAY, Pattern.FLOPPER);
this.testVariant(118161664, DyeColor.BLUE, DyeColor.GRAY, Pattern.SUNSTREAK);
this.testVariant(134217984, DyeColor.WHITE, DyeColor.LIGHT_GRAY, Pattern.SUNSTREAK);
this.testVariant(234882305, DyeColor.WHITE, DyeColor.RED, Pattern.CLAYFISH);
this.testVariant(235340288, DyeColor.GRAY, DyeColor.RED, Pattern.SNOOPER);
}
private void testVariant(int variant, DyeColor bodyColor, DyeColor patternColor, Pattern pattern) {