fix some more lang stuff

Author: realRobotix

.editorconfig

@@ -2,7 +2,7 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = space
 indent_size = 4
 continuation_indent_size = 4
 end_of_line = lf
@@ -13,7 +13,6 @@ max_line_length = 120
 quote_type = double
 
 [*.json]
-indent_style = space
 indent_size = 2
 
 [*.java]
@@ -22,5 +21,5 @@ ij_java_class_count_to_use_import_on_demand = 99
 ij_java_names_count_to_use_import_on_demand = 99
 ij_java_imports_layout = $*, |, java.**, |, javax.**, |, org.**, |, com.**, |, *
 
-[{*.fsh,*.vsh}]
-indent_style = space
+[.github/workflows/*.yml]
+indent_size = 2

buildSrc/src/main/kotlin/build-extensions.kt

@@ -9,8 +9,8 @@ val Project.mod: ModData get() = ModData(this)
 fun Project.prop(key: String): String? = findProperty(key)?.toString()
 fun String.upperCaseFirst() = replaceFirstChar { if (it.isLowerCase()) it.uppercaseChar() else it }
 
-fun RepositoryHandler.strictMaven(url: String, alias: String, vararg groups: String) = exclusiveContent {
-    forRepository { maven(url) { name = alias } }
+fun RepositoryHandler.strictMaven(url: String, vararg groups: String) = exclusiveContent {
+    forRepository { maven(url) }
     filter { groups.forEach(::includeGroup) }
 }
 

fabric/build.gradle.kts

@@ -79,7 +79,6 @@ loom {
 }
 
 repositories {
-	maven("https://api.modrinth.com/maven") // LazyDFU
 	maven("https://maven.terraformersmc.com/releases/") // Mod Menu
 	maven("https://mvn.devos.one/snapshots/") // Create Fabric, Forge Tags, Milk Lib, Registrate Fabric
 	maven("https://mvn.devos.one/releases/") // Porting Lib Releases

src/main/java/rbasamoyai/createbigcannons/crafting/welding/CannonWelderSelectionHandler.java

@@ -128,7 +128,7 @@ public boolean onMouseInput() {
 		if (mc.hitResult instanceof BlockHitResult bhr) {
 			BlockState blockState = level.getBlockState(this.hoveredPos);
 			if (!(blockState.getBlock() instanceof WeldableBlock wblock) || !wblock.isWeldable(blockState)) {
-				CreateLang.builder				(CreateBigCannons.MOD_ID).translate("cannon_welder.invalid_weld").color(FAIL).sendStatus(player);
+				CreateLang.builder(CreateBigCannons.MOD_ID).translate("cannon_welder.invalid_weld").color(FAIL).sendStatus(player);
 				return false;
 			}
 			face = bhr.getDirection();

src/main/java/rbasamoyai/createbigcannons/munitions/autocannon/ammo_container/AutocannonAmmoContainerScreen.java

@@ -92,8 +92,7 @@ protected void renderBg(GuiGraphics graphics, float partialTick, int mouseX, int
 	protected void renderTooltip(GuiGraphics graphics, int x, int y) {
 		super.renderTooltip(graphics, x, y);
 		if (this.hoveredSlot != null && this.hoveredSlot.index == 1 && !this.hoveredSlot.hasItem()) {
-			graphics.renderTooltip(this.font, CreateLang.
-			(CreateBigCannons.MOD_ID).translate("gui.autocannon_ammo_container.tracer_slot").component(), x, y);
+			graphics.renderTooltip(this.font, CreateLang.builder(CreateBigCannons.MOD_ID).translate("gui.autocannon_ammo_container.tracer_slot").component(), x, y);
 		}
 	}
 
@@ -131,8 +130,7 @@ protected ScrollInput getScrollInput() {
 			.withRange(1, 7)
 			.calling(state -> {
 				this.lastUpdated = 0;
-				this.setValue.titled(CreateLang.
-				(CreateBigCannons.MOD_ID).translate("gui.autocannon_ammo_container.tracer_spacing", state).component());
+				this.setValue.titled(CreateLang.builder(CreateBigCannons.MOD_ID).translate("gui.autocannon_ammo_container.tracer_spacing", state).component());
 			})
 			.setState(Mth.clamp(this.menu.getValue(), 1, 6));
 	}

src/main/java/rbasamoyai/createbigcannons/munitions/fuzes/DelayedImpactFuzeScreen.java

@@ -27,8 +27,7 @@ protected ScrollInput getScrollInput() {
 				int time = state + 1;
 				int seconds = time / 20;
 				int ticks = time - seconds * 20;
-				this.setValue.titled(CreateLang.
-				(CreateBigCannons.MOD_ID).translate("gui.set_timed_fuze.time", seconds, ticks).component());
+				this.setValue.titled(CreateLang.builder(CreateBigCannons.MOD_ID).translate("gui.set_timed_fuze.time", seconds, ticks).component());
 			})
 			.setState(Mth.clamp(this.menu.getValue() - 1, 0, 100));
 	}

src/main/java/rbasamoyai/createbigcannons/munitions/fuzes/ProximityFuzeScreen.java

@@ -24,8 +24,7 @@ protected ScrollInput getScrollInput() {
 			.withRange(1, 33)
 			.calling(state -> {
 				this.lastUpdated = 0;
-				this.setValue.titled(CreateLang.
-				(CreateBigCannons.MOD_ID).translate("gui.set_proximity_fuze.distance", state).component());
+				this.setValue.titled(CreateLang.builder(CreateBigCannons.MOD_ID).translate("gui.set_proximity_fuze.distance", state).component());
 			})
 			.setState(Mth.clamp(this.menu.getValue(), 1, 33));
 	}

src/main/java/rbasamoyai/createbigcannons/munitions/fuzes/TimedFuzeScreen.java

@@ -27,8 +27,7 @@ protected ScrollInput getScrollInput() {
 				int time = Math.max(1, state * 5);
 				int seconds = time / 20;
 				int ticks = time - seconds * 20;
-				this.setValue.titled(CreateLang.
-				(CreateBigCannons.MOD_ID).translate("gui.set_timed_fuze.time", seconds, ticks).component());
+				this.setValue.titled(CreateLang.builder(CreateBigCannons.MOD_ID).translate("gui.set_timed_fuze.time", seconds, ticks).component());
 			})
 			.setState(Mth.clamp(this.menu.getValue() / 5, 0, 100));
 	}

stonecutter.gradle.kts

@@ -9,12 +9,6 @@ plugins {
 }
 stonecutter active "1.20.1" /* [SC] DO NOT EDIT */
 
-//todo: not sure if we even need this
-stonecutter.parameters {
-	val loader = metadata.project.substringAfterLast("-")
-	consts(loader, "fabric", "forge", "neoforge")
-}
-
 stonecutter registerChiseled tasks.register("chiseledBuild", stonecutter.chiseled) {
 	group = "project"
 	ofTask("buildAndCollect")
@@ -60,37 +54,17 @@ subprojects {
 	repositories {
 		mavenCentral()
 		// mappings
-		maven("https://maven.parchmentmc.org")
-		maven("https://maven.quiltmc.org/repository/release")
+		strictMaven("https://maven.parchmentmc.org", "org.parchmentmc.data")
+		strictMaven("https://maven.quiltmc.org/repository/release", "org.quiltmc")
 		// our repo
-		maven("https://maven.realrobotix.me/master/")
+		strictMaven("https://maven.realrobotix.me/master/", "com.rbasamoyai", "com.copycatsplus")
 
 		//maven("https://maven.shedaniel.me/")
 		maven("https://maven.blamejared.com/")
 		maven("https://maven.tterrag.com/")
 		maven("https://maven.createmod.net/")
-		exclusiveContent {
-			forRepository {
-				maven {
-					name = "Modrinth"
-					url = uri("https://api.modrinth.com/maven")
-				}
-			}
-			filter {
-				includeGroup("maven.modrinth")
-			}
-		}
-		exclusiveContent {
-			forRepository {
-				maven {
-					name = "CurseMaven"
-					url = uri("https://cursemaven.com")
-				}
-			}
-			filter {
-				includeGroup("curse.maven")
-			}
-		}
+		strictMaven("https://api.modrinth.com/maven", "maven.modrinth")
+		strictMaven("https://cursemaven.com", "curse.maven")
 		flatDir{
 			dir("libs")
 		}