Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [20.4.1]
+
+### Fixed
+
+- MineTogether compatibility
+
 ## [20.4.0]
 
 ### Changed

common/build.gradle

@@ -24,8 +24,8 @@ dependencies {
     modImplementation ("dev.ftb.mods:ftb-library:${rootProject.ftb_library_version}") { transitive false }
     modCompileOnly("net.darkhax.tips:Tips-Forge-${minecraft_version}:${tips_version}")
 
-    modCompileOnly("curse.maven:creeperhost-minetogether-267172:5075809")
-    modCompileOnly "net.creeperhost:polylib-fabric:2000.0.3-build.133"
+    modCompileOnly("curse.maven:creeperhost-minetogether-267172:5300688")
+    modCompileOnly "net.creeperhost:polylib-fabric:2004.0.3-build.140"
 
     modCompileOnlyApi("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
     modCompileOnlyApi("mezz.jei:jei-${minecraft_version}-gui:${jei_version}")

common/src/main/java/dev/ftb/packcompanion/integrations/minetogether/MineTogetherPauseProvider.java

@@ -9,6 +9,7 @@
 import net.creeperhost.minetogether.chat.gui.FriendChatGui;
 import net.creeperhost.minetogether.chat.gui.PublicChatGui;
 import net.creeperhost.minetogether.config.Config;
+import net.creeperhost.minetogether.config.LocalConfig;
 import net.creeperhost.minetogether.connect.ConnectHandler;
 import net.creeperhost.minetogether.connect.gui.GuiShareToFriends;
 import net.creeperhost.minetogether.gui.SettingGui;
@@ -50,7 +51,7 @@ public ScreenWidgetCollection init(AdditionalPauseTarget target, ScreenHolder sc
         collection.addRenderableWidget(newSettingsBtn);
         collection.addRenderableWidget(newFriendChatBtn);
 
-        if (Config.instance().chatEnabled) {
+        if (LocalConfig.instance().chatEnabled) {
             var newPublicChatBtn = new SupportPauseProvider.IconButton(x - xOffset - 44, y, 20, 20, Constants.WIDGETS_SHEET, "minetogether:gui.button.global_chat.info", e -> Minecraft.getInstance().setScreen(new ModularGuiScreen(PublicChatGui.createGui(), screen.unsafeScreenAccess())), 20, 0, 256, 256, 20, 20, 20, false);
             collection.addRenderableWidget(newPublicChatBtn);
         }

common/src/main/java/dev/ftb/packcompanion/mixin/features/jigsaw/JigsawPlacementMixin.java

@@ -2,13 +2,14 @@
 
 import dev.ftb.packcompanion.config.PCCommonConfig;
 import net.minecraft.world.level.levelgen.structure.pools.JigsawPlacement;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(JigsawPlacement.class)
 public class JigsawPlacementMixin {
-    @ModifyVariable(method = "addPieces(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;Lnet/minecraft/core/Holder;Ljava/util/Optional;ILnet/minecraft/core/BlockPos;ZLjava/util/Optional;I)Ljava/util/Optional;", at = @At("HEAD"), ordinal = 1, argsOnly = true)
+    @ModifyVariable(method = "addPieces(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;Lnet/minecraft/core/Holder;Ljava/util/Optional;ILnet/minecraft/core/BlockPos;ZLjava/util/Optional;ILnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;)Ljava/util/Optional;", at = @At("HEAD"), ordinal = 1, argsOnly = true)
     private static int modifyRange(int range) {
         int r = PCCommonConfig.EXTENDED_JIGSAW_RANGE.get();
         return r == 0 ? range : r;

gradle.properties

@@ -6,7 +6,7 @@ enabled_platforms=fabric,neoforge
 archives_base_name=ftb-pack-companion
 readable_name=FTB Pack Companion
 # neo style version number
-mod_version=20.4.0
+mod_version=20.4.1
 maven_group=dev.ftb.mods
 
 architectury_version=11.1.17

neoforge/build.gradle

@@ -57,8 +57,8 @@ dependencies {
 //    modRuntimeOnly("com.simibubi.create:create-${minecraft_version}:${create_version}") { transitive = false }
 //    modRuntimeOnly("com.tterrag.registrate:Registrate:${registrate_version}")
 
-//    modRuntimeOnly("curse.maven:creeperhost-minetogether-267172:5300689")
-//    modRuntimeOnly("curse.maven:poly-576589:5308722")
+    modRuntimeOnly("curse.maven:creeperhost-minetogether-267172:5300690")
+    modRuntimeOnly("curse.maven:poly-576589:5308723")
 
     modCompileOnlyApi("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
     modCompileOnlyApi("mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}")