move ALL client classes to client source set

TheDeathlyCow · Nov 13, 2024 · d814a16 · d814a16
1 parent 8ec255d
commit d814a16
Show file tree

Hide file tree

Showing 51 changed files with 47 additions and 38 deletions.
diff --git a/...deathlycow/frostiful/FrostifulClient.java → ...deathlycow/frostiful/FrostifulClient.java b/...deathlycow/frostiful/FrostifulClient.java → ...deathlycow/frostiful/FrostifulClient.java
@@ -10,7 +10,7 @@
 import com.github.thedeathlycow.frostiful.client.registry.FParticleFactoryRegistry;
 import com.github.thedeathlycow.frostiful.registry.FItems;
 import com.github.thedeathlycow.frostiful.server.network.PointWindSpawnPacket;
-import com.github.thedeathlycow.frostiful.server.network.PointWindSpawnPacketListener;
+import com.github.thedeathlycow.frostiful.client.network.PointWindSpawnPacketListener;
 import com.github.thedeathlycow.thermoo.api.client.StatusBarOverlayRenderEvents;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;

diff --git a/...eathlycow/frostiful/FrostifulModMenu.java → ...eathlycow/frostiful/FrostifulModMenu.java b/...eathlycow/frostiful/FrostifulModMenu.java → ...eathlycow/frostiful/FrostifulModMenu.java
diff --git a/...w/frostiful/client/BrushableTextures.java → ...w/frostiful/client/BrushableTextures.java b/...w/frostiful/client/BrushableTextures.java → ...w/frostiful/client/BrushableTextures.java
diff --git a/...l/client/FrostifulModelLoadingPlugin.java → ...l/client/FrostifulModelLoadingPlugin.java b/...l/client/FrostifulModelLoadingPlugin.java → ...l/client/FrostifulModelLoadingPlugin.java
diff --git a/...frostiful/client/FrozenHeartsOverlay.java → ...frostiful/client/FrozenHeartsOverlay.java b/...frostiful/client/FrozenHeartsOverlay.java → ...frostiful/client/FrozenHeartsOverlay.java
diff --git a/...rostiful/client/anim/BiterAnimations.java → ...rostiful/client/anim/BiterAnimations.java b/...rostiful/client/anim/BiterAnimations.java → ...rostiful/client/anim/BiterAnimations.java
diff --git a/...ful/compat/ColorfulHeartsIntegration.java → ...ent/compat/ColorfulHeartsIntegration.java b/...ful/compat/ColorfulHeartsIntegration.java → ...ent/compat/ColorfulHeartsIntegration.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.compat;
+package com.github.thedeathlycow.frostiful.client.compat;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;

diff --git a/...iful/client/gui/FrostOverlayRenderer.java → ...iful/client/gui/FrostOverlayRenderer.java b/...iful/client/gui/FrostOverlayRenderer.java → ...iful/client/gui/FrostOverlayRenderer.java
diff --git a/...ful/client/gui/OverlayRenderCallback.java → ...ful/client/gui/OverlayRenderCallback.java b/...ful/client/gui/OverlayRenderCallback.java → ...ful/client/gui/OverlayRenderCallback.java
diff --git a/...ful/client/gui/RootedOverlayRenderer.java → ...ful/client/gui/RootedOverlayRenderer.java b/...ful/client/gui/RootedOverlayRenderer.java → ...ful/client/gui/RootedOverlayRenderer.java
diff --git a/...ins/client/ArmorFeatureRendererMixin.java → ...ient/mixin/ArmorFeatureRendererMixin.java b/...ins/client/ArmorFeatureRendererMixin.java → ...ient/mixin/ArmorFeatureRendererMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client;
+package com.github.thedeathlycow.frostiful.client.mixin;
 
 import com.github.thedeathlycow.frostiful.client.render.feature.CustomArmorTrimRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;

diff --git a/...xins/client/CapeFeatureRendererMixin.java → ...lient/mixin/CapeFeatureRendererMixin.java b/...xins/client/CapeFeatureRendererMixin.java → ...lient/mixin/CapeFeatureRendererMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client;
+package com.github.thedeathlycow.frostiful.client.mixin;
 
 import com.github.thedeathlycow.frostiful.item.cloak.AbstractFrostologyCloakItem;
 import com.github.thedeathlycow.frostiful.registry.tag.FItemTags;

diff --git a/...mixins/client/DrippingWetPlayerMixin.java → .../client/mixin/DrippingWetPlayerMixin.java b/...mixins/client/DrippingWetPlayerMixin.java → .../client/mixin/DrippingWetPlayerMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client;
+package com.github.thedeathlycow.frostiful.client.mixin;
 
 import com.github.thedeathlycow.frostiful.Frostiful;
 import com.github.thedeathlycow.frostiful.compat.FrostifulIntegrations;

diff --git a/...ient/SplashTextResourceSupplierMixin.java → ...ixin/SplashTextResourceSupplierMixin.java b/...ient/SplashTextResourceSupplierMixin.java → ...ixin/SplashTextResourceSupplierMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client;
+package com.github.thedeathlycow.frostiful.client.mixin;
 
 import net.minecraft.client.gui.screen.SplashTextRenderer;
 import net.minecraft.client.resource.SplashTextResourceSupplier;

diff --git a/...ixins/client/SpriteAtlasManagerMixin.java → ...client/mixin/SpriteAtlasManagerMixin.java b/...ixins/client/SpriteAtlasManagerMixin.java → ...client/mixin/SpriteAtlasManagerMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client;
+package com.github.thedeathlycow.frostiful.client.mixin;
 
 import com.github.thedeathlycow.frostiful.Frostiful;
 import com.github.thedeathlycow.frostiful.client.registry.FTexturedRenderLayers;

diff --git a/...enderer/PolarBearShearedTextureMixin.java → ...enderer/PolarBearShearedTextureMixin.java b/...enderer/PolarBearShearedTextureMixin.java → ...enderer/PolarBearShearedTextureMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client.entity_renderer;
+package com.github.thedeathlycow.frostiful.client.mixin.entity_renderer;
 
 import com.github.thedeathlycow.frostiful.client.BrushableTextures;
 import com.github.thedeathlycow.frostiful.entity.FBrushable;

diff --git a/...entity_renderer/RootedEffectRenderer.java → ...entity_renderer/RootedEffectRenderer.java b/...entity_renderer/RootedEffectRenderer.java → ...entity_renderer/RootedEffectRenderer.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client.entity_renderer;
+package com.github.thedeathlycow.frostiful.client.mixin.entity_renderer;
 
 import com.github.thedeathlycow.frostiful.entity.RootedEntity;
 import net.fabricmc.api.EnvType;

diff --git a/...entity_renderer/ShakingRendererMixin.java → ...entity_renderer/ShakingRendererMixin.java b/...entity_renderer/ShakingRendererMixin.java → ...entity_renderer/ShakingRendererMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client.entity_renderer;
+package com.github.thedeathlycow.frostiful.client.mixin.entity_renderer;
 
 import com.github.thedeathlycow.frostiful.survival.SurvivalUtils;
 import net.fabricmc.api.EnvType;

diff --git a/...ful/mixins/client/gui/HeartTypeMixin.java → ...iful/client/mixin/gui/HeartTypeMixin.java b/...ful/mixins/client/gui/HeartTypeMixin.java → ...iful/client/mixin/gui/HeartTypeMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client.gui;
+package com.github.thedeathlycow.frostiful.client.mixin.gui;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import net.minecraft.client.gui.hud.InGameHud;

diff --git a/...ful/mixins/client/gui/InGameHudMixin.java → ...iful/client/mixin/gui/InGameHudMixin.java b/...ful/mixins/client/gui/InGameHudMixin.java → ...iful/client/mixin/gui/InGameHudMixin.java
@@ -1,9 +1,8 @@
-package com.github.thedeathlycow.frostiful.mixins.client.gui;
+package com.github.thedeathlycow.frostiful.client.mixin.gui;
 
 import com.github.thedeathlycow.frostiful.client.gui.FrostOverlayRenderer;
 import com.github.thedeathlycow.frostiful.client.gui.RootedOverlayRenderer;
 import com.github.thedeathlycow.frostiful.entity.RootedEntity;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
@@ -15,7 +14,6 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 

diff --git a/.../mixins/client/gui/ShiveringRenderer.java → ...l/client/mixin/gui/ShiveringRenderer.java b/.../mixins/client/gui/ShiveringRenderer.java → ...l/client/mixin/gui/ShiveringRenderer.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client.gui;
+package com.github.thedeathlycow.frostiful.client.mixin.gui;
 
 import com.github.thedeathlycow.frostiful.Frostiful;
 import com.github.thedeathlycow.frostiful.config.group.ClientConfigGroup;
@@ -8,7 +8,6 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
@@ -18,8 +17,6 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Environment(EnvType.CLIENT)
 @Mixin(GameRenderer.class)

diff --git a/...lient/ice_skate_fx/GameRendererMixin.java → ...mixin/ice_skate_fx/GameRendererMixin.java b/...lient/ice_skate_fx/GameRendererMixin.java → ...mixin/ice_skate_fx/GameRendererMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client.ice_skate_fx;
+package com.github.thedeathlycow.frostiful.client.mixin.ice_skate_fx;
 
 import com.github.thedeathlycow.frostiful.entity.IceSkater;
 import net.fabricmc.api.EnvType;

diff --git a/...ixins/client/ice_skate_fx/ModelMixin.java → ...client/mixin/ice_skate_fx/ModelMixin.java b/...ixins/client/ice_skate_fx/ModelMixin.java → ...client/mixin/ice_skate_fx/ModelMixin.java
@@ -1,4 +1,4 @@
-package com.github.thedeathlycow.frostiful.mixins.client.ice_skate_fx;
+package com.github.thedeathlycow.frostiful.client.mixin.ice_skate_fx;
 
 import com.github.thedeathlycow.frostiful.entity.IceSkater;
 import net.minecraft.client.model.ModelPart;

diff --git a/...stiful/client/model/BiterEntityModel.java → ...stiful/client/model/BiterEntityModel.java b/...stiful/client/model/BiterEntityModel.java → ...stiful/client/model/BiterEntityModel.java
diff --git a/...iful/client/model/FrostWandItemModel.java → ...iful/client/model/FrostWandItemModel.java b/...iful/client/model/FrostWandItemModel.java → ...iful/client/model/FrostWandItemModel.java
diff --git a/.../client/model/FrostologerEntityModel.java → .../client/model/FrostologerEntityModel.java b/.../client/model/FrostologerEntityModel.java → .../client/model/FrostologerEntityModel.java
diff --git a/...frostiful/client/model/IceSkateModel.java → ...frostiful/client/model/IceSkateModel.java b/...frostiful/client/model/IceSkateModel.java → ...frostiful/client/model/IceSkateModel.java
diff --git a/...network/PointWindSpawnPacketListener.java → ...network/PointWindSpawnPacketListener.java b/...network/PointWindSpawnPacketListener.java → ...network/PointWindSpawnPacketListener.java
@@ -1,7 +1,8 @@
-package com.github.thedeathlycow.frostiful.server.network;
+package com.github.thedeathlycow.frostiful.client.network;
 
 import com.github.thedeathlycow.frostiful.particle.WindParticleEffect;
 import com.github.thedeathlycow.frostiful.registry.FSoundEvents;
+import com.github.thedeathlycow.frostiful.server.network.PointWindSpawnPacket;
 import com.github.thedeathlycow.frostiful.survival.wind.PointWindSpawnStrategy;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

diff --git a/...ul/client/particle/HeatDrainParticle.java → ...ul/client/particle/HeatDrainParticle.java b/...ul/client/particle/HeatDrainParticle.java → ...ul/client/particle/HeatDrainParticle.java
diff --git a/...ostiful/client/particle/WindParticle.java → ...ostiful/client/particle/WindParticle.java b/...ostiful/client/particle/WindParticle.java → ...ostiful/client/particle/WindParticle.java
diff --git a/...w/frostiful/client/registry/FCutouts.java → ...w/frostiful/client/registry/FCutouts.java b/...w/frostiful/client/registry/FCutouts.java → ...w/frostiful/client/registry/FCutouts.java
diff --git a/...l/client/registry/FEntityModelLayers.java → ...l/client/registry/FEntityModelLayers.java b/...l/client/registry/FEntityModelLayers.java → ...l/client/registry/FEntityModelLayers.java
diff --git a/...ful/client/registry/FEntityRenderers.java → ...ful/client/registry/FEntityRenderers.java b/...ful/client/registry/FEntityRenderers.java → ...ful/client/registry/FEntityRenderers.java
diff --git a/...nt/registry/FParticleFactoryRegistry.java → ...nt/registry/FParticleFactoryRegistry.java b/...nt/registry/FParticleFactoryRegistry.java → ...nt/registry/FParticleFactoryRegistry.java
diff --git a/...lient/registry/FTexturedRenderLayers.java → ...lient/registry/FTexturedRenderLayers.java b/...lient/registry/FTexturedRenderLayers.java → ...lient/registry/FTexturedRenderLayers.java
diff --git a/.../client/render/FrostWandItemRenderer.java → .../client/render/FrostWandItemRenderer.java b/.../client/render/FrostWandItemRenderer.java → .../client/render/FrostWandItemRenderer.java
diff --git a/...nt/render/entity/BiterEntityRenderer.java → ...nt/render/entity/BiterEntityRenderer.java b/...nt/render/entity/BiterEntityRenderer.java → ...nt/render/entity/BiterEntityRenderer.java
diff --git a/...ender/entity/ChillagerEntityRenderer.java → ...ender/entity/ChillagerEntityRenderer.java b/...ender/entity/ChillagerEntityRenderer.java → ...ender/entity/ChillagerEntityRenderer.java
diff --git a/...nder/entity/FrostSpellEntityRenderer.java → ...nder/entity/FrostSpellEntityRenderer.java b/...nder/entity/FrostSpellEntityRenderer.java → ...nder/entity/FrostSpellEntityRenderer.java
diff --git a/...der/entity/FrostologerEntityRenderer.java → ...der/entity/FrostologerEntityRenderer.java b/...der/entity/FrostologerEntityRenderer.java → ...der/entity/FrostologerEntityRenderer.java
diff --git a/...er/entity/GlacialArrowEntityRenderer.java → ...er/entity/GlacialArrowEntityRenderer.java b/...er/entity/GlacialArrowEntityRenderer.java → ...er/entity/GlacialArrowEntityRenderer.java
diff --git a/...er/entity/ThrownIcicleEntityRenderer.java → ...er/entity/ThrownIcicleEntityRenderer.java b/...er/entity/ThrownIcicleEntityRenderer.java → ...er/entity/ThrownIcicleEntityRenderer.java
diff --git a/...nder/feature/CustomArmorTrimRenderer.java → ...nder/feature/CustomArmorTrimRenderer.java b/...nder/feature/CustomArmorTrimRenderer.java → ...nder/feature/CustomArmorTrimRenderer.java
diff --git a/...ul/client/render/feature/FrostLayers.java → ...ul/client/render/feature/FrostLayers.java b/...ul/client/render/feature/FrostLayers.java → ...ul/client/render/feature/FrostLayers.java
diff --git a/...ture/FrostologerCloakFeatureRenderer.java → ...ture/FrostologerCloakFeatureRenderer.java b/...ture/FrostologerCloakFeatureRenderer.java → ...ture/FrostologerCloakFeatureRenderer.java
diff --git a/...ature/FrostologerEyesFeatureRenderer.java → ...ature/FrostologerEyesFeatureRenderer.java b/...ature/FrostologerEyesFeatureRenderer.java → ...ature/FrostologerEyesFeatureRenderer.java
diff --git a/...ture/FrostologerFrostFeatureRenderer.java → ...ture/FrostologerFrostFeatureRenderer.java b/...ture/FrostologerFrostFeatureRenderer.java → ...ture/FrostologerFrostFeatureRenderer.java
diff --git a/...nder/feature/IceSkateFeatureRenderer.java → ...nder/feature/IceSkateFeatureRenderer.java b/...nder/feature/IceSkateFeatureRenderer.java → ...nder/feature/IceSkateFeatureRenderer.java
diff --git a/src/client/resources/frostiful.client.mixins.json b/src/client/resources/frostiful.client.mixins.json
@@ -0,0 +1,24 @@
+{
+    "required": true,
+    "minVersion": "0.8",
+    "package": "com.github.thedeathlycow.frostiful.client.mixin",
+    "compatibilityLevel": "JAVA_21",
+    "client": [
+        "ArmorFeatureRendererMixin",
+        "CapeFeatureRendererMixin",
+        "DrippingWetPlayerMixin",
+        "SplashTextResourceSupplierMixin",
+        "SpriteAtlasManagerMixin",
+        "entity_renderer.PolarBearShearedTextureMixin",
+        "entity_renderer.RootedEffectRenderer",
+        "entity_renderer.ShakingRendererMixin",
+        "gui.HeartTypeMixin",
+        "gui.InGameHudMixin",
+        "gui.ShiveringRenderer",
+        "ice_skate_fx.GameRendererMixin",
+        "ice_skate_fx.ModelMixin"
+    ],
+    "injectors": {
+        "defaultRequire": 1
+    }
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -36,11 +36,15 @@
             "com.github.thedeathlycow.frostiful.registry.FComponents"
         ],
         "colorfulhearts": [
-            "com.github.thedeathlycow.frostiful.compat.ColorfulHeartsIntegration"
+            "com.github.thedeathlycow.frostiful.client.compat.ColorfulHeartsIntegration"
         ]
     },
     "mixins": [
-        "frostiful.mixins.json"
+        "frostiful.mixins.json",
+        {
+            "config": "frostiful.client.mixins.json",
+            "environment": "client"
+        }
     ],
     "depends": {
         "fabricloader": ">=0.15.11",

diff --git a/src/main/resources/frostiful.mixins.json b/src/main/resources/frostiful.mixins.json
@@ -36,21 +36,6 @@
         "world.WindSpawningMixin",
         "world.spawner.PatrolSpawnerMixin"
     ],
-    "client": [
-        "client.ArmorFeatureRendererMixin",
-        "client.CapeFeatureRendererMixin",
-        "client.DrippingWetPlayerMixin",
-        "client.SplashTextResourceSupplierMixin",
-        "client.SpriteAtlasManagerMixin",
-        "client.entity_renderer.PolarBearShearedTextureMixin",
-        "client.entity_renderer.RootedEffectRenderer",
-        "client.entity_renderer.ShakingRendererMixin",
-        "client.gui.HeartTypeMixin",
-        "client.gui.InGameHudMixin",
-        "client.gui.ShiveringRenderer",
-        "client.ice_skate_fx.GameRendererMixin",
-        "client.ice_skate_fx.ModelMixin"
-    ],
     "injectors": {
         "defaultRequire": 1
     }