Merge pull request #259 from FTBTeam/dev

Dev

Author: desht

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2001.1.4]
+
+### Fixed
+* Fixed a NoSuchMethodError crash with Game Stages mod
+* Worked around Optifine bug, which is firing Forge mob griefing events on the client and causing client crashes
+
+## [2001.1.3]
+
+### Fixed
+* Fixed Endermen still being able to grief claimed chunks
+  * Related, fixes crashes with recent Forge releases (event cancelling semantics have changed for the mob griefing event)
+
 ## [2001.1.2]
 
 ### Added

fabric/src/main/java/dev/ftb/mods/ftbchunks/integration/stages/fabric/GameStagesStageHelperImpl.java

@@ -18,6 +18,6 @@ public static void addStage(Player player, String stage) {
     public static void removeStage(Player player, String stage) {
     }
 
-    public static void sync(ServerPlayer player) {
+    public static void syncStages(ServerPlayer player) {
     }
 }

forge/src/main/java/dev/ftb/mods/ftbchunks/forge/FTBChunksForge.java

@@ -56,7 +56,8 @@ private void entityInteractSpecific(PlayerInteractEvent.EntityInteractSpecific e
 	private void mobGriefing(EntityMobGriefingEvent event) {
 		// we could do this for all mob griefing but that's arguably OP (could trivialize wither fights, for example)
 		// enderman block stealing is the most common annoyance, and this also has parity with the fabric support
-		if (event.getEntity() instanceof EnderMan) {
+		// Note: explicit check for server-side needed due to Optifine brain-damage
+		if (event.getEntity() instanceof EnderMan && !event.getEntity().level().isClientSide()) {
 			ClaimedChunkImpl cc = ClaimedChunkManagerImpl.getInstance().getChunk(new ChunkDimPos(event.getEntity()));
 
 			if (cc != null && !cc.allowMobGriefing()) {

forge/src/main/java/dev/ftb/mods/ftbchunks/integration/stages/forge/GameStagesStageHelperImpl.java

@@ -17,7 +17,7 @@ public static void removeStage(Player player, String stage) {
         if (player instanceof ServerPlayer sp) GameStageHelper.removeStage(sp, stage);
     }
 
-    public static void sync(ServerPlayer player) {
+    public static void syncStages(ServerPlayer player) {
         GameStageHelper.syncPlayer(player);
     }
 }

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 mod_id=ftbchunks
 archives_base_name=ftb-chunks
 maven_group=dev.ftb.mods
-mod_version=2001.1.3
+mod_version=2001.1.4
 mod_author=FTB Team
 
 minecraft_version=1.20.1