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

Update to Minecraft 1.20.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/src/test/java/org/bukkit/craftbukkit/profile/PlayerProfileTest.java
View File

@@ -95,11 +95,11 @@ public class PlayerProfileTest {
Assert.assertEquals("Unique id is not the same", UNIQUE_ID, profile1.getUniqueId());
Assert.assertEquals("Name is not the same", NAME, profile1.getName());
CraftPlayerProfile profile2 = new CraftPlayerProfile(new GameProfile(UNIQUE_ID, null));
CraftPlayerProfile profile2 = new CraftPlayerProfile(new CraftGameProfile(UNIQUE_ID, null));
Assert.assertEquals("Unique id is not the same", UNIQUE_ID, profile2.getUniqueId());
Assert.assertEquals("Name is not null", null, profile2.getName());
CraftPlayerProfile profile3 = new CraftPlayerProfile(new GameProfile(null, NAME));
CraftPlayerProfile profile3 = new CraftPlayerProfile(new CraftGameProfile(null, NAME));
Assert.assertEquals("Unique id is not null", null, profile3.getUniqueId());
Assert.assertEquals("Name is not the same", NAME, profile3.getName());
}
@@ -123,7 +123,7 @@ public class PlayerProfileTest {
Property property = CraftPlayerProfile.getProperty(gameProfile, CraftPlayerTextures.PROPERTY_NAME);
Assert.assertNotNull("Textures property is null", property);
Assert.assertEquals("Property values are not the same", VALUE, property.getValue());
Assert.assertEquals("Property values are not the same", VALUE, property.value());
Assert.assertEquals("Names are not the same", NAME, gameProfile.getName());
Assert.assertEquals("Unique ids are not the same", UNIQUE_ID, gameProfile.getId());
Assert.assertTrue("Signature is missing", property.hasSignature());
@@ -198,17 +198,17 @@ public class PlayerProfileTest {
public void testCustomSkin() {
CraftPlayerProfile profile = new CraftPlayerProfile(UNIQUE_ID, NAME);
profile.getTextures().setSkin(SKIN);
Assert.assertEquals("profile with custom skin does not match expected value", COMPACT_VALUE, profile.getTextures().getProperty().getValue());
Assert.assertEquals("profile with custom skin does not match expected value", COMPACT_VALUE, profile.getTextures().getProperty().value());
}
@Test
public void testEquals() {
CraftPlayerProfile profile1 = buildPlayerProfile();
CraftPlayerProfile profile2 = buildPlayerProfile();
CraftPlayerProfile profile3 = new CraftPlayerProfile(new GameProfile(UNIQUE_ID, NAME));
CraftPlayerProfile profile4 = new CraftPlayerProfile(new GameProfile(UNIQUE_ID, NAME));
CraftPlayerProfile profile5 = new CraftPlayerProfile(new GameProfile(UNIQUE_ID, null));
CraftPlayerProfile profile6 = new CraftPlayerProfile(new GameProfile(null, NAME));
CraftPlayerProfile profile3 = new CraftPlayerProfile(UNIQUE_ID, NAME);
CraftPlayerProfile profile4 = new CraftPlayerProfile(UNIQUE_ID, NAME);
CraftPlayerProfile profile5 = new CraftPlayerProfile(UNIQUE_ID, null);
CraftPlayerProfile profile6 = new CraftPlayerProfile(null, NAME);
Assert.assertEquals("profile1 and profile2 are not equal", profile1, profile2);
Assert.assertEquals("profile3 and profile4 are not equal", profile3, profile4);

13
paper-server/src/test/java/org/bukkit/potion/PotionTest.java
View File

@@ -9,6 +9,7 @@ import net.minecraft.resources.MinecraftKey;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectList;
import net.minecraft.world.item.alchemy.PotionRegistry;
import org.bukkit.craftbukkit.potion.CraftPotionEffectType;
import org.bukkit.support.AbstractTestingBase;
import org.junit.Test;
@@ -16,12 +17,11 @@ public class PotionTest extends AbstractTestingBase {
@Test
public void testEffectCompleteness() throws Throwable {
Map<PotionType, String> effects = new EnumMap(PotionType.class);
for (Object reg : BuiltInRegistries.POTION) {
List<MobEffect> eff = ((PotionRegistry) reg).getEffects();
for (PotionRegistry reg : BuiltInRegistries.POTION) {
List<MobEffect> eff = reg.getEffects();
if (eff.size() != 1) continue;
int id = MobEffectList.getId(eff.get(0).getEffect());
PotionEffectType type = PotionEffectType.getById(id);
assertNotNull(String.valueOf(id), PotionEffectType.getById(id));
PotionEffectType type = CraftPotionEffectType.minecraftToBukkit(eff.get(0).getEffect());
assertNotNull(String.valueOf(reg), type);
PotionType enumType = PotionType.getByEffect(type);
assertNotNull(type.getName(), enumType);
@@ -37,8 +37,7 @@ public class PotionTest extends AbstractTestingBase {
for (MobEffectList nms : BuiltInRegistries.MOB_EFFECT) {
MinecraftKey key = BuiltInRegistries.MOB_EFFECT.getKey(nms);
int id = MobEffectList.getId(nms);
PotionEffectType bukkit = PotionEffectType.getById(id);
PotionEffectType bukkit = CraftPotionEffectType.minecraftToBukkit(nms);
assertNotNull("No Bukkit type for " + key, bukkit);
assertFalse("No name for " + key, bukkit.getName().contains("UNKNOWN"));

2
paper-server/src/test/java/org/bukkit/support/AbstractTestingBase.java
View File

@@ -46,7 +46,7 @@ public abstract class AbstractTestingBase {
SharedConstants.tryDetectVersion();
DispenserRegistry.bootStrap();
// Populate available packs
ResourcePackRepository resourceRepository = new ResourcePackRepository(new ResourcePackSourceVanilla());
ResourcePackRepository resourceRepository = ResourcePackSourceVanilla.createVanillaTrustedRepository();
resourceRepository.reload();
// Set up resource manager
ResourceManager resourceManager = new ResourceManager(EnumResourcePackType.SERVER_DATA, resourceRepository.getAvailablePacks().stream().map(ResourcePackLoader::open).toList());