diff --git a/gradle.properties b/gradle.properties index 3f03ed3..82f2ddf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.18.2 -yarn_mappings=1.18.2+build.4 +minecraft_version=1.19.2 +yarn_mappings=1.19.2+build.28 loader_version=0.14.10 # Mod Properties -mod_version=1.0+1.18 +mod_version=1.0+1.19 maven_group=zone.oat.supersecretrevival archives_base_name=super-secret-revival # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.59.1+1.18.2 +fabric_version=0.64.0+1.19.2 diff --git a/src/main/java/zone/oat/supersecretrevival/Mod.java b/src/main/java/zone/oat/supersecretrevival/Mod.java index 650db04..b9826fb 100644 --- a/src/main/java/zone/oat/supersecretrevival/Mod.java +++ b/src/main/java/zone/oat/supersecretrevival/Mod.java @@ -11,6 +11,7 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; +import net.minecraft.util.math.random.Random; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import org.lwjgl.glfw.GLFW; @@ -20,7 +21,6 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Random; public class Mod implements ClientModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger("super-secret-revival"); @@ -41,6 +41,7 @@ public class Mod implements ClientModInitializer { private static SoundEvent[] soundBlocklist = { SoundEvents.MUSIC_CREATIVE, SoundEvents.MUSIC_CREDITS, + SoundEvents.MUSIC_DISC_5, SoundEvents.MUSIC_DISC_11, SoundEvents.MUSIC_DISC_13, SoundEvents.MUSIC_DISC_BLOCKS, @@ -61,10 +62,14 @@ public class Mod implements ClientModInitializer { SoundEvents.MUSIC_MENU, SoundEvents.MUSIC_NETHER_BASALT_DELTAS, SoundEvents.MUSIC_NETHER_CRIMSON_FOREST, + SoundEvents.MUSIC_OVERWORLD_DEEP_DARK, SoundEvents.MUSIC_OVERWORLD_DRIPSTONE_CAVES, SoundEvents.MUSIC_OVERWORLD_GROVE, SoundEvents.MUSIC_OVERWORLD_JAGGED_PEAKS, SoundEvents.MUSIC_OVERWORLD_LUSH_CAVES, + SoundEvents.MUSIC_OVERWORLD_SWAMP, + SoundEvents.MUSIC_OVERWORLD_JUNGLE_AND_FOREST, + SoundEvents.MUSIC_OVERWORLD_OLD_GROWTH_TAIGA, SoundEvents.MUSIC_OVERWORLD_MEADOW, SoundEvents.MUSIC_NETHER_NETHER_WASTES, SoundEvents.MUSIC_OVERWORLD_FROZEN_PEAKS, diff --git a/src/main/java/zone/oat/supersecretrevival/mixin/SecretSettingsButtonMixin.java b/src/main/java/zone/oat/supersecretrevival/mixin/SecretSettingsButtonMixin.java index 72693dd..ac3061c 100644 --- a/src/main/java/zone/oat/supersecretrevival/mixin/SecretSettingsButtonMixin.java +++ b/src/main/java/zone/oat/supersecretrevival/mixin/SecretSettingsButtonMixin.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.OptionsScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -24,7 +23,7 @@ public class SecretSettingsButtonMixin extends Screen { this.height / 6 + 18, 150, 20, - new TranslatableText("options.supersecretrevival.super_secret_settings"), + Text.translatable("options.supersecretrevival.super_secret_settings"), (button) -> { Mod.triggerSuperSecretSettings(); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index eb9d18b..fd5da3d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,6 +30,6 @@ "depends": { "fabricloader": ">=0.14.10", "fabric": "*", - "minecraft": "~1.18" + "minecraft": ["1.19", "1.19.1", "1.19.2"] } } diff --git a/src/main/resources/supersecretrevival.accesswidener b/src/main/resources/supersecretrevival.accesswidener index 2348e0f..64a1df0 100644 --- a/src/main/resources/supersecretrevival.accesswidener +++ b/src/main/resources/supersecretrevival.accesswidener @@ -2,7 +2,7 @@ accessWidener v1 named # Lnet/minecraft/client/render/GameRenderer;SHADERS_LOCATIONS:[Lnet/minecraft/util/Identifier; accessible field net/minecraft/client/render/GameRenderer SHADERS_LOCATIONS [Lnet/minecraft/util/Identifier; -# Lnet/minecraft/client/render/GameRenderer;random:Ljava/util/Random; -accessible field net/minecraft/client/render/GameRenderer random Ljava/util/Random; +# Lnet/minecraft/client/render/GameRenderer;random:Lnet/minecraft/util/math/random/Random; +accessible field net/minecraft/client/render/GameRenderer random Lnet/minecraft/util/math/random/Random; # Lnet/minecraft/client/render/GameRenderer;loadShader(Lnet/minecraft/util/Identifier;)V accessible method net/minecraft/client/render/GameRenderer loadShader (Lnet/minecraft/util/Identifier;)V \ No newline at end of file