From 0c5c548614e83ffa60159ddfe307cf67d52bf4f7 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Mon, 2 Dec 2024 21:51:57 -0500 Subject: [PATCH] Move Entity Renderers into Client Package Signed-off-by: Joseph T. McQuigg --- .../biomeswevegone/client/BiomesWeveGoneClient.java | 8 ++++---- .../renderer/{ => entity/boat}/BWGBoatRenderer.java | 2 +- .../renderer}/entity/manowar/ManOWarModel.java | 3 ++- .../renderer}/entity/manowar/ManOWarRenderer.java | 3 ++- .../renderer}/entity/oddion/OddionModel.java | 3 ++- .../renderer}/entity/oddion/OddionRenderer.java | 3 ++- .../entity/pumpkinwarden/PumpkinWardenModel.java | 3 ++- .../entity/pumpkinwarden/PumpkinWardenRenderer.java | 3 ++- .../forge/client/BiomesWeveGoneClientForge.java | 1 - .../neoforge/client/BiomesWeveGoneClientNeoForge.java | 1 - 10 files changed, 17 insertions(+), 13 deletions(-) rename Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/{ => entity/boat}/BWGBoatRenderer.java (98%) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world => client/renderer}/entity/manowar/ManOWarModel.java (85%) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world => client/renderer}/entity/manowar/ManOWarRenderer.java (93%) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world => client/renderer}/entity/oddion/OddionModel.java (85%) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world => client/renderer}/entity/oddion/OddionRenderer.java (79%) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world => client/renderer}/entity/pumpkinwarden/PumpkinWardenModel.java (91%) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world => client/renderer}/entity/pumpkinwarden/PumpkinWardenRenderer.java (94%) diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/client/BiomesWeveGoneClient.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/BiomesWeveGoneClient.java index f2ec2e9a8..16056b500 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/client/BiomesWeveGoneClient.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/BiomesWeveGoneClient.java @@ -31,12 +31,12 @@ import net.potionstudios.biomeswevegone.client.particle.BWGParticles; import net.potionstudios.biomeswevegone.client.particle.particles.FallingLeafParticle; import net.potionstudios.biomeswevegone.client.particle.particles.FireFlyParticle; -import net.potionstudios.biomeswevegone.client.renderer.BWGBoatRenderer; +import net.potionstudios.biomeswevegone.client.renderer.entity.boat.BWGBoatRenderer; import net.potionstudios.biomeswevegone.world.entity.BWGEntities; import net.potionstudios.biomeswevegone.world.entity.boats.BWGBoatEntity; -import net.potionstudios.biomeswevegone.world.entity.manowar.ManOWarRenderer; -import net.potionstudios.biomeswevegone.world.entity.oddion.OddionRenderer; -import net.potionstudios.biomeswevegone.world.entity.pumpkinwarden.PumpkinWardenRenderer; +import net.potionstudios.biomeswevegone.client.renderer.entity.manowar.ManOWarRenderer; +import net.potionstudios.biomeswevegone.client.renderer.entity.oddion.OddionRenderer; +import net.potionstudios.biomeswevegone.client.renderer.entity.pumpkinwarden.PumpkinWardenRenderer; import net.potionstudios.biomeswevegone.world.level.block.BWGBlocks; import net.potionstudios.biomeswevegone.world.level.block.entities.BWGBlockEntities; import net.potionstudios.biomeswevegone.world.level.block.wood.BWGWood; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/BWGBoatRenderer.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/boat/BWGBoatRenderer.java similarity index 98% rename from Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/BWGBoatRenderer.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/boat/BWGBoatRenderer.java index 5710e053a..59db88110 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/BWGBoatRenderer.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/boat/BWGBoatRenderer.java @@ -1,4 +1,4 @@ -package net.potionstudios.biomeswevegone.client.renderer; +package net.potionstudios.biomeswevegone.client.renderer.entity.boat; import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/manowar/ManOWarModel.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/manowar/ManOWarModel.java similarity index 85% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/manowar/ManOWarModel.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/manowar/ManOWarModel.java index 96f4411ea..1c772975a 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/manowar/ManOWarModel.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/manowar/ManOWarModel.java @@ -1,7 +1,8 @@ -package net.potionstudios.biomeswevegone.world.entity.manowar; +package net.potionstudios.biomeswevegone.client.renderer.entity.manowar; import net.minecraft.resources.ResourceLocation; import net.potionstudios.biomeswevegone.BiomesWeveGone; +import net.potionstudios.biomeswevegone.world.entity.manowar.ManOWar; import software.bernie.geckolib.animatable.GeoAnimatable; import software.bernie.geckolib.model.GeoModel; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/manowar/ManOWarRenderer.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/manowar/ManOWarRenderer.java similarity index 93% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/manowar/ManOWarRenderer.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/manowar/ManOWarRenderer.java index 8cd598335..cb1d340f1 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/manowar/ManOWarRenderer.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/manowar/ManOWarRenderer.java @@ -1,4 +1,4 @@ -package net.potionstudios.biomeswevegone.world.entity.manowar; +package net.potionstudios.biomeswevegone.client.renderer.entity.manowar; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.util.Mth; +import net.potionstudios.biomeswevegone.world.entity.manowar.ManOWar; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import software.bernie.geckolib.cache.object.BakedGeoModel; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/oddion/OddionModel.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/oddion/OddionModel.java similarity index 85% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/oddion/OddionModel.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/oddion/OddionModel.java index 9119d064a..8039fc43e 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/oddion/OddionModel.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/oddion/OddionModel.java @@ -1,7 +1,8 @@ -package net.potionstudios.biomeswevegone.world.entity.oddion; +package net.potionstudios.biomeswevegone.client.renderer.entity.oddion; import net.minecraft.resources.ResourceLocation; import net.potionstudios.biomeswevegone.BiomesWeveGone; +import net.potionstudios.biomeswevegone.world.entity.oddion.Oddion; import software.bernie.geckolib.animatable.GeoAnimatable; import software.bernie.geckolib.model.GeoModel; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/oddion/OddionRenderer.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/oddion/OddionRenderer.java similarity index 79% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/oddion/OddionRenderer.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/oddion/OddionRenderer.java index fb760e3ea..7a740f181 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/oddion/OddionRenderer.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/oddion/OddionRenderer.java @@ -1,6 +1,7 @@ -package net.potionstudios.biomeswevegone.world.entity.oddion; +package net.potionstudios.biomeswevegone.client.renderer.entity.oddion; import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.potionstudios.biomeswevegone.world.entity.oddion.Oddion; import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.renderer.GeoEntityRenderer; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/pumpkinwarden/PumpkinWardenModel.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/pumpkinwarden/PumpkinWardenModel.java similarity index 91% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/pumpkinwarden/PumpkinWardenModel.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/pumpkinwarden/PumpkinWardenModel.java index 7568cd605..eabeb577a 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/pumpkinwarden/PumpkinWardenModel.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/pumpkinwarden/PumpkinWardenModel.java @@ -1,7 +1,8 @@ -package net.potionstudios.biomeswevegone.world.entity.pumpkinwarden; +package net.potionstudios.biomeswevegone.client.renderer.entity.pumpkinwarden; import net.minecraft.resources.ResourceLocation; import net.potionstudios.biomeswevegone.BiomesWeveGone; +import net.potionstudios.biomeswevegone.world.entity.pumpkinwarden.PumpkinWarden; import software.bernie.geckolib.animatable.GeoAnimatable; import software.bernie.geckolib.animation.AnimationState; import software.bernie.geckolib.cache.object.GeoBone; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/pumpkinwarden/PumpkinWardenRenderer.java b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/pumpkinwarden/PumpkinWardenRenderer.java similarity index 94% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/pumpkinwarden/PumpkinWardenRenderer.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/pumpkinwarden/PumpkinWardenRenderer.java index 0bbfa6c97..b34ba47f7 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/pumpkinwarden/PumpkinWardenRenderer.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/client/renderer/entity/pumpkinwarden/PumpkinWardenRenderer.java @@ -1,4 +1,4 @@ -package net.potionstudios.biomeswevegone.world.entity.pumpkinwarden; +package net.potionstudios.biomeswevegone.client.renderer.entity.pumpkinwarden; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.world.item.ItemDisplayContext; +import net.potionstudios.biomeswevegone.world.entity.pumpkinwarden.PumpkinWarden; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import software.bernie.geckolib.cache.object.BakedGeoModel; diff --git a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/client/BiomesWeveGoneClientForge.java b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/client/BiomesWeveGoneClientForge.java index 892f3da57..147dd0682 100644 --- a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/client/BiomesWeveGoneClientForge.java +++ b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/client/BiomesWeveGoneClientForge.java @@ -13,7 +13,6 @@ /** * This class is used to initialize the Forge client side of the mod. - * @see FMLClientSetupEvent * @see BiomesWeveGoneClient * @author Joseph T. McQuigg */ diff --git a/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/client/BiomesWeveGoneClientNeoForge.java b/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/client/BiomesWeveGoneClientNeoForge.java index 33b95384d..7f710a348 100644 --- a/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/client/BiomesWeveGoneClientNeoForge.java +++ b/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/client/BiomesWeveGoneClientNeoForge.java @@ -19,7 +19,6 @@ /** * This class is used to initialize the Forge client side of the mod. - * @see FMLClientSetupEvent * @see BiomesWeveGoneClient * @author Joseph T. McQuigg */