Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add pose and illager spell registries (#1124)

Browse Source
This commit is contained in:
IzzelAliz 2023-12-02 23:23:37 +08:00
parent 6fa5b87a9f
commit d61604007f
5 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftSpellcasterMixin.java Normal file
View File

@ -0,0 +1,40 @@
package io.izzel.arclight.common.mixin.bukkit;
import io.izzel.arclight.api.EnumHelper;
import io.izzel.arclight.common.mod.ArclightMod;
import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase;
import net.minecraft.world.entity.monster.SpellcasterIllager;
import org.bukkit.craftbukkit.v.entity.CraftSpellcaster;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.Spellcaster;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import java.util.ArrayList;
import java.util.List;
@Mixin(CraftSpellcaster.class)
public class CraftSpellcasterMixin {
/**
* @author IzzelAliz
* @reason
*/
@Overwrite
public static Spellcaster.Spell toBukkitSpell(SpellcasterIllager.IllagerSpell spell) {
try {
return Spellcaster.Spell.valueOf(spell.name());
} catch (IllegalArgumentException e) {
var newTypes = new ArrayList<Spellcaster.Spell>();
var forgeCount = SpellcasterIllager.IllagerSpell.values().length;
for (var id = Spellcaster.Spell.values().length; id < forgeCount; id++) {
var name = SpellcasterIllager.IllagerSpell.values()[id].name();
var newPhase = EnumHelper.makeEnum(Spellcaster.Spell.class, name, id, List.of(), List.of());
newTypes.add(newPhase);
ArclightMod.LOGGER.debug("Registered {} as illager spell {}", name, newPhase);
}
EnumHelper.addEnums(Spellcaster.Spell.class, newTypes);
return toBukkitSpell(spell);
}
}
}

3
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java
View File

@ -11,6 +11,7 @@ import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBrid
import io.izzel.arclight.common.bridge.core.network.datasync.SynchedEntityDataBridge;
import io.izzel.arclight.common.bridge.core.world.TeleporterBridge;
import io.izzel.arclight.common.bridge.core.world.WorldBridge;
import io.izzel.arclight.common.mod.server.BukkitRegistry;
import io.izzel.arclight.common.mod.util.ArclightCaptures;
import net.minecraft.BlockUtil;
import net.minecraft.commands.CommandSourceStack;
@ -315,7 +316,7 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge,
callbackInfo.cancel();
return;
}
EntityPoseChangeEvent event = new EntityPoseChangeEvent(this.internal$getBukkitEntity(), org.bukkit.entity.Pose.values()[poseIn.ordinal()]);
EntityPoseChangeEvent event = new EntityPoseChangeEvent(this.internal$getBukkitEntity(), BukkitRegistry.toBukkitPose(poseIn));
Bukkit.getPluginManager().callEvent(event);
}

18
arclight-common/src/main/java/io/izzel/arclight/common/mod/server/BukkitRegistry.java
View File

@ -30,6 +30,7 @@ import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase;
import net.minecraft.world.entity.monster.SpellcasterIllager;
import net.minecraft.world.entity.npc.VillagerProfession;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
@ -60,7 +61,9 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Pose;
import org.bukkit.entity.SpawnCategory;
import org.bukkit.entity.Spellcaster;
import org.bukkit.entity.Villager;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionType;
@ -473,6 +476,21 @@ public class BukkitRegistry {
return ArclightConfig.spec().getCompat().getEntity(location.toString()).orElse(EntityPropertySpec.EMPTY);
}
public static Pose toBukkitPose(net.minecraft.world.entity.Pose nms) {
if (Pose.values().length <= nms.ordinal()) {
var newTypes = new ArrayList<Pose>();
var forgeCount = net.minecraft.world.entity.Pose.values().length;
for (var id = Pose.values().length; id < forgeCount; id++) {
var name = net.minecraft.world.entity.Pose.values()[id].name();
var newPhase = EnumHelper.makeEnum(Pose.class, name, id, List.of(), List.of());
newTypes.add(newPhase);
ArclightMod.LOGGER.debug("Registered {} as pose {}", name, newPhase);
}
EnumHelper.addEnums(Pose.class, newTypes);
}
return org.bukkit.entity.Pose.values()[nms.ordinal()];
}
private static void putStatic(Class<?> cl, String name, Object o) {
try {
Unsafe.ensureClassInitialized(cl);

1
arclight-common/src/main/resources/mixins.arclight.bukkit.json
View File

@ -35,6 +35,7 @@
"CraftSchedulerMixin",
"CraftServerMixin",
"CraftSpawnCategoryMixin",
"CraftSpellcasterMixin",
"CraftVillagerMixin",
"CraftWorldMixin",
"EntityTypeMixin",

4
arclight-forge/src/main/java/io/izzel/arclight/boot/asm/EnumDefinalizer.java
View File

@ -22,7 +22,9 @@ public class EnumDefinalizer implements Implementer {
"org/bukkit/entity/SpawnCategory",
"org/bukkit/entity/EnderDragon$Phase",
"org/bukkit/inventory/recipe/CookingBookCategory",
"org/bukkit/Fluid"
"org/bukkit/Fluid",
"org/bukkit/entity/Spellcaster$Spell",
"org/bukkit/entity/Pose"
);
@Override