Finished and Config

Author: carson-coder

.gitignore

@@ -38,3 +38,5 @@ hs_err_*.log
 replay_*.log
 *.hprof
 *.jfr
+
+.history/

build.gradle

@@ -18,10 +18,10 @@ repositories {
 	// for more information about repositories.
 	maven { url = "https://maven.enjarai.nl/mirrors" }
     maven { url = "https://maven.enjarai.nl/releases" }
-	maven {
-        name 'Xander Maven'
-        url 'https://maven.isxander.dev/releases'
-    }
+	maven { url 'https://maven.isxander.dev/releases' }
+    maven { url = "https://maven.quiltmc.org/repository/release/" }
+    maven { url "https://maven.terraformersmc.com/releases" }
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
 }
 
 loom {
@@ -54,6 +54,7 @@ dependencies {
     }
 
 	modImplementation 'dev.isxander.yacl:yet-another-config-lib-fabric:3.1.0+1.20'
+    modApi "com.terraformersmc:modmenu:7.1.0"
 }
 
 processResources {

src/client/java/com/carsoncoder/gpws/gpwsConfig.java

@@ -1,37 +1,49 @@
 package com.carsoncoder.gpws;
 
-import dev.isxander.yacl.api.ConfigCategory;
-import dev.isxander.yacl.api.Option;
-import dev.isxander.yacl.api.OptionGroup;
-import dev.isxander.yacl.api.YetAnotherConfigLib;
-import dev.isxander.yacl.gui.controllers.TickBoxController;
+import dev.isxander.yacl3.api.ConfigCategory;
+import dev.isxander.yacl3.api.Option;
+import dev.isxander.yacl3.api.OptionDescription;
+import dev.isxander.yacl3.api.OptionGroup;
+import dev.isxander.yacl3.api.YetAnotherConfigLib;
+import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
 
 public class gpwsConfig {
     int PullUpRange = 50;
     int BankAngleAngle = -50;
-    int Volume = 100;
+    float Volume = 1.0f;
     int SoundDelay = 30;
 
     boolean test = false;
 
-    public gpwsConfig() {
+    public static Screen create(Screen screen) {
+        gpwsElytraClient.LOGGER.info("Building Config");
         YetAnotherConfigLib thing = YetAnotherConfigLib.createBuilder()
         .title(Text.literal("Used for narration. Could be used to render a title in the future."))
         .category(ConfigCategory.createBuilder()
-                .name(Text.literal("Name of the category"))
-                .tooltip(Text.literal("This text will appear as a tooltip when you hover or focus the button with Tab. There is no need to add \n to wrap as YACL will do it for you."))
+                .name(Text.literal("Settings"))
+                .tooltip(Text.literal("The main settings for elytra GPWS"))
                 .group(OptionGroup.createBuilder()
-                        .name(Text.literal("Name of the group"))
-                        .tooltip(Text.literal("This text will appear when you hover over the name or focus on the collapse button with Tab."))
-                        .option(Option.createBuilder(boolean.class)
-                                .name(Text.literal("Boolean Option"))
-                                .tooltip(Text.literal("This text will appear as a tooltip when you hover over the option."))
-                                .binding(true, () -> this.test, newVal -> this.test = newVal)
-                                .controller(TickBoxController::new)
+                        .name(Text.literal("Sounds"))
+                        .option(Option.createBuilder(int.class)
+                                .name(Text.literal("Volume"))
+                                .description(OptionDescription.createBuilder()
+                                    .text(Text.literal("The volume of sounds"))
+                                    .build())
+                                .binding(50, () -> {return Math.round(gpwsElytraClient.CONFIG.Volume*100);}, newVal -> gpwsElytraClient.CONFIG.Volume = newVal/100)
+                                .controller(opt -> IntegerSliderControllerBuilder.create(opt)
+                                    .range(0, 100)
+                                    .step(1)
+                                    .valueFormatter(val -> Text.literal(val + "%"))    
+                                )
                                 .build())
                         .build())
                 .build())
         .build();
+
+        return thing.generateScreen(screen);
+
+        //MinecraftClient.getInstance().setScreen(thing.generateScreen(MinecraftClient.getInstance().currentScreen));
     }
 }  

src/client/java/com/carsoncoder/gpws/gpwsElytraClient.java

@@ -18,7 +18,7 @@
 import nl.enjarai.cicada.api.util.ProperLogger;
 
 public class gpwsElytraClient implements ClientModInitializer, CicadaEntrypoint  {
-	public static gpwsConfig config = new gpwsConfig();
+	public static gpwsConfig CONFIG = new gpwsConfig();
     public static final Logger LOGGER = ProperLogger.getLogger("gpws-elytra");
 	public static gpwsElytraClient instance;
 	public static final gpwsSounds SOUNDS_MANAGER = new gpwsSounds();
@@ -30,7 +30,7 @@ public void onInitializeClient() {
 		instance = this;
 		SOUNDS_MANAGER.init();
 		HudRenderCallback.EVENT.register(new gpwsHud(this));
-	}
+    }
 
 	@Override
     public void registerConversations(ConversationManager conversationManager) {
@@ -86,7 +86,7 @@ private boolean PullUp(float delta) {
 	}
 
 	private String StateLogic(float delta) {
-		int StallAngle = config.BankAngleAngle;
+		int StallAngle = CONFIG.BankAngleAngle;
 
 		Entity cam = MinecraftClient.getInstance().getCameraEntity();
 		BlockPos pos = MinecraftClient.getInstance().player.getBlockPos();
@@ -97,7 +97,7 @@ private String StateLogic(float delta) {
 		double DownVel = MinecraftClient.getInstance().player.getVelocity().y;
 		float Pitch = cam.getPitch();
 
-		LOGGER.info(String.valueOf(heightmap.get(Math.max(Math.min(pos.getX() - chunk.getPos().getStartX(), 15), 0), Math.max(Math.min(pos.getX() - chunk.getPos().getStartZ(), 15), 0))));
+		// LOGGER.info(String.valueOf(heightmap.get(Math.max(Math.min(pos.getX() - chunk.getPos().getStartX(), 15), 0), Math.max(Math.min(pos.getX() - chunk.getPos().getStartZ(), 15), 0))));
 
 		if (Pitch < StallAngle) {
 			return "Bank Angle";

src/client/java/com/carsoncoder/gpws/gpwsModScreen.java

@@ -0,0 +1,11 @@
+package com.carsoncoder.gpws;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+
+public class gpwsModScreen implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return gpwsConfig::create;
+    }
+}

src/client/java/com/carsoncoder/gpws/gpwsRaycast.java

@@ -41,7 +41,7 @@ public static HitResult raycastInDirection(MinecraftClient client, float tickDel
             return null;
         }
 
-        double reachDistance = gpwsElytraClient.config.PullUpRange; //Change this to extend the reach
+        double reachDistance = gpwsElytraClient.CONFIG.PullUpRange; //Change this to extend the reach
         HitResult target = raycast(entity, reachDistance, tickDelta, false, direction);
         boolean tooFar = false;
         double extendedReach = reachDistance;

src/client/java/com/carsoncoder/gpws/gpwsSounds.java

@@ -50,6 +50,29 @@ void init() {
         }
     }
 
+    public void PlaySound(SoundEvent sound) {
+        MinecraftClient.getInstance().getSoundManager().play(new EntityTrackingSoundInstance(
+            sound,
+            SoundCategory.VOICE,
+            gpwsElytraClient.CONFIG.Volume,
+            1f,
+            MinecraftClient.getInstance().player,
+            Random.create().nextLong()));
+        // if (MinecraftClient.getInstance().player == null) {return;}
+        //     MinecraftClient.getInstance().world.playSound(
+        //     MinecraftClient.getInstance().player, // Player - if non-null, will play sound for every nearby player *except* the specified player
+        //     MinecraftClient.getInstance().player.getBlockPos(), // The position of where the sound will come from
+        //     SoundEvents.BLOCK_FENCE_GATE_OPEN, // The sound that will play
+        //     SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound
+        //     1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc
+        //     1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc
+		// );
+    }
+
+    public void PlaySound(gpwsSounds.SOUNDS sound) {
+        PlaySound(GetSound(sound));
+    }
+
     public SoundEvent GetSound(SOUNDS sound) {
         return SoundsDict.get(sound);
     }

src/main/resources/fabric.mod.json

@@ -20,7 +20,10 @@
 		],
 		"client": [
 			"com.carsoncoder.gpws.gpwsElytraClient"
-		]
+		],
+        "modmenu": [
+            "com.carsoncoder.gpws.gpwsModScreen"
+        ]
 	},
 	"mixins": [
 		"gpws-elytra.mixins.json",