Mixins clean up

legacy-fabric-command-api-v2/1.12.2/src/main/resources/fabric.mod.json

@@ -28,9 +28,7 @@
     ]
   },
   "description": "Powerful Command API that uses SpongeAPI's command api",
-  "mixins": [
-    "legacy-fabric-sponge-command-api-v2.mixins.json"
-  ],
+  "mixins": [],
   "custom": {
     "modmenu": {
       "badges": [ "library" ],

legacy-fabric-command-api-v2/1.7.10/src/main/resources/fabric.mod.json

@@ -28,9 +28,7 @@
     ]
   },
   "description": "Powerful Command API that uses SpongeAPI's command api",
-  "mixins": [
-    "legacy-fabric-sponge-command-api-v2.mixins.json"
-  ],
+  "mixins": [],
   "custom": {
     "modmenu": {
       "badges": [ "library" ],

legacy-fabric-command-api-v2/1.8.9/src/main/resources/fabric.mod.json

@@ -28,9 +28,7 @@
     ]
   },
   "description": "Powerful Command API that uses SpongeAPI's command api",
-  "mixins": [
-    "legacy-fabric-sponge-command-api-v2.mixins.json"
-  ],
+  "mixins": [],
   "custom": {
     "modmenu": {
       "badges": [ "library" ],

legacy-fabric-command-api-v2/common/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/args/CommandElement.java

@@ -27,8 +27,6 @@
 
 import java.util.List;
 
-import net.legacyfabric.fabric.impl.command.CrossCompatibleText;
-
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.server.MinecraftServer;
@@ -134,7 +132,7 @@ public void parse(PermissibleCommandSource source, CommandArgs args, CommandCont
 	 * @return The formatted usage
 	 */
 	public Text getUsage(PermissibleCommandSource src) {
-		return this.getKey() == null ? new LiteralText("") : new LiteralText("<" + ((CrossCompatibleText) this.getKey()).asSanitizedString() + ">");
+		return this.getKey() == null ? new LiteralText("") : new LiteralText("<" + this.getKey().asUnformattedString() + ">");
 	}
 
 	public MinecraftServer getServer() {

legacy-fabric-command-api-v2/common/src/main/java/net/legacyfabric/fabric/impl/command/GuavaUtils.java

@@ -1,10 +1,27 @@
+/*
+ * Copyright (c) 2020 - 2024 Legacy Fabric
+ * Copyright (c) 2016 - 2022 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.legacyfabric.fabric.impl.command;
 
+import java.util.Arrays;
+
 import com.google.common.base.Preconditions;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-
 /**
  * Guava's ToStringHelper class which isn't located at the same place depending on guava versions.
  * This ensures it is available in all targeted versions.
@@ -35,78 +52,63 @@ private ToStringHelper(String className) {
 			this.className = (String) Preconditions.checkNotNull(className);
 		}
 
-
 		public ToStringHelper omitNullValues() {
 			this.omitNullValues = true;
 			return this;
 		}
 
-
 		public ToStringHelper add(String name, @Nullable Object value) {
 			return this.addHolder(name, value);
 		}
 
-
 		public ToStringHelper add(String name, boolean value) {
 			return this.addHolder(name, String.valueOf(value));
 		}
 
-
 		public ToStringHelper add(String name, char value) {
 			return this.addHolder(name, String.valueOf(value));
 		}
 
-
 		public ToStringHelper add(String name, double value) {
 			return this.addHolder(name, String.valueOf(value));
 		}
 
-
 		public ToStringHelper add(String name, float value) {
 			return this.addHolder(name, String.valueOf(value));
 		}
 
-
 		public ToStringHelper add(String name, int value) {
 			return this.addHolder(name, String.valueOf(value));
 		}
 
-
 		public ToStringHelper add(String name, long value) {
 			return this.addHolder(name, String.valueOf(value));
 		}
 
-
 		public ToStringHelper addValue(@Nullable Object value) {
 			return this.addHolder(value);
 		}
 
-
 		public ToStringHelper addValue(boolean value) {
 			return this.addHolder(String.valueOf(value));
 		}
 
-
 		public ToStringHelper addValue(char value) {
 			return this.addHolder(String.valueOf(value));
 		}
 
-
 		public ToStringHelper addValue(double value) {
 			return this.addHolder(String.valueOf(value));
 		}
 
-
 		public ToStringHelper addValue(float value) {
 			return this.addHolder(String.valueOf(value));
 		}
 
-
 		public ToStringHelper addValue(int value) {
 			return this.addHolder(String.valueOf(value));
 		}
 
-
 		public ToStringHelper addValue(long value) {
 			return this.addHolder(String.valueOf(value));
 		}
@@ -118,9 +120,11 @@ public String toString() {
 
 			for (ValueHolder valueHolder = this.holderHead.next; valueHolder != null; valueHolder = valueHolder.next) {
 				Object value = valueHolder.value;
+
 				if (!omitNullValuesSnapshot || value != null) {
 					builder.append(nextSeparator);
 					nextSeparator = ", ";
+
 					if (valueHolder.name != null) {
 						builder.append(valueHolder.name).append('=');
 					}

legacy-fabric-command-api-v2/common/src/main/resources/fabric.mod.json

@@ -22,9 +22,7 @@
   "entrypoints": {
   },
   "description": "Powerful Command API that uses SpongeAPI's command api",
-  "mixins": [
-    "legacy-fabric-sponge-command-api-v2-common.mixins.json"
-  ],
+  "mixins": [],
   "custom": {
     "modmenu": {
       "badges": [ "library" ],

legacy-fabric-command-api-v2/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/command/MinecraftServerMixin.java → legacy-fabric-permissions-api-v1/common/src/main/java/net/legacyfabric/fabric/mixin/permission/MinecraftServerMixin.java

@@ -15,20 +15,16 @@
  * limitations under the License.
  */
 
-package net.legacyfabric.fabric.mixin.command;
+package net.legacyfabric.fabric.mixin.permission;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.server.MinecraftServer;
 
 import net.legacyfabric.fabric.api.permission.v1.PermissibleCommandSource;
 
 @Mixin(MinecraftServer.class)
 public abstract class MinecraftServerMixin implements PermissibleCommandSource {
-	@Shadow
-	public abstract boolean isDedicated();
-
 	@Override
 	public boolean hasPermission(String perm) {
 		return true;

legacy-fabric-permissions-api-v1/common/src/main/resources/legacy-fabric-permissions-api-v1-common.mixins.json

@@ -5,6 +5,7 @@
   "mixins": [
     "ConsoleMixin",
     "EntityMixin",
+    "MinecraftServerMixin",
     "ServerPlayerEntityMixin"
   ],
   "injectors": {