Merge pull request #127 from tticehurst/main

Fabric 1.20.4 update

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
     id "com.github.johnrengelman.shadow" version "7.1.2" apply false
 }
 
@@ -43,7 +43,10 @@ subprojects {
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
+        mappings loom.layered {
+            mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
+            mappings "dev.architectury:yarn-mappings-patch-forge:${rootProject.yarn_mappings_patch}"
+        }
         // TODO consider using to official mappings?
         // mappings loom.officialMojangMappings()
         modLocalRuntime "com.ptsmods:devlogin:${rootProject.devlogin_version}"

common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java

@@ -8,16 +8,15 @@
 public class CollisionWhitelist {
 
     private static final Collection<Class<? extends Block>> transparentWhitelist = List.of(
-            AbstractGlassBlock.class,
+            StainedGlassBlock.class,
+            TintedGlassBlock.class,
             PaneBlock.class,
-            BarrierBlock.class
-    );
+            BarrierBlock.class);
 
     private static final Collection<Class<? extends Block>> openableWhitelist = List.of(
             FenceGateBlock.class,
             DoorBlock.class,
-            TrapdoorBlock.class
-    );
+            TrapdoorBlock.class);
 
     public static boolean isTransparent(Block block) {
         return isMatch(block, transparentWhitelist);

forge/src/main/resources/META-INF/mods.toml

@@ -1,14 +1,14 @@
 modLoader = "javafml"
-loaderVersion = "[48,)"
+loaderVersion = "[49,)"
 issueTrackerURL = "https://github.com/hashalite/Freecam/issues"
 license = "MIT"
 
 [[mods]]
 modId = "freecam"
 version = "${version}"
 displayName = "Freecam"
-logoFile="icon.png"
-authors="hashalite"
+logoFile = "icon.png"
+authors = "hashalite"
 description = '''
 A highly customizable freecam mod.
 '''
@@ -17,13 +17,13 @@ A highly customizable freecam mod.
 [[dependencies.freecam]]
 modId = "forge"
 mandatory = true
-versionRange = "[48,)"
+versionRange = "[49,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.freecam]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.2,)"
+versionRange = "[1.20.4,)"
 ordering = "NONE"
-side = "BOTH"
+side = "BOTH"

gradle.properties

@@ -1,21 +1,25 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Check versions on https://modmuss50.me/fabric.html
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.2
+minecraft_version=1.20.4
+
+yarn_mappings=1.20.4+build.3
+yarn_mappings_patch=1.20.4+build.1
+
 enabled_platforms=fabric,forge
 devlogin_version=3.4.1
 
 mod_version=1.2.1.1
 maven_group=net.xolt.freecam
 
-fabric_loader_version=0.14.25
-fabric_api_version=0.91.1+1.20.2
+architectury_version=11.0.8
 
-# See https://files.minecraftforge.net
-forge_version=1.20.2-48.0.13
+fabric_loader_version=0.15.1
+fabric_api_version=0.91.2+1.20.4
 
-modmenu_version=8.0.0
-cloth_version=12.0.109
+# See https://files.minecraftforge.net
+forge_version=1.20.4-49.0.9
 
+modmenu_version=9.0.0-pre.1
+cloth_version=13.0.114