SteamWar/Paper
11
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

2
paper-server/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageEffect.java
View File

@@ -25,7 +25,7 @@ public class CraftDamageEffect implements DamageEffect {
public static DamageEffect getById(String id) {
for (DamageEffects damageEffects : DamageEffects.values()) {
if (damageEffects.getSerializedName().equalsIgnoreCase(id)) {
return toBukkit(damageEffects);
return CraftDamageEffect.toBukkit(damageEffects);
}
}
return null;

10
paper-server/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java
View File

@@ -1,7 +1,7 @@
package org.bukkit.craftbukkit.damage;
import java.util.Objects;
import net.minecraft.world.phys.Vec3D;
import net.minecraft.world.phys.Vec3;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
@@ -26,7 +26,7 @@ public class CraftDamageSource implements DamageSource {
}
public World getCausingEntityWorld() {
org.bukkit.entity.Entity causingEntity = getCausingEntity();
org.bukkit.entity.Entity causingEntity = this.getCausingEntity();
return causingEntity != null ? causingEntity.getWorld() : null;
}
@@ -53,13 +53,13 @@ public class CraftDamageSource implements DamageSource {
@Override
public Location getDamageLocation() {
Vec3D vec3D = this.getHandle().sourcePositionRaw();
Vec3 vec3D = this.getHandle().sourcePositionRaw();
return (vec3D != null) ? CraftLocation.toBukkit(vec3D, this.getCausingEntityWorld()) : null;
}
@Override
public Location getSourceLocation() {
Vec3D vec3D = this.getHandle().getSourcePosition();
Vec3 vec3D = this.getHandle().getSourcePosition();
return (vec3D != null) ? CraftLocation.toBukkit(vec3D, this.getCausingEntityWorld()) : null;
}
@@ -121,7 +121,7 @@ public class CraftDamageSource implements DamageSource {
nmsDirectEntity = craftDirectEntity.getHandle();
}
Vec3D vec3D = (damageLocation == null) ? null : CraftLocation.toVec3D(damageLocation);
Vec3 vec3D = (damageLocation == null) ? null : CraftLocation.toVec3D(damageLocation);
return new CraftDamageSource(new net.minecraft.world.damagesource.DamageSource(holderDamageType, nmsDirectEntity, nmsCausingEntity, vec3D));
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSourceBuilder.java
View File

@@ -41,6 +41,6 @@ public class CraftDamageSourceBuilder implements DamageSource.Builder {
@Override
public DamageSource build() {
return CraftDamageSource.buildFromBukkit(damageType, causingEntity, directEntity, damageLocation);
return CraftDamageSource.buildFromBukkit(this.damageType, this.causingEntity, this.directEntity, this.damageLocation);
}
}

11
paper-server/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageType.java
View File

@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.damage;
import com.google.common.base.Preconditions;
import net.minecraft.core.Holder;
import net.minecraft.core.IRegistry;
import net.minecraft.core.registries.Registries;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
@@ -35,7 +34,7 @@ public class CraftDamageType implements DamageType, Handleable<net.minecraft.wor
@Override
public DamageScaling getDamageScaling() {
return damageScalingToBukkit(this.getHandle().scaling());
return CraftDamageType.damageScalingToBukkit(this.getHandle().scaling());
}
@Override
@@ -45,7 +44,7 @@ public class CraftDamageType implements DamageType, Handleable<net.minecraft.wor
@Override
public DeathMessageType getDeathMessageType() {
return deathMessageTypeToBukkit(this.getHandle().deathMessageType());
return CraftDamageType.deathMessageTypeToBukkit(this.getHandle().deathMessageType());
}
@Override
@@ -100,15 +99,15 @@ public class CraftDamageType implements DamageType, Handleable<net.minecraft.wor
}
public static DamageType minecraftHolderToBukkit(Holder<net.minecraft.world.damagesource.DamageType> minecraftHolder) {
return minecraftToBukkit(minecraftHolder.value());
return CraftDamageType.minecraftToBukkit(minecraftHolder.value());
}
public static Holder<net.minecraft.world.damagesource.DamageType> bukkitToMinecraftHolder(DamageType bukkitDamageType) {
Preconditions.checkArgument(bukkitDamageType != null);
IRegistry<net.minecraft.world.damagesource.DamageType> registry = CraftRegistry.getMinecraftRegistry(Registries.DAMAGE_TYPE);
net.minecraft.core.Registry<net.minecraft.world.damagesource.DamageType> registry = CraftRegistry.getMinecraftRegistry(Registries.DAMAGE_TYPE);
if (registry.wrapAsHolder(bukkitToMinecraft(bukkitDamageType)) instanceof Holder.c<net.minecraft.world.damagesource.DamageType> holder) {
if (registry.wrapAsHolder(CraftDamageType.bukkitToMinecraft(bukkitDamageType)) instanceof Holder.Reference<net.minecraft.world.damagesource.DamageType> holder) {
return holder;
}