From 1372cd8986d2e81fa2345ef5644d781299e4b819 Mon Sep 17 00:00:00 2001 From: PinkGoosik Date: Tue, 14 Mar 2023 13:26:34 +0500 Subject: [PATCH] 1.19.4-rc3 --- .github/workflows/publish-curseforge.yml | 2 +- .github/workflows/publish-modrinth.yml | 2 +- brachyurabootstrapconf.txt | 44 +++++++++---------- buildscript/buildscript.properties | 12 ++--- buildscript/src/main/java/Buildscript.java | 8 +--- .../visuality/event/CirclesOnWaterEvent.java | 4 +- src/main/resources/fabric.mod.json | 2 +- 7 files changed, 31 insertions(+), 43 deletions(-) diff --git a/.github/workflows/publish-curseforge.yml b/.github/workflows/publish-curseforge.yml index a087ebe..cb40161 100644 --- a/.github/workflows/publish-curseforge.yml +++ b/.github/workflows/publish-curseforge.yml @@ -42,7 +42,7 @@ jobs: fabric quilt game-versions: | - 1.19.3 + 1.19.4 dependencies: | fabric-api | depends | * cloth-config | depends | * diff --git a/.github/workflows/publish-modrinth.yml b/.github/workflows/publish-modrinth.yml index 333709b..b0fe05e 100644 --- a/.github/workflows/publish-modrinth.yml +++ b/.github/workflows/publish-modrinth.yml @@ -42,7 +42,7 @@ jobs: fabric quilt game-versions: | - 1.19.3 + 1.19.4-rc3 dependencies: | fabric-api | depends | * cloth-config | depends | * diff --git a/brachyurabootstrapconf.txt b/brachyurabootstrapconf.txt index 3633347..cc623e4 100644 --- a/brachyurabootstrapconf.txt +++ b/brachyurabootstrapconf.txt @@ -1,20 +1,22 @@ 0 -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/brachyura-0.94.jar DC2B61A9AA55A4C00078310D3AD629AD85081168 brachyura-0.94.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/brachyura-0.94-sources.jar 9AF6FC597A9F85E013E797E44561D17D4DB12E2A brachyura-0.94-sources.jar false -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/trieharder-0.2.0.jar FB5F8770BC368C19197C6B910B72B4676450CBD6 trieharder-0.2.0.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/trieharder-0.2.0-sources.jar 9ED36D104B9C46912B3149B3BA3A9599FADD4CB8 trieharder-0.2.0-sources.jar false -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/fernutil-0.2.jar C076DA44E53AEADFBC8859196501E7147D05947D fernutil-0.2.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/fernutil-0.2-sources.jar 24CDC2628AF10D0ABD04C5BC5533AF7B0A0DB028 fernutil-0.2-sources.jar false -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/fabricmerge-0.2.jar 8C79C6FF9AC59B60C32E982BC5E9B1A8DD2E9A7B fabricmerge-0.2.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/fabricmerge-0.2-sources.jar D121EEBE5DC3137511BDCC94B3F2B1B7A3611A33 fabricmerge-0.2-sources.jar false -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/cfr-0.6.jar 488B145D4778522120867D09DF6DB64A2AB5A730 cfr-0.6.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/cfr-0.6-sources.jar D113E51E5310F69AD04426A2A6DC3340C4CB46A9 cfr-0.6-sources.jar false -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/brachyura-mixin-compile-extensions-0.10.jar 8AE63316B2E74D0BC82F262D78810E4AB08150EA brachyura-mixin-compile-extensions-0.10.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/brachyura-mixin-compile-extensions-0.10-sources.jar E9C5A1891737FF7E52CC40D44FF14A98DD1575BD brachyura-mixin-compile-extensions-0.10-sources.jar false -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/access-widener-0.2.jar 7B1DBF869FCC2D589B4A96141368021394AAF73D access-widener-0.2.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/access-widener-0.2-sources.jar 1F41A4474EC149C29C8FFADFA9D89D9ADFAC3C73 access-widener-0.2-sources.jar false -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/brachyura-minecraft-0.1.jar 45B5192249209F7DA54A0766D6F4D715854E296E brachyura-minecraft-0.1.jar true -https://github.com/CoolCrabs/brachyura/releases/download/v_97fbf84f059d2c44a439ae7a2388d9673a7d188d/brachyura-minecraft-0.1-sources.jar 5B5FE872B8AC1FF676356163FB26D1F1CCF509BB brachyura-minecraft-0.1-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-0.95.jar A3FF7412634D7A18EE3A0F59915AEF3B38EC7141 brachyura-0.95.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-0.95-sources.jar 5B6FAE353547475B93C22247D20D4538DC9A80DF brachyura-0.95-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/trieharder-0.2.0.jar FB5F8770BC368C19197C6B910B72B4676450CBD6 trieharder-0.2.0.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/trieharder-0.2.0-sources.jar 9ED36D104B9C46912B3149B3BA3A9599FADD4CB8 trieharder-0.2.0-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/recombobulator-0.5.jar 9DFD6CB020B47B21A5C6CF87A08AB4FCBC78E8CC recombobulator-0.5.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/recombobulator-0.5-sources.jar 643FD92F5E8E61850C57F94F57A0C12E3FC18E87 recombobulator-0.5-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fernutil-0.2.jar C076DA44E53AEADFBC8859196501E7147D05947D fernutil-0.2.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fernutil-0.2-sources.jar 24CDC2628AF10D0ABD04C5BC5533AF7B0A0DB028 fernutil-0.2-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fabricmerge-0.2.jar 8C79C6FF9AC59B60C32E982BC5E9B1A8DD2E9A7B fabricmerge-0.2.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fabricmerge-0.2-sources.jar D121EEBE5DC3137511BDCC94B3F2B1B7A3611A33 fabricmerge-0.2-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/cfr-0.6.jar 488B145D4778522120867D09DF6DB64A2AB5A730 cfr-0.6.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/cfr-0.6-sources.jar D113E51E5310F69AD04426A2A6DC3340C4CB46A9 cfr-0.6-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-mixin-compile-extensions-0.10.jar 8AE63316B2E74D0BC82F262D78810E4AB08150EA brachyura-mixin-compile-extensions-0.10.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-mixin-compile-extensions-0.10-sources.jar E9C5A1891737FF7E52CC40D44FF14A98DD1575BD brachyura-mixin-compile-extensions-0.10-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/access-widener-0.2.jar 7B1DBF869FCC2D589B4A96141368021394AAF73D access-widener-0.2.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/access-widener-0.2-sources.jar 1F41A4474EC149C29C8FFADFA9D89D9ADFAC3C73 access-widener-0.2-sources.jar false +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-minecraft-0.4.jar 6C326E710CA7E5A6D5B2F4FF261764E82234659A brachyura-minecraft-0.4.jar true +https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-minecraft-0.4-sources.jar A3B8AA9A4E54E9D5C79ADCC9C3E1591C6CD414F5 brachyura-minecraft-0.4-sources.jar false https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annotations-23.0.0.jar 8cc20c07506ec18e0834947b84a864bfc094484e annotations-23.0.0.jar true https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annotations-23.0.0-sources.jar ca5088d615accaabd2aa956b10b236a4e75cfccb annotations-23.0.0-sources.jar false https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar 8a1167e089096758b49f9b34066ef98b2f4b37aa gson-2.9.0.jar true @@ -33,16 +35,10 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar 7 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.3/asm-tree-9.3-sources.jar 0cc1987e5e291659c366c4b9be35d105d40a518a asm-tree-9.3-sources.jar false https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/9.3/asm-util-9.3.jar 9595bc05510d0bd4b610188b77333fe4851a1975 asm-util-9.3.jar true https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/9.3/asm-util-9.3-sources.jar 7a969dd37607523cfd3b9d2ef1a3e78882bfe647 asm-util-9.3-sources.jar false -https://maven.fabricmc.net/net/fabricmc/tiny-remapper/0.8.2/tiny-remapper-0.8.2.jar 2cc6565989469ec38893bfb7802b31c0d0d11ea0 tiny-remapper-0.8.2.jar true -https://maven.fabricmc.net/net/fabricmc/tiny-remapper/0.8.2/tiny-remapper-0.8.2-sources.jar bb9487ede138747fd2685556f60ca2100d78e203 tiny-remapper-0.8.2-sources.jar false +https://repo.maven.apache.org/maven2/it/unimi/dsi/fastutil/8.5.8/fastutil-8.5.8.jar 8077f8d41f53e5b37ee75861596c574457824f50 fastutil-8.5.8.jar true +https://repo.maven.apache.org/maven2/it/unimi/dsi/fastutil/8.5.8/fastutil-8.5.8-sources.jar 05c9e963814cfd4a1b038ba353837b8b3792857c fastutil-8.5.8-sources.jar false https://maven.fabricmc.net/net/fabricmc/mapping-io/0.3.0/mapping-io-0.3.0.jar f7c41de27b01e622ba85f72794012bf7447e4156 mapping-io-0.3.0.jar true https://maven.fabricmc.net/net/fabricmc/mapping-io/0.3.0/mapping-io-0.3.0-sources.jar 7002ec63184af7dfa48b68595be6388bc847f5b6 mapping-io-0.3.0-sources.jar false -https://repo1.maven.org/maven2/blue/endless/jankson/1.2.1/jankson-1.2.1.jar 85381183c0c17d32425b9a4248b3355105cec158 jankson-1.2.1.jar true -https://repo1.maven.org/maven2/blue/endless/jankson/1.2.1/jankson-1.2.1-sources.jar 6e78e7cf416c785be94c46aec29b7512c9a468a1 jankson-1.2.1-sources.jar false -https://repo1.maven.org/maven2/com/moandjiezana/toml/toml4j/0.7.2/toml4j-0.7.2.jar 0a03337911d0bd2c40932aca3946edb30d0e7d0c toml4j-0.7.2.jar true -https://repo1.maven.org/maven2/com/moandjiezana/toml/toml4j/0.7.2/toml4j-0.7.2-sources.jar b957d79fcb9e8a7d06c9634a0c1110128f65405a toml4j-0.7.2-sources.jar false -https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar 2cd0a87ff7df953f810c344bdf2fe3340b954c69 snakeyaml-1.33.jar true -https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33-sources.jar 97257a0e34679175cc00444a64fa42d6bb53e23f snakeyaml-1.33-sources.jar false https://repo1.maven.org/maven2/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.jar 8ad31867c493c63ac60a3fa42356a72d20f8457b maven-model-3.8.6.jar true https://repo1.maven.org/maven2/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6-sources.jar 3f2471220d4a7124aee2bbe9ff801b83c4c32ef6 maven-model-3.8.6-sources.jar false https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.5.0/plexus-utils-3.5.0.jar ff9f0881396a06b31ff548048256e9a7c8f1207a plexus-utils-3.5.0.jar true diff --git a/buildscript/buildscript.properties b/buildscript/buildscript.properties index a1b5d4c..8cfb4cb 100644 --- a/buildscript/buildscript.properties +++ b/buildscript/buildscript.properties @@ -1,13 +1,13 @@ # Mod Properties name = visuality -modVersion = 0.6.1 +modVersion = 0.7.0 javaVersion = 17 # Dependencies -minecraftVersion = 1.19.3 -yarnMappings = 1.19.3+build.2 -fabricLoader = 0.14.11 +minecraftVersion = 1.19.4-rc3 +yarnMappings = 1.19.4-rc3+build.1 +fabricLoader = 0.14.17 quiltflower = 1.9.0 -fabricApi = 0.68.1+1.19.3 -clothConfig = 9.0.93 +fabricApi = 0.75.3+1.19.4 +clothConfig = 10.0.95 diff --git a/buildscript/src/main/java/Buildscript.java b/buildscript/src/main/java/Buildscript.java index 03a0b22..53a1e94 100644 --- a/buildscript/src/main/java/Buildscript.java +++ b/buildscript/src/main/java/Buildscript.java @@ -57,14 +57,8 @@ public void getModDependencies(ModDependencyCollector d) { d.addMaven("https://maven.shedaniel.me", new MavenId("me.shedaniel.cloth", "cloth-config-fabric", this.getProperties().getProperty("clothConfig")), RUNTIME, COMPILE); d.addMaven("https://maven.shedaniel.me", new MavenId("me.shedaniel.cloth", "basic-math", "0.6.1"), RUNTIME, COMPILE); - // Runtime Mods - //d.addMaven("https://api.modrinth.com/maven", new MavenId("maven.modrinth", "lazydfu", "0.1.3"), RUNTIME); - d.addMaven("https://api.modrinth.com/maven", new MavenId("maven.modrinth", "ferrite-core", "5.1.0-fabric"), RUNTIME); - //d.addMaven("https://api.modrinth.com/maven", new MavenId("maven.modrinth", "starlight", "1.1.1+1.19"), RUNTIME); - //d.addMaven("https://api.modrinth.com/maven", new MavenId("maven.modrinth", "lithium", "mc1.19.3-0.10.3"), RUNTIME); - // Compatibility - d.addMaven("https://maven.terraformersmc.com", new MavenId("com.terraformersmc", "modmenu", "5.0.1"), RUNTIME, COMPILE); + d.addMaven("https://maven.terraformersmc.com", new MavenId("com.terraformersmc", "modmenu", "6.1.0-rc.1"), RUNTIME, COMPILE); } public void addFabricModules(ModDependencyCollector d) { diff --git a/src/main/java/visuality/event/CirclesOnWaterEvent.java b/src/main/java/visuality/event/CirclesOnWaterEvent.java index ffa5a5f..ecdbe00 100644 --- a/src/main/java/visuality/event/CirclesOnWaterEvent.java +++ b/src/main/java/visuality/event/CirclesOnWaterEvent.java @@ -36,6 +36,7 @@ public static void onTick(ClientWorld world) { BlockPos playerPos = new BlockPos((int) player.getX() + x, (int) player.getY(), (int) player.getZ() + z); BlockPos topPos = world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, playerPos); + if(!(biome.getPrecipitation(topPos).equals(Biome.Precipitation.RAIN)) || !(biome.doesNotSnow(player.getSteppingPos()))) continue; if(world.getBlockState(topPos.down()).isOf(Blocks.WATER) && world.getBlockState(topPos).isAir()) { if(world.getFluidState(topPos.down()).getLevel() == 8) { int color = config.waterCircles.colored ? biome.getWaterColor() : 0; @@ -45,7 +46,6 @@ public static void onTick(ClientWorld world) { } } - @SuppressWarnings("RedundantIfStatement") private static boolean shown(ClientWorld world) { var client = MinecraftClient.getInstance(); if(!config.waterCircles.enabled) return false; @@ -56,8 +56,6 @@ private static boolean shown(ClientWorld world) { if(player.isSubmergedInWater() || !World.OVERWORLD.equals(world.getRegistryKey())) return false; if(!world.isRaining()) return false; CirclesOnWaterEvent.biome = world.getBiome(player.getSteppingPos()).value(); - if(!(biome.getPrecipitation().equals(Biome.Precipitation.RAIN)) || !(biome.doesNotSnow(player.getSteppingPos()))) - return false; return true; } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e057c63..d0dc99a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,7 +37,7 @@ "fabricloader": "*", "fabric-api": "*", "cloth-config": "*", - "minecraft": ">=1.19.3", + "minecraft": ">=1.19.4-rc.3", "java": ">=17" } }