Final changes before BDGR 1.0.3

Up-Mods · Mar 24, 2023 · 814b67f · 814b67f
1 parent a3b803b
commit 814b67f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 25 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
 minecraft = "1.19.4"
 quilt_mappings = "1.19.4+build.5"
-quilt_loader = "0.18.5"
+quilt_loader = "0.18.6"
 
 quilted_fabric_api = "6.0.0-beta.2+0.76.0-1.19.4"
 mod_menu = "6.1.0-rc.4"
@@ -15,8 +15,5 @@ quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loade
 quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" }
 mod_menu = { module = "com.terraformersmc:modmenu", version.ref = "mod_menu" }
 
-# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
-[bundles]
-
 [plugins]
 quilt_loom = { id = "org.quiltmc.loom", version = "1.1.+" }
diff --git a/...in/java/io/github/ennuil/boring_default_game_rules/screen/EditDefaultGameRulesScreen.java b/...in/java/io/github/ennuil/boring_default_game_rules/screen/EditDefaultGameRulesScreen.java
@@ -20,7 +20,7 @@
 public class EditDefaultGameRulesScreen extends EditGameRulesScreen {
 	public EditDefaultGameRulesScreen(GameRules gameRules, Consumer<Optional<GameRules>> consumer) {
 		super(gameRules, consumer);
-		// You can't stop destiny, `final` keyword
+		// You can't stop destiny, `final` keyword!
 		((ScreenAccessor) this).setTitle(Text.translatable("boring_default_game_rules.edit_default_game_rules.title"));
 	}
 
@@ -36,20 +36,19 @@ public class ResetButtonWidget extends EditGameRulesScreen.AbstractRuleWidget {
 		private final List<ClickableWidget> widgets = new ArrayList<>();
 
 		public ResetButtonWidget() {
-			super(List.of(
-				Text.translatable("boring_default_game_rules.edit_default_game_rules.reset_to_default.tooltip").asOrderedText()
-			));
-			this.resetButton = ButtonWidget.builder(Text.translatable("boring_default_game_rules.edit_default_game_rules.reset_to_default"), button -> {
-				double scrollAmount = ((EditGameRulesScreenAccessor) EditDefaultGameRulesScreen.this).getRuleListWidget().getScrollAmount();
-				ModConfigManager.resetDefaults();
-				((EditGameRulesScreenAccessor) EditDefaultGameRulesScreen.this).setGameRules(new GameRules());
-				EditDefaultGameRulesScreen.this.clearChildren();
-				EditDefaultGameRulesScreen.this.init();
-				((EditGameRulesScreenAccessor) EditDefaultGameRulesScreen.this).getRuleListWidget().setScrollAmount(scrollAmount);
-			})
-				.position(10, 5)
-				.size(150, 20)
-				.build();
+			super(List.of(Text.translatable("boring_default_game_rules.edit_default_game_rules.reset_defaults.tooltip").asOrderedText()));
+			this.resetButton = ButtonWidget.builder(
+				Text.translatable("boring_default_game_rules.edit_default_game_rules.reset_defaults"),
+				button -> {
+					double scrollAmount = ((EditGameRulesScreenAccessor) EditDefaultGameRulesScreen.this).getRuleListWidget().getScrollAmount();
+					ModConfigManager.resetDefaults();
+					((EditGameRulesScreenAccessor) EditDefaultGameRulesScreen.this).setGameRules(new GameRules());
+					EditDefaultGameRulesScreen.this.clearAndInit();
+					((EditGameRulesScreenAccessor) EditDefaultGameRulesScreen.this).getRuleListWidget().setScrollAmount(scrollAmount);
+				}
+			).position(10, 5)
+			.size(150, 20)
+			.build();
 			this.widgets.add(this.resetButton);
 		}
 

diff --git a/src/main/resources/assets/boring_default_game_rules/lang/en_us.json b/src/main/resources/assets/boring_default_game_rules/lang/en_us.json
@@ -1,8 +1,8 @@
 {
-  "boring_default_game_rules.game_rules.edit_default_game_rules": "Edit Default Game Rules",
+  "boring_default_game_rules.game_rules.edit_default_game_rules": "Edit Defaults",
   "boring_default_game_rules.game_rules.edit_default_game_rules.tooltip.1": "Allows for editing the default game rule values.",
   "boring_default_game_rules.game_rules.edit_default_game_rules.tooltip.2": "WARNING: This will discard your current settings!",
   "boring_default_game_rules.edit_default_game_rules.title": "Edit Default Game Rules",
-  "boring_default_game_rules.edit_default_game_rules.reset_to_default": "Reset to Default",
-  "boring_default_game_rules.edit_default_game_rules.reset_to_default.tooltip": "Resets the modified defaults to their original ones."
+  "boring_default_game_rules.edit_default_game_rules.reset_defaults": "Reset Defaults",
+  "boring_default_game_rules.edit_default_game_rules.reset_defaults.tooltip": "Resets the modified defaults to their original ones."
 }
diff --git a/src/main/resources/assets/boring_default_game_rules/lang/pt_br.json b/src/main/resources/assets/boring_default_game_rules/lang/pt_br.json
@@ -1,8 +1,8 @@
 {
-  "boring_default_game_rules.game_rules.edit_default_game_rules": "Editar os padrões",
+  "boring_default_game_rules.game_rules.edit_default_game_rules": "Editar padrões",
   "boring_default_game_rules.game_rules.edit_default_game_rules.tooltip.1": "Permite editar os valores padrão das regras do jogo.",
   "boring_default_game_rules.game_rules.edit_default_game_rules.tooltip.2": "AVISO: Isso irá descartar a sua configuração atual!",
   "boring_default_game_rules.edit_default_game_rules.title": "Editar padrões das regras de jogo",
-  "boring_default_game_rules.edit_default_game_rules.reset_to_default": "Redefinir para o padrão",
-  "boring_default_game_rules.edit_default_game_rules.reset_to_default.tooltip": "Redefine os padrões modificados para os seus valores originais."
+  "boring_default_game_rules.edit_default_game_rules.reset_defaults": "Redefinir padrões",
+  "boring_default_game_rules.edit_default_game_rules.reset_defaults.tooltip": "Redefine os padrões modificados para os seus valores originais."
 }