Updated README for 1.4.1 release

# Conflicts:
#	src/main/resources/fabric.mod.json

README.md

@@ -9,16 +9,16 @@ As a challenge I'm trying to make it as user-friendly as possible.
 ## Server Side
 
 - Custom join message  
-![Join Message](https://i.imgur.com/7uv5lUb.png)
+  ![Join Message](https://i.imgur.com/7uv5lUb.png)
 - Custom quit message  
-![Quit Message](https://i.imgur.com/OhFq1BT.png)
+  ![Quit Message](https://i.imgur.com/OhFq1BT.png)
 - Custom chat message  
-![Chat Message](https://i.imgur.com/PDwRywP.png)
+  ![Chat Message](https://i.imgur.com/PDwRywP.png)
 - Tab list dimension indicator  
-![Overworld](https://i.imgur.com/FB1Y7gD.png)  
+  ![Overworld](https://i.imgur.com/FB1Y7gD.png)  
-![Nether](https://i.imgur.com/XxJDL7u.png)  
+  ![Nether](https://i.imgur.com/XxJDL7u.png)  
-![End](https://i.imgur.com/t5u9goh.png)  
+  ![End](https://i.imgur.com/t5u9goh.png)  
-![Spectator](https://i.imgur.com/eEn4V9S.png)
+  ![Spectator](https://i.imgur.com/eEn4V9S.png)
 - Config
   - Configurable messages
   - Feature toggle
@@ -27,10 +27,15 @@ As a challenge I'm trying to make it as user-friendly as possible.
   - Shared EC Access control (via config)
   - Open/close EC block while opening/closing SEC
   - Play open & close sounds
-- Vein miner  
+- Vein miner
-Code inspired by Inferis!  
+  - Configurable animation (tick delay)
-![VeinMiner](https://i.imgur.com/zOXWMNa.gif)
+  - Leaves veinmineable using shears  
+    Code inspired by Inferis!  
+    ![VeinMiner](https://i.imgur.com/zOXWMNa.gif)
 - Chat Calculator
+  - Check if operator is present before calculating
+- Replenish
+
 
 ### Commands
 - /spectator | Essentially server-side free-cam, you get put in spectator and are able to fly around, once you use the command again you get put back to where you were.
@@ -43,38 +48,26 @@ Code inspired by Inferis!
     ![Teleportation Keybindings](https://i.imgur.com/gjO1H3d.png)
 - Remove game fog (lava, water, etc.)
   - All types individually toggleable
-- Mod Menu integration
-  - Automatic config adaption (currently booleans only)
 - Remove darkness effect
   - Toggleable
 - Keybinding for /spectator
-
+- Render block entities from a longer range
-# Currently working on
+  - Toggleable via GUI
-
+  - Configurable value
-## Server Side
+    - In GUI
-- [x] Chat Calculator
+- Mod Menu integration
-  - [x] Check if operator is present before calculating
+  DISCLAIMER: this is NOT perfect and still needs to be reworked, I'm just too lazy right now...
-- Vein Miner
-  - [x] Configurable animation (tick delay)
-  - [x] Leaves veinmineable using shears
-- [x] Replenish
-
-
-## Client Side
-
-- [x] Render block entities from a longer range
-  - [x] Toggleable via GUI
-  - [x] Configurable value
-    - [x] In GUI
-- [x] Rework Mod Menu integration to be more flexible  
-DISCLAIMER: this is NOT perfect and still needs to be reworked, I'm just too lazy right now...  
   - The following types are accepted:
     - String
     - Boolean
     - Float
     - Integer
-- [x] Zoom
+- Zoom
-  - [x] Configurable
+  - Configurable
+    - Smooth zoom
+    - Initial zoom value
+    - Zoom step value
+    - Scroll to zoom further
 
 # To-do
 

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.5
+minecraft_version=1.21.4
-yarn_mappings=1.21.5+build.1
+yarn_mappings=1.21.4+build.8
 loader_version=0.16.10
 
 # Mod Properties
@@ -14,6 +14,6 @@ maven_group=wtf.hak.survivalfabric
 archives_base_name=survivalfabric
 
 # Dependencies
-fabric_version=0.119.5+1.21.5
+fabric_version=0.119.0+1.21.4
 
-modmenu_version=14.0.0-rc.2
+modmenu_version=13.0.3

src/client/java/wtf/hak/survivalfabric/SurvivalFabricClient.java

@@ -4,7 +4,7 @@ import net.fabricmc.api.ClientModInitializer;
 import wtf.hak.survivalfabric.config.client.ClientConfigManager;
 import wtf.hak.survivalfabric.features.AngleViewer;
 import wtf.hak.survivalfabric.features.RemoveDarknessEffect;
-import wtf.hak.survivalfabric.features.SFKeyBindings;
+import wtf.hak.survivalfabric.features.CameraShortcut;
 import wtf.hak.survivalfabric.features.Zoom;
 
 public class SurvivalFabricClient implements ClientModInitializer {
@@ -18,7 +18,7 @@ public class SurvivalFabricClient implements ClientModInitializer {
         // Features
         AngleViewer.register();
         RemoveDarknessEffect.register();
-        SFKeyBindings.register();
+        CameraShortcut.register();
         Zoom.register();
     }
 }

src/client/java/wtf/hak/survivalfabric/config/client/ClientConfig.java

@@ -15,5 +15,6 @@ public class ClientConfig {
     public int blockEntityRange = 512;
     public boolean smoothCamera = true;
     public float initialZoom = 20f;
+    public boolean scrollToZoom = true;
     public float zoomStep = 2.5f;
 }

src/client/java/wtf/hak/survivalfabric/features/CameraShortcut.java

@@ -6,7 +6,7 @@ import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import org.lwjgl.glfw.GLFW;
 
-public class SFKeyBindings {
+public class CameraShortcut {
 
     private static final KeyBinding CAMERA_BIND = KeyBindingHelper.registerKeyBinding(new KeyBinding("key.survivalfabric.camera", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_PERIOD, "category.survivalfabric.survivalfabric"));
 

src/client/java/wtf/hak/survivalfabric/mixin/client/MouseMixin.java

@@ -8,6 +8,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import wtf.hak.survivalfabric.features.Zoom;
 
+import static wtf.hak.survivalfabric.config.client.ClientConfigManager.getConfig;
+
 @Mixin(Mouse.class)
 public class MouseMixin {
 
@@ -16,7 +18,7 @@ public class MouseMixin {
      */
     @Inject(method = "onMouseScroll", at = @At("HEAD"), cancellable = true)
     private void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) {
-        if (Zoom.isZooming()) {
+        if (Zoom.isZooming() && getConfig().scrollToZoom) {
             if (MinecraftClient.getInstance().player != null) {
                 if (vertical > 0)
                     Zoom.modifyStep(-1);

src/main/java/wtf/hak/survivalfabric/mixin/BlockMixin.java

@@ -2,7 +2,9 @@ package wtf.hak.survivalfabric.mixin;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.CropBlock;
+import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.HoeItem;
 import net.minecraft.item.Item;
@@ -35,13 +37,15 @@ public abstract class BlockMixin {
                 Block seedBlock = state.getBlock();
                 List<ItemStack> drops = Block.getDroppedStacks(state, (ServerWorld) world, pos, null, player, mainHand);
                 if (removeIfAvailable(drops, seedItem)) {
-                    if (player.getGameMode() != GameMode.CREATIVE) {
+                    if (!player.isCreative()) {
                         for (ItemStack drop : drops) {
                             Block.dropStack(world, pos, drop);
                         }
+                        player.incrementStat(Stats.USED.getOrCreateStat(seedItem));
+                        mainHand.damage(1, player, EquipmentSlot.MAINHAND);
                     }
                     world.getServer().executeSync(() -> world.setBlockState(pos, seedBlock.getDefaultState()));
-                    player.incrementStat(Stats.USED.getOrCreateStat(seedItem));
+                    cir.setReturnValue(Blocks.AIR.getDefaultState());
                     cir.cancel();
                 }
             }

src/main/resources/fabric.mod.json

@@ -1,48 +1,48 @@
 {
-  "schemaVersion": 1,
+	"schemaVersion": 1,
-  "id": "survivalfabric",
+	"id": "survivalfabric",
-  "version": "${version}",
+	"version": "${version}",
-  "name": "SurvivalFabric",
+	"name": "SurvivalFabric",
-  "description": "Adds a few QOL features to your Survival!",
+	"description": "Adds a few QOL features to your Survival!",
-  "authors": [
+	"authors": [
-    "AlwaysHAK"
+		"AlwaysHAK"
-  ],
+	],
-  "contact": {
+	"contact": {
-    "homepage": "https://hak.wtf",
+		"homepage": "https://hak.wtf",
-    "sources": "https://git.hak.wtf/hkuijlman/SurvivalFabric",
+		"sources": "https://git.hak.wtf/hkuijlman/SurvivalFabric",
-    "issues": "https://git.hak.wtf/hkuijlman/SurvivalFabric/issues"
+		"issues": "https://git.hak.wtf/hkuijlman/SurvivalFabric/issues"
-  },
+	},
-  "license": "CC0-1.0",
+	"license": "CC0-1.0",
-  "icon": "assets/survivalfabric/icon.png",
+	"icon": "assets/survivalfabric/icon.png",
-  "environment": "*",
+	"environment": "*",
-  "entrypoints": {
+	"entrypoints": {
-    "main": [
+		"main": [
-      "wtf.hak.survivalfabric.SurvivalFabric"
+			"wtf.hak.survivalfabric.SurvivalFabric"
-    ],
+		],
-    "client": [
+		"client": [
-      "wtf.hak.survivalfabric.SurvivalFabricClient"
+			"wtf.hak.survivalfabric.SurvivalFabricClient"
-    ],
+		],
-    "fabric-datagen": [
+		"fabric-datagen": [
-      "wtf.hak.survivalfabric.SurvivalFabricDataGenerator"
+			"wtf.hak.survivalfabric.SurvivalFabricDataGenerator"
-    ],
+		],
-    "modmenu": [
+		"modmenu": [
-      "wtf.hak.survivalfabric.modmenu.ModMenuIntegration"
+			"wtf.hak.survivalfabric.modmenu.ModMenuIntegration"
-    ]
+		]
-  },
+	},
-  "mixins": [
+	"mixins": [
-    "survivalfabric.mixins.json",
+		"survivalfabric.mixins.json",
-    {
+		{
-      "config": "survivalfabric.client.mixins.json",
+			"config": "survivalfabric.client.mixins.json",
-      "environment": "client"
+			"environment": "client"
-    }
+		}
-  ],
+	],
-  "depends": {
+	"depends": {
-    "fabricloader": ">=0.16.10",
+		"fabricloader": ">=0.16.10",
-    "minecraft": "~1.21.5",
+		"minecraft": "~1.21.4",
-    "java": ">=21",
+		"java": ">=21",
-    "fabric-api": "*"
+		"fabric-api": "*"
-  },
+	},
-  "optional": {
+	"optional": {
-    "modmenu": "*"
+		"modmenu": "*"
-  }
+	}
 }