FancyInnovations/FancyPlugins
1
0
Fork 0
mirror of https://github.com/FancyInnovations/FancyPlugins.git synced 2025-12-06 07:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fancynpcs: Fix attributes for 1.21.6

Browse Source
This commit is contained in:
Oliver
2025-06-15 15:17:38 +02:00
committed by Oliver
parent 0f77e61e8d
commit 80649e4b5b
10 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/CatAttributes.java
View File

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_6.ReflectionHelper;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.animal.Cat;
import net.minecraft.world.entity.animal.CatVariant;
import net.minecraft.world.item.DyeColor;
@@ -82,10 +82,7 @@ public class CatAttributes {
}
private static HolderLookup.RegistryLookup<CatVariant> getCatVariantRegistry() {
return VanillaRegistries
.createLookup()
.lookup(Registries.CAT_VARIANT)
.orElseThrow();
return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.CAT_VARIANT);
}
private static void setCollarColor(Npc npc, String value) {

7
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/ChickenAttributes.java
View File

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_6.ReflectionHelper;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.animal.Chicken;
import net.minecraft.world.entity.animal.ChickenVariant;
import org.bukkit.entity.EntityType;
@@ -48,10 +48,7 @@ public class ChickenAttributes {
}
private static HolderLookup.RegistryLookup<ChickenVariant> getChickenVariantRegistry() {
return VanillaRegistries
.createLookup()
.lookup(Registries.CHICKEN_VARIANT)
.orElseThrow();
return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.CHICKEN_VARIANT);
}
}

7
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/CowAttributes.java
View File

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_6.ReflectionHelper;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.animal.Cow;
import net.minecraft.world.entity.animal.CowVariant;
import org.bukkit.entity.EntityType;
@@ -48,10 +48,7 @@ public class CowAttributes {
}
private static HolderLookup.RegistryLookup<CowVariant> getCowVariantRegistry() {
return VanillaRegistries
.createLookup()
.lookup(Registries.COW_VARIANT)
.orElseThrow();
return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.COW_VARIANT);
}
}

7
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/FrogAttributes.java
View File

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_6.ReflectionHelper;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.animal.frog.Frog;
import net.minecraft.world.entity.animal.frog.FrogVariant;
import org.bukkit.entity.EntityType;
@@ -48,9 +48,6 @@ public class FrogAttributes {
}
private static HolderLookup.RegistryLookup<FrogVariant> getFrogVariantRegistry() {
return VanillaRegistries
.createLookup()
.lookup(Registries.FROG_VARIANT)
.orElseThrow();
return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.FROG_VARIANT);
}
}

9
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/HorseAttributes.java
View File

@@ -68,17 +68,14 @@ public class HorseAttributes {
switch (value.toLowerCase()) {
case "standing" -> {
horse.setEating(false);
//TODO fix
// horse.setForceStanding(false);
horse.setStanding(0);
}
case "rearing" -> {
//TODO fix
// horse.setForceStanding(true);
horse.setStanding(20);
horse.setEating(false);
}
case "eating" -> {
//TODO fix
// horse.setForceStanding(false);
horse.setStanding(0);
horse.setEating(true);
}
}

7
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/PigAttributes.java
View File

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_6.ReflectionHelper;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.animal.Pig;
import net.minecraft.world.entity.animal.PigVariant;
@@ -67,10 +67,7 @@ public class PigAttributes {
}
private static HolderLookup.RegistryLookup<PigVariant> getPigVariantRegistry() {
return VanillaRegistries
.createLookup()
.lookup(Registries.PIG_VARIANT)
.orElseThrow();
return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.PIG_VARIANT);
}
}

36
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/SnifferAttributes.java Normal file
View File

@@ -0,0 +1,36 @@
package de.oliver.fancynpcs.v1_21_6.attributes;
import de.oliver.fancynpcs.api.Npc;
import de.oliver.fancynpcs.api.NpcAttribute;
import de.oliver.fancynpcs.v1_21_6.ReflectionHelper;
import net.minecraft.world.entity.animal.sniffer.Sniffer;
import org.bukkit.entity.EntityType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class SnifferAttributes {
public static List<NpcAttribute> getAllAttributes() {
List<NpcAttribute> attributes = new ArrayList<>();
attributes.add(new NpcAttribute(
"state",
Arrays.stream(Sniffer.State.values())
.map(Enum::name)
.toList(),
List.of(EntityType.SNIFFER),
SnifferAttributes::setState
));
return attributes;
}
private static void setState(Npc npc, String value) {
final Sniffer sniffer = ReflectionHelper.getEntity(npc);
Sniffer.State state = Sniffer.State.valueOf(value.toUpperCase());
sniffer.transitionTo(state);
}
}

7
plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/attributes/WolfAttributes.java
View File

@@ -7,8 +7,8 @@ import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.animal.wolf.Wolf;
import net.minecraft.world.entity.animal.wolf.WolfVariant;
import net.minecraft.world.item.DyeColor;
@@ -122,9 +122,6 @@ public class WolfAttributes {
}
private static HolderLookup.RegistryLookup<WolfVariant> getWolfVariantRegistry() {
return VanillaRegistries
.createLookup()
.lookup(Registries.WOLF_VARIANT)
.orElseThrow();
return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.WOLF_VARIANT);
}
}