优化模型类

src/main/java/com/atsuishio/superbwarfare/client/model/entity/Ah6Model.java

@@ -15,7 +15,7 @@ public class Ah6Model extends GeoModel<Ah6Entity> {
 
     @Override
     public ResourceLocation getModelResource(Ah6Entity entity) {
-        return new ResourceLocation(ModUtils.MODID, "geo/ah_6.geo.json");
+        return ModUtils.loc("geo/ah_6.geo.json");
     }
 
     @Override

src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java

@@ -22,9 +22,7 @@ public class AnnihilatorModel extends GeoModel<AnnihilatorEntity> {
 
     @Override
     public ResourceLocation getModelResource(AnnihilatorEntity entity) {
-
         return ModUtils.loc("geo/annihilator.geo.json");
-
 //        Player player = Minecraft.getInstance().player;
 //
 //        int distance = 0;
@@ -87,6 +85,5 @@ public class AnnihilatorModel extends GeoModel<AnnihilatorEntity> {
         ledRed3.setHidden(!ledGreen3.isHidden());
         ledRed4.setHidden(!ledGreen4.isHidden());
         ledRed5.setHidden(!ledGreen5.isHidden());
-
     }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java

@@ -8,24 +8,25 @@ import software.bernie.geckolib.core.animation.AnimationState;
 import software.bernie.geckolib.model.GeoModel;
 
 public class CannonShellEntityModel extends GeoModel<CannonShellEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(CannonShellEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "animations/cannon_shell.animation.json");
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(CannonShellEntity entity) {
+    public ResourceLocation getAnimationResource(CannonShellEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/cannon_shell.geo.json");
+        return ModUtils.loc("animations/cannon_shell.animation.json");
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(CannonShellEntity entity) {
+    public ResourceLocation getModelResource(CannonShellEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/cannon_shell.png");
+        return ModUtils.loc("geo/cannon_shell.geo.json");
-	}
+    }
 
-	@Override
+    @Override
-	public void setCustomAnimations(CannonShellEntity animatable, long instanceId, AnimationState animationState) {
+    public ResourceLocation getTextureResource(CannonShellEntity entity) {
-		CoreGeoBone bone = getAnimationProcessor().getBone("bone");
+        return ModUtils.loc("textures/entity/cannon_shell.png");
-		bone.setHidden(animatable.tickCount <= 1);
+    }
-	}
+
+    @Override
+    public void setCustomAnimations(CannonShellEntity animatable, long instanceId, AnimationState animationState) {
+        CoreGeoBone bone = getAnimationProcessor().getBone("bone");
+        bone.setHidden(animatable.tickCount <= 1);
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java

@@ -27,5 +27,4 @@ public class ClaymoreModel extends GeoModel<ClaymoreEntity> {
         }
         return ModUtils.loc("textures/entity/claymore.png");
     }
-
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java

@@ -19,98 +19,94 @@ import static com.atsuishio.superbwarfare.entity.DroneEntity.*;
 import static com.atsuishio.superbwarfare.event.ClientEventHandler.droneBodyAngle;
 
 public class DroneModel extends GeoModel<DroneEntity> {
-	public static float rotX = 0;
-	public static float rotZ = 0;
 
-	public static float rotation = 0;
+    public static float rotX = 0;
+    public static float rotZ = 0;
 
+    public static float rotation = 0;
 
-	@Override
+    @Override
-	public ResourceLocation getAnimationResource(DroneEntity entity) {
+    public ResourceLocation getAnimationResource(DroneEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "animations/drone.animation.json");
+        return ModUtils.loc("animations/drone.animation.json");
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(DroneEntity entity) {
+    public ResourceLocation getModelResource(DroneEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/drone.geo.json");
+        return ModUtils.loc("geo/drone.geo.json");
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(DroneEntity entity) {
+    public ResourceLocation getTextureResource(DroneEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/drone.png");
+        return ModUtils.loc("textures/entity/drone.png");
-	}
+    }
 
-	@Override
+    @Override
-	public void setCustomAnimations(DroneEntity animatable, long instanceId, AnimationState animationState) {
+    public void setCustomAnimations(DroneEntity animatable, long instanceId, AnimationState animationState) {
-		CoreGeoBone ammo1 = getAnimationProcessor().getBone("ammo1");
+        CoreGeoBone ammo1 = getAnimationProcessor().getBone("ammo1");
-		CoreGeoBone ammo2 = getAnimationProcessor().getBone("ammo2");
+        CoreGeoBone ammo2 = getAnimationProcessor().getBone("ammo2");
-		CoreGeoBone ammo3 = getAnimationProcessor().getBone("ammo3");
+        CoreGeoBone ammo3 = getAnimationProcessor().getBone("ammo3");
-		CoreGeoBone ammo4 = getAnimationProcessor().getBone("ammo4");
+        CoreGeoBone ammo4 = getAnimationProcessor().getBone("ammo4");
-		CoreGeoBone ammo5 = getAnimationProcessor().getBone("ammo5");
+        CoreGeoBone ammo5 = getAnimationProcessor().getBone("ammo5");
-		CoreGeoBone ammo6 = getAnimationProcessor().getBone("ammo6");
+        CoreGeoBone ammo6 = getAnimationProcessor().getBone("ammo6");
-		CoreGeoBone shell = getAnimationProcessor().getBone("shell");
+        CoreGeoBone shell = getAnimationProcessor().getBone("shell");
-		CoreGeoBone main = getAnimationProcessor().getBone("0");
+        CoreGeoBone main = getAnimationProcessor().getBone("0");
 
         ammo6.setHidden(animatable.getEntityData().get(AMMO) <= 5);
-		ammo5.setHidden(animatable.getEntityData().get(AMMO) <= 4);
+        ammo5.setHidden(animatable.getEntityData().get(AMMO) <= 4);
-		ammo4.setHidden(animatable.getEntityData().get(AMMO) <= 3);
+        ammo4.setHidden(animatable.getEntityData().get(AMMO) <= 3);
-		ammo3.setHidden(animatable.getEntityData().get(AMMO) <= 2);
+        ammo3.setHidden(animatable.getEntityData().get(AMMO) <= 2);
-		ammo2.setHidden(animatable.getEntityData().get(AMMO) <= 1);
+        ammo2.setHidden(animatable.getEntityData().get(AMMO) <= 1);
-		ammo1.setHidden(animatable.getEntityData().get(AMMO) <= 0);
+        ammo1.setHidden(animatable.getEntityData().get(AMMO) <= 0);
         shell.setHidden(!animatable.getEntityData().get(KAMIKAZE));
 
-		float times = Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1);
+        float times = Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1);
 
-		if (Minecraft.getInstance().options.keyRight.isDown()) {
+        if (Minecraft.getInstance().options.keyRight.isDown()) {
-			rotZ = Mth.lerp(0.025f * times, rotZ, -0.25f);
+            rotZ = Mth.lerp(0.025f * times, rotZ, -0.25f);
-		} else if (Minecraft.getInstance().options.keyLeft.isDown()) {
+        } else if (Minecraft.getInstance().options.keyLeft.isDown()) {
-			rotZ = Mth.lerp(0.025f * times, rotZ, 0.25f);
+            rotZ = Mth.lerp(0.025f * times, rotZ, 0.25f);
-		} else {
+        } else {
-			rotZ = Mth.lerp(0.04f * times, rotZ, 0);
+            rotZ = Mth.lerp(0.04f * times, rotZ, 0);
-		}
+        }
 
-		main.setRotZ(rotZ);
+        main.setRotZ(rotZ);
 
-		droneBodyAngle(rotZ);
+        droneBodyAngle(rotZ);
 
-		//螺旋桨控制
+        // 螺旋桨控制
+        CoreGeoBone wingFL = getAnimationProcessor().getBone("wingFL");
+        CoreGeoBone wingFR = getAnimationProcessor().getBone("wingFR");
+        CoreGeoBone wingBL = getAnimationProcessor().getBone("wingBL");
+        CoreGeoBone wingBR = getAnimationProcessor().getBone("wingBR");
 
-		CoreGeoBone wingFL = getAnimationProcessor().getBone("wingFL");
+        rotation = (float) Mth.lerp(times, rotation, animatable.onGround() ? 0 : 0.2);
-		CoreGeoBone wingFR = getAnimationProcessor().getBone("wingFR");
-		CoreGeoBone wingBL = getAnimationProcessor().getBone("wingBL");
-		CoreGeoBone wingBR = getAnimationProcessor().getBone("wingBR");
 
-		rotation = (float) Mth.lerp(times, rotation, animatable.onGround() ? 0 : 0.2);
+        wingFL.setRotY(wingFL.getRotY() - rotation);
+        wingFR.setRotY(wingFL.getRotY() - rotation);
+        wingBL.setRotY(wingFL.getRotY() - rotation);
+        wingBR.setRotY(wingFL.getRotY() - rotation);
 
-		wingFL.setRotY(wingFL.getRotY() - rotation);
+        CoreGeoBone weapon = getAnimationProcessor().getBone("Weapon");
-		wingFR.setRotY(wingFL.getRotY() - rotation);
+        String id = animatable.getEntityData().get(CONTROLLER);
-		wingBL.setRotY(wingFL.getRotY() - rotation);
+        UUID uuid;
-		wingBR.setRotY(wingFL.getRotY() - rotation);
+        try {
+            uuid = UUID.fromString(id);
+        } catch (IllegalArgumentException e) {
+            return;
+        }
 
-		CoreGeoBone weapon = getAnimationProcessor().getBone("Weapon");
+        Player player = animatable.level().getPlayerByUUID(uuid);
+        if (player != null) {
+            ItemStack stack = player.getMainHandItem();
+            DroneEntity drone = EntityFindUtil.findDrone(player.level(), stack.getOrCreateTag().getString("LinkedDrone"));
 
-		String id = animatable.getEntityData().get(CONTROLLER);
+            if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) {
-
+                if (drone != null && drone.getUUID() == animatable.getUUID()) {
-		UUID uuid;
+                    weapon.setHidden(true);
-		try {
+                }
-			uuid = UUID.fromString(id);
-		} catch (IllegalArgumentException e) {
-			return;
-		}
-
-		Player player = animatable.level().getPlayerByUUID(uuid);
-
-		if (player != null) {
-			ItemStack stack = player.getMainHandItem();
-			DroneEntity drone = EntityFindUtil.findDrone(player.level(), stack.getOrCreateTag().getString("LinkedDrone"));
-
-			if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) {
-				if (drone != null && drone.getUUID() == animatable.getUUID()) {
-					weapon.setHidden(true);
-				}
             } else {
-				weapon.setHidden(false);
+                weapon.setHidden(false);
-			}
+            }
-		}
+        }
-	}
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java

@@ -8,26 +8,27 @@ import software.bernie.geckolib.core.animation.AnimationState;
 import software.bernie.geckolib.model.GeoModel;
 
 public class GunGrenadeModel extends GeoModel<GunGrenadeEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(GunGrenadeEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "animations/cannon_shell.animation.json");
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(GunGrenadeEntity entity) {
+    public ResourceLocation getAnimationResource(GunGrenadeEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/cannon_shell.geo.json");
+        return ModUtils.loc("animations/cannon_shell.animation.json");
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(GunGrenadeEntity entity) {
+    public ResourceLocation getModelResource(GunGrenadeEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/cannon_shell.png");
+        return ModUtils.loc("geo/cannon_shell.geo.json");
-	}
+    }
 
-	@Override
+    @Override
-	public void setCustomAnimations(GunGrenadeEntity animatable, long instanceId, AnimationState animationState) {
+    public ResourceLocation getTextureResource(GunGrenadeEntity entity) {
-		CoreGeoBone bone = getAnimationProcessor().getBone("bone");
+        return ModUtils.loc("textures/entity/cannon_shell.png");
-		bone.setScaleX(0.2f);
+    }
-		bone.setScaleY(0.2f);
+
-		bone.setScaleZ(0.2f);
+    @Override
-	}
+    public void setCustomAnimations(GunGrenadeEntity animatable, long instanceId, AnimationState animationState) {
+        CoreGeoBone bone = getAnimationProcessor().getBone("bone");
+        bone.setScaleX(0.2f);
+        bone.setScaleY(0.2f);
+        bone.setScaleZ(0.2f);
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java

@@ -6,18 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class HandGrenadeEntityModel extends GeoModel<HandGrenadeEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(HandGrenadeEntity entity) {
-		return null;
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(HandGrenadeEntity entity) {
+    public ResourceLocation getAnimationResource(HandGrenadeEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/hand_grenade.geo.json");
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(HandGrenadeEntity entity) {
+    public ResourceLocation getModelResource(HandGrenadeEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/hand_grenade.png");
+        return ModUtils.loc("geo/hand_grenade.geo.json");
-	}
+    }
+
+    @Override
+    public ResourceLocation getTextureResource(HandGrenadeEntity entity) {
+        return ModUtils.loc("textures/entity/hand_grenade.png");
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/HeliRocketModel.java

@@ -6,19 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class HeliRocketModel extends GeoModel<HeliRocketEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(HeliRocketEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "animations/rpg_rocket.animation.json");
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(HeliRocketEntity entity) {
+    public ResourceLocation getAnimationResource(HeliRocketEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/heli_rocket.geo.json");
+        return ModUtils.loc("animations/rpg_rocket.animation.json");
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(HeliRocketEntity entity) {
+    public ResourceLocation getModelResource(HeliRocketEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/heli_rocket.png");
+        return ModUtils.loc("geo/heli_rocket.geo.json");
-	}
+    }
 
+    @Override
+    public ResourceLocation getTextureResource(HeliRocketEntity entity) {
+        return ModUtils.loc("textures/entity/heli_rocket.png");
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java

@@ -6,19 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class JavelinMissileModel extends GeoModel<JavelinMissileEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(JavelinMissileEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "animations/javelin_missile.animation.json");
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(JavelinMissileEntity entity) {
+    public ResourceLocation getAnimationResource(JavelinMissileEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/javelin_missile.geo.json");
+        return ModUtils.loc("animations/javelin_missile.animation.json");
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(JavelinMissileEntity entity) {
+    public ResourceLocation getModelResource(JavelinMissileEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/javelin_missile.png");
+        return ModUtils.loc("geo/javelin_missile.geo.json");
-	}
+    }
 
+    @Override
+    public ResourceLocation getTextureResource(JavelinMissileEntity entity) {
+        return ModUtils.loc("textures/entity/javelin_missile.png");
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java

@@ -13,9 +13,10 @@ import software.bernie.geckolib.model.GeoModel;
 import software.bernie.geckolib.model.data.EntityModelData;
 
 public class Mle1934Model extends GeoModel<Mle1934Entity> {
+
     @Override
     public ResourceLocation getAnimationResource(Mle1934Entity entity) {
-        return new ResourceLocation(ModUtils.MODID, "animations/mle1934.animation.json");
+        return ModUtils.loc("animations/mle1934.animation.json");
     }
 
     @Override
@@ -23,27 +24,26 @@ public class Mle1934Model extends GeoModel<Mle1934Entity> {
         Player player = Minecraft.getInstance().player;
 
         int distance = 0;
-
         if (player != null) {
             distance = (int) player.position().distanceTo(entity.position());
         }
 
         if (distance < 32) {
-            return new ResourceLocation(ModUtils.MODID, "geo/mle1934.geo.json");
+            return ModUtils.loc("geo/mle1934.geo.json");
-        } else{
+        } else {
-            return new ResourceLocation(ModUtils.MODID, "geo/mle1934_lod1.geo.json");
+            return ModUtils.loc("geo/mle1934_lod1.geo.json");
         }
     }
 
     @Override
     public ResourceLocation getTextureResource(Mle1934Entity entity) {
-        return new ResourceLocation(ModUtils.MODID, "textures/entity/mle1934.png");
+        return ModUtils.loc("textures/entity/mle1934.png");
     }
 
     @Override
-    public void setCustomAnimations(Mle1934Entity animatable, long instanceId, AnimationState animationState) {
+    public void setCustomAnimations(Mle1934Entity animatable, long instanceId, AnimationState<Mle1934Entity> animationState) {
-        CoreGeoBone barrle = getAnimationProcessor().getBone("barrel");
+        CoreGeoBone barrel = getAnimationProcessor().getBone("barrel");
-        EntityModelData entityData = (EntityModelData) animationState.getData(DataTickets.ENTITY_MODEL_DATA);
+        EntityModelData entityData = animationState.getData(DataTickets.ENTITY_MODEL_DATA);
-        barrle.setRotX((entityData.headPitch()) * Mth.DEG_TO_RAD);
+        barrel.setRotX((entityData.headPitch()) * Mth.DEG_TO_RAD);
     }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java

@@ -6,19 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class MortarShellEntityModel extends GeoModel<MortarShellEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(MortarShellEntity entity) {
-		return null;
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(MortarShellEntity entity) {
+    public ResourceLocation getAnimationResource(MortarShellEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/mortar_shell.geo.json");
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(MortarShellEntity entity) {
+    public ResourceLocation getModelResource(MortarShellEntity entity) {
-		return ModUtils.loc("textures/entity/mortar.png");
+        return ModUtils.loc("geo/mortar_shell.geo.json");
-	}
+    }
 
+    @Override
+    public ResourceLocation getTextureResource(MortarShellEntity entity) {
+        return ModUtils.loc("textures/entity/mortar.png");
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java

@@ -14,6 +14,7 @@ import software.bernie.geckolib.core.animation.AnimationState;
 import software.bernie.geckolib.model.GeoModel;
 
 public class ProjectileEntityModel extends GeoModel<ProjectileEntity> {
+
     @Override
     public ResourceLocation getAnimationResource(ProjectileEntity entity) {
         return null;
@@ -23,7 +24,7 @@ public class ProjectileEntityModel extends GeoModel<ProjectileEntity> {
     public ResourceLocation getModelResource(ProjectileEntity entity) {
         Player player = Minecraft.getInstance().player;
         if (player == null) {
-            return new ResourceLocation(ModUtils.MODID, "geo/projectile_entity2.geo.json");
+            return ModUtils.loc("geo/projectile_entity2.geo.json");
         }
 
         if ((ClientEventHandler.zoom && !player.getMainHandItem().is(ModItems.MINIGUN.get()))
@@ -31,15 +32,15 @@ public class ProjectileEntityModel extends GeoModel<ProjectileEntity> {
                 || player.getMainHandItem().is(ModItems.GLOCK_18.get())
                 || player.getMainHandItem().is(ModItems.BOCEK.get())
                 || (player.getVehicle() instanceof IArmedVehicleEntity iVehicle && iVehicle.isDriver(player) && !player.getMainHandItem().is(ModTags.Items.GUN))) {
-            return new ResourceLocation(ModUtils.MODID, "geo/projectile_entity.geo.json");
+            return ModUtils.loc("geo/projectile_entity.geo.json");
         } else {
-            return new ResourceLocation(ModUtils.MODID, "geo/projectile_entity2.geo.json");
+            return ModUtils.loc("geo/projectile_entity2.geo.json");
         }
     }
 
     @Override
     public ResourceLocation getTextureResource(ProjectileEntity entity) {
-        return new ResourceLocation(ModUtils.MODID, "textures/entity/empty.png");
+        return ModUtils.loc("textures/entity/empty.png");
     }
 
     @Override

src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java

@@ -6,18 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class RgoGrenadeEntityModel extends GeoModel<RgoGrenadeEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(RgoGrenadeEntity entity) {
-		return null;
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(RgoGrenadeEntity entity) {
+    public ResourceLocation getAnimationResource(RgoGrenadeEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/rgo_grenade.geo.json");
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(RgoGrenadeEntity entity) {
+    public ResourceLocation getModelResource(RgoGrenadeEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/item/rgo_grenade.png");
+        return ModUtils.loc("geo/rgo_grenade.geo.json");
-	}
+    }
+
+    @Override
+    public ResourceLocation getTextureResource(RgoGrenadeEntity entity) {
+        return ModUtils.loc("textures/item/rgo_grenade.png");
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java

@@ -6,19 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class RpgRocketModel extends GeoModel<RpgRocketEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(RpgRocketEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "animations/rpg_rocket.animation.json");
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(RpgRocketEntity entity) {
+    public ResourceLocation getAnimationResource(RpgRocketEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/rpg_rocket.geo.json");
+        return ModUtils.loc("animations/rpg_rocket.animation.json");
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(RpgRocketEntity entity) {
+    public ResourceLocation getModelResource(RpgRocketEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/rpg_rocket.png");
+        return ModUtils.loc("geo/rpg_rocket.geo.json");
-	}
+    }
 
+    @Override
+    public ResourceLocation getTextureResource(RpgRocketEntity entity) {
+        return ModUtils.loc("textures/entity/rpg_rocket.png");
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java

@@ -6,6 +6,7 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class SenpaiModel extends GeoModel<SenpaiEntity> {
+
     @Override
     public ResourceLocation getAnimationResource(SenpaiEntity entity) {
         return ModUtils.loc("animations/senpai.animation.json");
@@ -20,5 +21,4 @@ public class SenpaiModel extends GeoModel<SenpaiEntity> {
     public ResourceLocation getTextureResource(SenpaiEntity entity) {
         return ModUtils.loc("textures/entity/senpai.png");
     }
-
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java

@@ -14,7 +14,7 @@ public class SpeedboatModel extends GeoModel<SpeedboatEntity> {
 
     @Override
     public ResourceLocation getModelResource(SpeedboatEntity entity) {
-        return new ResourceLocation(ModUtils.MODID, "geo/speedboat.geo.json");
+        return ModUtils.loc("geo/speedboat.geo.json");
     }
 
     @Override

src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java

@@ -6,18 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class TargetModel extends GeoModel<TargetEntity> {
+
     @Override
     public ResourceLocation getAnimationResource(TargetEntity entity) {
-        return new ResourceLocation(ModUtils.MODID, "animations/target.animation.json");
+        return ModUtils.loc("animations/target.animation.json");
     }
 
     @Override
     public ResourceLocation getModelResource(TargetEntity entity) {
-        return new ResourceLocation(ModUtils.MODID, "geo/target.geo.json");
+        return ModUtils.loc("geo/target.geo.json");
     }
 
     @Override
     public ResourceLocation getTextureResource(TargetEntity entity) {
-        return new ResourceLocation(ModUtils.MODID, "textures/entity/target.png");
+        return ModUtils.loc("textures/entity/target.png");
     }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java

@@ -6,18 +6,19 @@ import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
 public class TaserBulletProjectileModel extends GeoModel<TaserBulletProjectileEntity> {
-	@Override
-	public ResourceLocation getAnimationResource(TaserBulletProjectileEntity entity) {
-		return null;
-	}
 
-	@Override
+    @Override
-	public ResourceLocation getModelResource(TaserBulletProjectileEntity entity) {
+    public ResourceLocation getAnimationResource(TaserBulletProjectileEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "geo/taser_rod.geo.json");
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResourceLocation getTextureResource(TaserBulletProjectileEntity entity) {
+    public ResourceLocation getModelResource(TaserBulletProjectileEntity entity) {
-		return new ResourceLocation(ModUtils.MODID, "textures/entity/taser_rod.png");
+        return ModUtils.loc("geo/taser_rod.geo.json");
-	}
+    }
+
+    @Override
+    public ResourceLocation getTextureResource(TaserBulletProjectileEntity entity) {
+        return ModUtils.loc("textures/entity/taser_rod.png");
+    }
 }

src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java

@@ -15,7 +15,7 @@ public class WheelChairModel extends GeoModel<WheelChairEntity> {
 
     @Override
     public ResourceLocation getModelResource(WheelChairEntity entity) {
-        return new ResourceLocation(ModUtils.MODID, "geo/wheel_chair.geo.json");
+        return ModUtils.loc("geo/wheel_chair.geo.json");
     }
 
     @Override