[fix] Fix right-click mechanical grindstone with empty hand causes crash. 2.1.5

Author: MarbleGateKeeper

CHANGELOG.md

@@ -1,4 +1,4 @@
-### Create: Enchantment Industry 2.1.4
+### Create: Enchantment Industry 2.1.5
 
 #### Fix
-- Fix some crafting recipes (Such as Blaze Smithing Template) unavailable due to C:DP feature config formate changes
+- Fix right-click Mechanical Grindstone with empty hand causes crash

gradle.properties

@@ -17,7 +17,7 @@ mod_id = create_enchantment_industry
 mod_artifact_id = create-enchantment-industry
 mod_name = Create: Enchantment Industry
 mod_license = LGPL-3.0-or-later
-mod_version = 2.1.4
+mod_version = 2.1.5
 mod_group_id = plus.dragons.createenchantmentindustry
 mod_authors = DragonsPlus
 mod_description = Automatic Enchanting with Create.

src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/MechanicalGrindstoneBlock.java

@@ -62,6 +62,7 @@ public MechanicalGrindstoneBlock(Properties properties) {
 
     @Override
     protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
+        if (stack.isEmpty()) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
         if (player.isSecondaryUseActive())
             return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
         var blockEntity = getBlockEntity(level, pos);

src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEICreativeModeTabs.java

@@ -24,7 +24,6 @@
 import static plus.dragons.createenchantmentindustry.common.registry.CEIBlocks.*;
 import static plus.dragons.createenchantmentindustry.common.registry.CEIItems.*;
 
-import com.simibubi.create.AllCreativeModeTabs;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
@@ -47,7 +46,6 @@ public static void register(IEventBus modBus) {
     private static CreativeModeTab base(ResourceLocation id) {
         return CreativeModeTab.builder()
                 .title(CEILang.description("itemGroup", id).component())
-                .withTabsBefore(AllCreativeModeTabs.BASE_CREATIVE_TAB.getId())
                 .icon(BLAZE_ENCHANTER::asStack)
                 .displayItems(CEICreativeModeTabs::buildBaseContents)
                 .withTabsBefore(ResourceLocation.fromNamespaceAndPath("create_dragons_plus", "base"))

src/main/java/plus/dragons/createenchantmentindustry/config/CEIServerConfig.java

@@ -39,8 +39,8 @@ public String getName() {
 
     static class Comments {
         static final String kinetics = "Parameters and abilities of kinetic mechanisms";
-        static String fluids = "Parameters and abilities of fluids and fluid operating components";
-        static String enchantments = "Parameters and abilities of enchantment operating components";
-        static String processing = "Parameters and abilities of processing mechanisms and appliances";
+        static final String fluids = "Parameters and abilities of fluids and fluid operating components";
+        static final String enchantments = "Parameters and abilities of enchantment operating components";
+        static final String processing = "Parameters and abilities of processing mechanisms and appliances";
     }
 }