Fix server crashing issue due to PlantAnalyzer

Author: Micaxs

gradle.properties

@@ -36,7 +36,7 @@ mod_name=Smokeleaf Industries
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=0.5.0-1.21.1
+mod_version=0.5.1-1.21.1
 
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.

src/main/java/net/micaxs/smokeleaf/SmokeleafIndustries.java

@@ -74,9 +74,6 @@ public SmokeleafIndustries(IEventBus modEventBus, ModContainer modContainer) {
 
         ModVillagers.register(modEventBus);
 
-        // Register the item to a creative tab
-        modEventBus.addListener(this::addCreative);
-
         modEventBus.register(ModPayloads.class);
 
         // Register our mod's ModConfigSpec so that FML can create and load the config file for us
@@ -104,12 +101,6 @@ private void commonSetup(FMLCommonSetupEvent event) {
 
     }
 
-    // Add the example block item to the building blocks tab
-    private void addCreative(BuildCreativeModeTabContentsEvent event) {
-
-    }
-
-
     @SubscribeEvent
     public void onServerStarting(ServerStartingEvent event) {
         LOGGER.info("Smokeleaf Industries server starting...");

src/main/java/net/micaxs/smokeleaf/block/custom/GrowPotBlock.java

@@ -34,6 +34,8 @@
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -107,8 +109,8 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
         boolean sneaking = player.isShiftKeyDown();
 
         if (holdingMagnifyingGlass) {
-            if (level.isClientSide()) {
-                Minecraft.getInstance().setScreen(new MagnifyingGlassScreen(pos));
+            if (level.isClientSide) {
+                openAnalyzerScreen(pos);
             }
             return ItemInteractionResult.SUCCESS;
         }
@@ -183,6 +185,13 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
         return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
     }
 
+
+    @OnlyIn(Dist.CLIENT)
+    public static void openAnalyzerScreen(BlockPos pos) {
+        Minecraft.getInstance().setScreen(new MagnifyingGlassScreen(pos));
+    }
+
+
     @Override
     protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) {
         return InteractionResult.PASS;

src/main/java/net/micaxs/smokeleaf/block/entity/GrinderBlockEntity.java

@@ -1,9 +1,7 @@
 package net.micaxs.smokeleaf.block.entity;
 
 import net.micaxs.smokeleaf.block.entity.energy.ModEnergyStorage;
-import net.micaxs.smokeleaf.block.entity.energy.ModEnergyUtil;
 import net.micaxs.smokeleaf.component.ModDataComponentTypes;
-import net.micaxs.smokeleaf.item.ModItems;
 import net.micaxs.smokeleaf.item.custom.BaseBudItem;
 import net.micaxs.smokeleaf.recipe.GrinderRecipe;
 import net.micaxs.smokeleaf.recipe.GrinderRecipeInput;

src/main/java/net/micaxs/smokeleaf/effect/neutral/GigglyFitEffect.java

@@ -15,6 +15,8 @@
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 
 import java.util.List;
 
@@ -36,13 +38,19 @@ public InteractionResult useOn(UseOnContext context) {
             return InteractionResult.PASS;
         }
 
-        if (level.isClientSide()) {
-            Minecraft.getInstance().setScreen(new MagnifyingGlassScreen(pos));
+        if (level.isClientSide) {
+            openAnalyzerScreen(pos);
         }
 
         return InteractionResult.sidedSuccess(level.isClientSide());
     }
 
+    @OnlyIn(Dist.CLIENT)
+    public static void openAnalyzerScreen(BlockPos pos) {
+        Minecraft.getInstance().setScreen(new MagnifyingGlassScreen(pos));
+    }
+
+
     @Override
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         tooltipComponents.add(Component.translatable("tooltip.smokeleafindustries.plant_analyzer").withStyle(ChatFormatting.GRAY));

src/main/java/net/micaxs/smokeleaf/item/custom/PlantAnalyzerItem.java

@@ -13,13 +13,6 @@ public static void register(final RegisterPayloadHandlersEvent event) {
                 .versioned("1")
                 .optional();
 
-        // GigglyFit -> client
-        registrar.playToClient(
-                GigglyFitPayload.TYPE,
-                GigglyFitPayload.STREAM_CODEC,
-                GigglyFitClientHandler::handle
-        );
-
         // Paranoia Hallucination -> client
         registrar.playToClient(
                 ParanoiaHallucinationPayload.TYPE,

src/main/java/net/micaxs/smokeleaf/network/GigglyFitClientHandler.java

@@ -1,7 +1,14 @@
 package net.micaxs.smokeleaf.screen;
 
 import net.micaxs.smokeleaf.SmokeleafIndustries;
-import net.micaxs.smokeleaf.screen.custom.*;
+import net.micaxs.smokeleaf.screen.custom.GeneratorMenu;
+import net.micaxs.smokeleaf.screen.custom.GrinderMenu;
+import net.micaxs.smokeleaf.screen.custom.ExtractorMenu;
+import net.micaxs.smokeleaf.screen.custom.LiquifierMenu;
+import net.micaxs.smokeleaf.screen.custom.MutatorMenu;
+import net.micaxs.smokeleaf.screen.custom.SynthesizerMenu;
+import net.micaxs.smokeleaf.screen.custom.SequencerMenu;
+import net.micaxs.smokeleaf.screen.custom.DryerMenu;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;