From 08ab777904901a4ffba781aec02d4179c0b7f16d Mon Sep 17 00:00:00 2001 From: tticehurst Date: Fri, 15 Dec 2023 14:43:36 +0000 Subject: [PATCH 01/13] update to 1.20.4 --- .../net/xolt/freecam/config/CollisionWhitelist.java | 8 +++----- gradle.properties | 13 +++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java b/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java index 53c16392..cbb02930 100644 --- a/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java +++ b/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java @@ -8,16 +8,14 @@ public class CollisionWhitelist { private static final Collection> transparentWhitelist = List.of( - AbstractGlassBlock.class, + TransparentBlock.class, PaneBlock.class, - BarrierBlock.class - ); + BarrierBlock.class); private static final Collection> openableWhitelist = List.of( FenceGateBlock.class, DoorBlock.class, - TrapdoorBlock.class - ); + TrapdoorBlock.class); public static boolean isTransparent(Block block) { return isMatch(block, transparentWhitelist); diff --git a/gradle.properties b/gradle.properties index a070c377..ff269bee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,19 @@ org.gradle.jvmargs=-Xmx2G # Check versions on https://modmuss50.me/fabric.html -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.2 -enabled_platforms=fabric,forge +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +enabled_platforms=fabric archives_base_name=freecam mod_version=1.2.1.1 maven_group=net.xolt.freecam -architectury_version=10.0.16 +architectury_version=11.0.8 -fabric_loader_version=0.14.25 -fabric_api_version=0.91.1+1.20.2 +fabric_loader_version=0.15.1 +fabric_api_version=0.91.2+1.20.4 +fabric_version=0.91.2+1.20.4 # See https://files.minecraftforge.net forge_version=1.20.2-48.0.13 From b3028dad12e27c84dd27342b1255f34d646a85dd Mon Sep 17 00:00:00 2001 From: tticehurst Date: Fri, 15 Dec 2023 15:01:18 +0000 Subject: [PATCH 02/13] fabric 1.20.4 update --- gradle.properties | 4 ++-- gradlew | 0 settings.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradle.properties b/gradle.properties index ff269bee..ae37beaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.20.4+build.3 enabled_platforms=fabric archives_base_name=freecam -mod_version=1.2.1.1 +mod_version=1.2.1.2 maven_group=net.xolt.freecam architectury_version=11.0.8 @@ -16,7 +16,7 @@ fabric_api_version=0.91.2+1.20.4 fabric_version=0.91.2+1.20.4 # See https://files.minecraftforge.net -forge_version=1.20.2-48.0.13 +# forge_version=1.20.4-49.0.9 modmenu_version=8.0.0 cloth_version=12.0.109 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle index 21982724..cf597567 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,6 +9,6 @@ pluginManagement { include("common") include("fabric") -include("forge") +// include("forge") rootProject.name = "freecam" From d0aae51cd5b9d2f5c717a18bc4c7ec06c8529475 Mon Sep 17 00:00:00 2001 From: tticehurst Date: Fri, 15 Dec 2023 15:19:13 +0000 Subject: [PATCH 03/13] 1.20.4 update --- forge/src/main/resources/META-INF/mods.toml | 12 ++++++------ gradle.properties | 2 +- settings.gradle | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 8c64191f..c502ea2f 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[48,)" +loaderVersion = "[49,)" issueTrackerURL = "https://github.com/hashalite/Freecam/issues" license = "MIT" @@ -7,8 +7,8 @@ license = "MIT" 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" \ No newline at end of file +side = "BOTH" diff --git a/gradle.properties b/gradle.properties index ae37beaa..dff74b7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ fabric_api_version=0.91.2+1.20.4 fabric_version=0.91.2+1.20.4 # See https://files.minecraftforge.net -# forge_version=1.20.4-49.0.9 +forge_version=1.20.4-49.0.9 modmenu_version=8.0.0 cloth_version=12.0.109 diff --git a/settings.gradle b/settings.gradle index cf597567..21982724 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,6 +9,6 @@ pluginManagement { include("common") include("fabric") -// include("forge") +include("forge") rootProject.name = "freecam" From e80b3a99dec5e3dec57c4b2e3069e5adc9ae1ff9 Mon Sep 17 00:00:00 2001 From: tticehurst Date: Fri, 15 Dec 2023 15:22:58 +0000 Subject: [PATCH 04/13] disabled forge --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 21982724..cf597567 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,6 +9,6 @@ pluginManagement { include("common") include("fabric") -include("forge") +// include("forge") rootProject.name = "freecam" From 56b1020ea78fb6dd493ecb366b434322235491e6 Mon Sep 17 00:00:00 2001 From: tticehurst <46826453+tticehurst@users.noreply.github.com> Date: Sat, 16 Dec 2023 13:10:04 +0000 Subject: [PATCH 05/13] bump modmenu and cloth Co-authored-by: Matt Sturgeon --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index dff74b7f..e2430673 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ fabric_version=0.91.2+1.20.4 # See https://files.minecraftforge.net forge_version=1.20.4-49.0.9 -modmenu_version=8.0.0 -cloth_version=12.0.109 +modmenu_version=9.0.0-pre.1 +cloth_version=13.0.114 From 20a34fd82391e471fd136307cbca17fac021877b Mon Sep 17 00:00:00 2001 From: tticehurst <46826453+tticehurst@users.noreply.github.com> Date: Sat, 16 Dec 2023 13:10:19 +0000 Subject: [PATCH 06/13] Update gradle.properties Co-authored-by: Matt Sturgeon --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e2430673..17804fe5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,6 @@ architectury_version=11.0.8 fabric_loader_version=0.15.1 fabric_api_version=0.91.2+1.20.4 -fabric_version=0.91.2+1.20.4 # See https://files.minecraftforge.net forge_version=1.20.4-49.0.9 From e73b165ac0de4fbed2660af100b76342b8accd66 Mon Sep 17 00:00:00 2001 From: tticehurst <46826453+tticehurst@users.noreply.github.com> Date: Sat, 16 Dec 2023 13:11:09 +0000 Subject: [PATCH 07/13] add comment Co-authored-by: Matt Sturgeon --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 17804fe5..8997fa1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G # Check versions on https://modmuss50.me/fabric.html minecraft_version=1.20.4 yarn_mappings=1.20.4+build.3 -enabled_platforms=fabric +enabled_platforms=fabric # Forge disabled for now archives_base_name=freecam mod_version=1.2.1.2 From 151a047f43b6862ba6e4043774c20759680fda7c Mon Sep 17 00:00:00 2001 From: tticehurst <46826453+tticehurst@users.noreply.github.com> Date: Sat, 16 Dec 2023 13:11:26 +0000 Subject: [PATCH 08/13] Update common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java Co-authored-by: Matt Sturgeon --- .../main/java/net/xolt/freecam/config/CollisionWhitelist.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java b/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java index cbb02930..8b396009 100644 --- a/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java +++ b/common/src/main/java/net/xolt/freecam/config/CollisionWhitelist.java @@ -8,7 +8,8 @@ public class CollisionWhitelist { private static final Collection> transparentWhitelist = List.of( - TransparentBlock.class, + StainedGlassBlock.class, + TintedGlassBlock.class, PaneBlock.class, BarrierBlock.class); From 8b93199d0ca00ed59bf4262946059699a684c852 Mon Sep 17 00:00:00 2001 From: tticehurst Date: Sat, 16 Dec 2023 14:59:14 +0000 Subject: [PATCH 09/13] Reverted mod version change - added yarn_mappings_patch --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8997fa1f..b133dd44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx2G # Check versions on https://modmuss50.me/fabric.html minecraft_version=1.20.4 yarn_mappings=1.20.4+build.3 -enabled_platforms=fabric # Forge disabled for now +enabled_platforms=fabric,forge archives_base_name=freecam -mod_version=1.2.1.2 +mod_version=1.2.1.1 maven_group=net.xolt.freecam architectury_version=11.0.8 @@ -20,4 +20,4 @@ forge_version=1.20.4-49.0.9 modmenu_version=9.0.0-pre.1 cloth_version=13.0.114 - +yarn_mappings_patch=1.20.4+build.1 From 13b20f0b5f1555cdb895806825899d6c5f2bc764 Mon Sep 17 00:00:00 2001 From: tticehurst Date: Sat, 16 Dec 2023 14:59:27 +0000 Subject: [PATCH 10/13] added include back for forge --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index cf597567..21982724 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,6 +9,6 @@ pluginManagement { include("common") include("fabric") -// include("forge") +include("forge") rootProject.name = "freecam" From da569130276a9e62ba77a9eb28c8f9b8bc18335b Mon Sep 17 00:00:00 2001 From: tticehurst Date: Sat, 16 Dec 2023 15:00:53 +0000 Subject: [PATCH 11/13] Added mappings fix --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fa769d72..d8dd22fe 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,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() } From 8549ab1df1a72d6f4a6dd6fd67a70ec4a4b16a25 Mon Sep 17 00:00:00 2001 From: tticehurst Date: Sat, 16 Dec 2023 15:40:41 +0000 Subject: [PATCH 12/13] bump loom to 1.4-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d8dd22fe..dc3c246d 100644 --- a/build.gradle +++ b/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 } architectury { From 1aa54fce417c92a03dbf19730704393d03c991da Mon Sep 17 00:00:00 2001 From: tticehurst Date: Sat, 16 Dec 2023 15:40:58 +0000 Subject: [PATCH 13/13] moved yarn_mappings_patch under yarn_mappings --- gradle.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b133dd44..b8418d15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,10 @@ org.gradle.jvmargs=-Xmx2G # Check versions on https://modmuss50.me/fabric.html minecraft_version=1.20.4 + yarn_mappings=1.20.4+build.3 +yarn_mappings_patch=1.20.4+build.1 + enabled_platforms=fabric,forge archives_base_name=freecam @@ -20,4 +23,3 @@ forge_version=1.20.4-49.0.9 modmenu_version=9.0.0-pre.1 cloth_version=13.0.114 -yarn_mappings_patch=1.20.4+build.1