1.16.5 port
This commit is contained in:
parent
15c78acc15
commit
65a6388a4b
|
@ -2,13 +2,13 @@
|
|||
org.gradle.jvmargs=-Xmx1G
|
||||
# Fabric Properties
|
||||
# check these on https://modmuss50.me/fabric.html
|
||||
minecraft_version=1.19.2
|
||||
yarn_mappings=1.19.2+build.28
|
||||
minecraft_version=1.16.4
|
||||
yarn_mappings=1.16.4+build.9
|
||||
loader_version=0.14.10
|
||||
# Mod Properties
|
||||
mod_version=1.1+1.19
|
||||
mod_version=1.1+1.16
|
||||
maven_group=zone.oat.supersecretrevival
|
||||
archives_base_name=super-secret-revival
|
||||
# Dependencies
|
||||
# check this on https://modmuss50.me/fabric.html
|
||||
fabric_version=0.64.0+1.19.2
|
||||
fabric_version=0.42.0+1.16
|
|
@ -3,18 +3,19 @@ package zone.oat.supersecretrevival;
|
|||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
|
||||
import net.minecraft.client.option.KeyBinding;
|
||||
import net.minecraft.client.options.KeyBinding;
|
||||
import net.minecraft.client.util.InputUtil;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class Mod implements ClientModInitializer {
|
||||
public static final Logger LOGGER = LoggerFactory.getLogger("super-secret-revival");
|
||||
public static final Logger LOGGER = LogManager.getLogger("super-secret-revival");
|
||||
|
||||
// also used for identifying the button (Don't Worry about it)
|
||||
public static final Text BUTTON_TEXT = Text.translatable("options.supersecretrevival.super_secret_settings");
|
||||
public static final Text BUTTON_TEXT = new TranslatableText("options.supersecretrevival.super_secret_settings");
|
||||
|
||||
private static KeyBinding disableShaderKeybind = KeyBindingHelper.registerKeyBinding(new KeyBinding(
|
||||
"key.supersecretrevival.disable", // The translation key of the keybinding's name
|
||||
|
|
|
@ -6,15 +6,15 @@ 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 java.util.Arrays;
|
||||
import java.util.Random;
|
||||
|
||||
public class RandomSoundPlayer {
|
||||
|
||||
private static final Random RANDOM = Random.create();
|
||||
private static final Random RANDOM = new Random();
|
||||
|
||||
// prevent these sounds from playing
|
||||
//
|
||||
|
@ -25,7 +25,6 @@ public class RandomSoundPlayer {
|
|||
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,
|
||||
|
@ -39,27 +38,14 @@ public class RandomSoundPlayer {
|
|||
SoundEvents.MUSIC_DISC_STRAD,
|
||||
SoundEvents.MUSIC_DISC_WAIT,
|
||||
SoundEvents.MUSIC_DISC_WARD,
|
||||
SoundEvents.MUSIC_DISC_OTHERSIDE,
|
||||
SoundEvents.MUSIC_DRAGON,
|
||||
SoundEvents.MUSIC_END,
|
||||
SoundEvents.MUSIC_GAME,
|
||||
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,
|
||||
SoundEvents.MUSIC_OVERWORLD_SNOWY_SLOPES,
|
||||
SoundEvents.MUSIC_NETHER_SOUL_SAND_VALLEY,
|
||||
SoundEvents.MUSIC_OVERWORLD_STONY_PEAKS,
|
||||
SoundEvents.MUSIC_NETHER_WARPED_FOREST,
|
||||
SoundEvents.MUSIC_UNDER_WATER,
|
||||
|
||||
|
@ -90,9 +76,9 @@ public class RandomSoundPlayer {
|
|||
private static SoundEvent getRandomSound(Random random) {
|
||||
SoundEvent event;
|
||||
|
||||
Registry<SoundEvent> registry = Registry.SOUND_EVENT;
|
||||
int size = registry.getEntries().size();
|
||||
do {
|
||||
Registry<SoundEvent> registry = Registry.SOUND_EVENT;
|
||||
int size = registry.size();
|
||||
int rand = random.nextInt(size);
|
||||
event = registry.get(rand);
|
||||
} while (Arrays.asList(soundBlocklist).contains(event));
|
||||
|
|
|
@ -4,11 +4,14 @@ import net.minecraft.client.MinecraftClient;
|
|||
import net.minecraft.client.render.GameRenderer;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class ShaderControls {
|
||||
private static final GameRenderer renderer = MinecraftClient.getInstance().gameRenderer;
|
||||
private static final Random RANDOM = new Random();
|
||||
|
||||
public static void setRandomShader() {
|
||||
Identifier shader = GameRenderer.SHADERS_LOCATIONS[renderer.random.nextInt(GameRenderer.SHADER_COUNT)];
|
||||
Identifier shader = GameRenderer.SHADERS_LOCATIONS[RANDOM.nextInt(GameRenderer.SHADER_COUNT)];
|
||||
Mod.LOGGER.info("Loading shader " + shader.getPath());
|
||||
renderer.loadShader(shader);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package zone.oat.supersecretrevival.mixin;
|
||||
|
||||
import net.minecraft.client.gui.widget.ClickableWidget;
|
||||
import net.minecraft.client.gui.widget.AbstractButtonWidget;
|
||||
import net.minecraft.client.sound.SoundManager;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
|
|||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import zone.oat.supersecretrevival.Mod;
|
||||
|
||||
@Mixin(ClickableWidget.class)
|
||||
@Mixin(AbstractButtonWidget.class)
|
||||
public class CancelClickSoundMixin {
|
||||
@Shadow private Text message;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package zone.oat.supersecretrevival.mixin;
|
||||
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.option.OptionsScreen;
|
||||
import net.minecraft.client.gui.screen.options.OptionsScreen;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
@ -28,6 +28,6 @@ public class SecretSettingsButtonMixin extends Screen {
|
|||
Mod.triggerSuperSecretSettings();
|
||||
}
|
||||
);
|
||||
this.addDrawableChild(b);
|
||||
this.addButton(b);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,6 +30,6 @@
|
|||
"depends": {
|
||||
"fabricloader": ">=0.14.10",
|
||||
"fabric": "*",
|
||||
"minecraft": ["1.19", "1.19.1", "1.19.2"]
|
||||
"minecraft": ["1.16", "1.16.1", "1.16.2", "1.16.3", "1.16.4"]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,6 @@ 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:Lnet/minecraft/util/math/random/Random;
|
||||
accessible field net/minecraft/client/render/GameRenderer random Lnet/minecraft/util/math/random/Random;
|
||||
accessible field net/minecraft/client/render/GameRenderer random Ljava/util/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
|
Loading…
Reference in New Issue