Change modifier for State methods and change FQN import

Doc94 · Jan 30, 2025 · 2808224 · 2808224
1 parent b3fce08
commit 2808224
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmadillo.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmadillo.java
@@ -1,6 +1,7 @@
 package org.bukkit.craftbukkit.entity;
 
 import com.google.common.base.Preconditions;
+import net.minecraft.world.entity.animal.armadillo.Armadillo.ArmadilloState;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Armadillo;
 
@@ -41,7 +42,7 @@ public String toString() {
         return "CraftArmadillo";
     }
 
-    private State stateToBukkit(net.minecraft.world.entity.animal.armadillo.Armadillo.ArmadilloState state) {
+    public static State stateToBukkit(ArmadilloState state) {
         return switch (state) {
             case IDLE -> State.IDLE;
             case ROLLING -> State.ROLLING;
@@ -50,12 +51,12 @@ private State stateToBukkit(net.minecraft.world.entity.animal.armadillo.Armadill
         };
     }
 
-    private net.minecraft.world.entity.animal.armadillo.Armadillo.ArmadilloState stateToNMS(State state) {
+    public static ArmadilloState stateToNMS(State state) {
         return switch (state) {
-            case State.IDLE -> net.minecraft.world.entity.animal.armadillo.Armadillo.ArmadilloState.IDLE;
-            case State.ROLLING -> net.minecraft.world.entity.animal.armadillo.Armadillo.ArmadilloState.ROLLING;
-            case State.SCARED -> net.minecraft.world.entity.animal.armadillo.Armadillo.ArmadilloState.SCARED;
-            case State.UNROLLING -> net.minecraft.world.entity.animal.armadillo.Armadillo.ArmadilloState.UNROLLING;
+            case State.IDLE -> ArmadilloState.IDLE;
+            case State.ROLLING -> ArmadilloState.ROLLING;
+            case State.SCARED -> ArmadilloState.SCARED;
+            case State.UNROLLING -> ArmadilloState.UNROLLING;
         };
     }
 }