From a2a2a56e460b9e0ad213fb59ab5d253a27e059a6 Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Sun, 26 Nov 2023 10:48:11 +0100
Subject: [PATCH] Renamed boat model class to match VFP naming scheme

---
 .../boat/{BoatModel_1_8.java => BoatModel1_8.java}  |   6 +++---
 .../viafabricplus/fixes/boat/BoatRenderer1_8.java   |   6 +++---
 .../fixes/minecraft/entity/MixinEntityModels.java   |   4 ++--
 .../textures/{boat_1_8.png => boat1_8.png}          | Bin
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/main/java/de/florianmichael/viafabricplus/fixes/boat/{BoatModel_1_8.java => BoatModel1_8.java} (94%)
 rename src/main/resources/assets/viafabricplus/textures/{boat_1_8.png => boat1_8.png} (100%)

diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatModel_1_8.java b/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatModel1_8.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatModel_1_8.java
rename to src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatModel1_8.java
index f2315669..f9b21ab9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatModel_1_8.java
+++ b/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatModel1_8.java
@@ -26,11 +26,11 @@ import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.util.Identifier;
 
-public class BoatModel_1_8 extends CompositeEntityModel<BoatEntity> {
-    public static final EntityModelLayer MODEL_LAYER = new EntityModelLayer(new Identifier("viafabricplus", "boat_1_8"), "main");
+public class BoatModel1_8 extends CompositeEntityModel<BoatEntity> {
+    public static final EntityModelLayer MODEL_LAYER = new EntityModelLayer(new Identifier("viafabricplus", "boat1_8"), "main");
     private final ImmutableList<ModelPart> parts;
 
-    public BoatModel_1_8(ModelPart root) {
+    public BoatModel1_8(ModelPart root) {
         this.parts = ImmutableList.of(root.getChild("bottom"), root.getChild("back"), root.getChild("front"), root.getChild("right"), root.getChild("left"));
     }
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatRenderer1_8.java b/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatRenderer1_8.java
index fadec7c3..197572e1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatRenderer1_8.java
+++ b/src/main/java/de/florianmichael/viafabricplus/fixes/boat/BoatRenderer1_8.java
@@ -31,13 +31,13 @@ import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RotationAxis;
 
 public class BoatRenderer1_8 extends EntityRenderer<BoatEntity> {
-    private static final Identifier TEXTURE = new Identifier("viafabricplus", "textures/boat_1_8.png");
-    private final BoatModel_1_8 model;
+    private static final Identifier TEXTURE = new Identifier("viafabricplus", "textures/boat1_8.png");
+    private final BoatModel1_8 model;
 
     public BoatRenderer1_8(EntityRendererFactory.Context ctx) {
         super(ctx);
         shadowRadius = 0.5F;
-        model = new BoatModel_1_8(ctx.getPart(BoatModel_1_8.MODEL_LAYER));
+        model = new BoatModel1_8(ctx.getPart(BoatModel1_8.MODEL_LAYER));
     }
 
     @Override
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
index 2d81efc0..7b2f3716 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
@@ -20,7 +20,7 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.google.common.collect.ImmutableMap;
-import de.florianmichael.viafabricplus.fixes.boat.BoatModel_1_8;
+import de.florianmichael.viafabricplus.fixes.boat.BoatModel1_8;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.client.render.entity.model.EntityModels;
@@ -33,7 +33,7 @@ public abstract class MixinEntityModels {
 
     @ModifyVariable(method = "getModels", at = @At(value = "STORE", ordinal = 0), ordinal = 0)
     private static ImmutableMap.Builder<EntityModelLayer, TexturedModelData> addBoatModel(ImmutableMap.Builder<EntityModelLayer, TexturedModelData> builder) {
-        return builder.put(BoatModel_1_8.MODEL_LAYER, BoatModel_1_8.getTexturedModelData());
+        return builder.put(BoatModel1_8.MODEL_LAYER, BoatModel1_8.getTexturedModelData());
     }
 
 }
diff --git a/src/main/resources/assets/viafabricplus/textures/boat_1_8.png b/src/main/resources/assets/viafabricplus/textures/boat1_8.png
similarity index 100%
rename from src/main/resources/assets/viafabricplus/textures/boat_1_8.png
rename to src/main/resources/assets/viafabricplus/textures/boat1_8.png