disable powers (for now); if this works we build

Author: diamonddevv

src/main/java/net/diamonddev/simpletrims/common/SimpleTrims.java

@@ -1,11 +1,13 @@
 package net.diamonddev.simpletrims.common;
 
-import net.diamonddev.simpletrims.common.command.CmdInit;
 import net.diamonddev.simpletrims.common.data.SimpleTrimsDataLoader;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.gamerule.v1.GameRuleFactory;
+import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
+import net.minecraft.world.GameRules;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,23 +27,27 @@ public class SimpleTrims implements ModInitializer {
 			"don't try to send textures over packets worst mistake of my life",
 			"this solves a very specific problem no one probably ever had",
 			"what the hell is an encoded palette",
-			"niinku viulunkieli ?!",
+			"niinku viulunkieli !?",
 			"now with apoli!",
 			"trims but simpler",
 			"simple the trim",
 			"you're welcome, i fixed the extra space",
-			//"try /trim!",
 			"also try terraria!",
 			"so i added some more of these",
 			"try adding an emissive trim!",
-			"@diamonddevv (discord, twitter) was here"
+			"@diamonddevv (discord, twitter) was here",
+			"i paid for the whole two megabytes im gonna use the whole two megabytes",
+			"can we go much higher (yes, we can)"
 	};
 
+	public GameRules.Key<GameRules.BooleanRule> SHOULD_PROVIDE_TRIM_POWERS;
 
 	@Override
 	public void onInitialize() {
 		ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(TRIM_DATA);
-		// CmdInit.register(); // todo: fix ig lol
+
+		SHOULD_PROVIDE_TRIM_POWERS = // gamerule
+				GameRuleRegistry.register("shouldSimpleTrimsProvideApoliPowers", GameRules.Category.PLAYER, GameRuleFactory.createBooleanRule(true));
 
 		LOGGER.info("{} (initialized simpletrims)", getGoofyMessage());
 	}

src/main/java/net/diamonddev/simpletrims/common/command/ArmorTrimMaterialArgument.java

@@ -27,7 +27,7 @@ public class SimpleTrimsDataLoader implements SimpleSynchronousResourceReloadLis
 
     private static final String MATERIAL_PALETTE_FILEPATH = "encodable_palettes";
     private static final String MATERIAL_FILEPATH = "simple_trim_material";
-    private static final String PATTERN_FILEPATH = "simple_trim_patten";
+    private static final String PATTERN_FILEPATH = "simple_trim_pattern";
 
     static class MaterialKeys {
         static final String
@@ -56,7 +56,7 @@ public static class LangBean {
             @SerializedName(KEY_TRANSLATIONS_STRING)
             public String translation;
         }
-        public static class DesciptionBean {
+        public static class DescriptionBean {
             @SerializedName(KEY_DESC_COLOR)
             public String matColorHexcode;
 
@@ -81,7 +81,7 @@ public static class PropsBean {
         public String assetName = null;
 
         @SerializedName(KEY_DESC)
-        public DesciptionBean desc;
+        public DescriptionBean desc;
 
         @SerializedName(KEY_PROPERTIES)
         public PropsBean properties = null;
@@ -161,6 +161,10 @@ public boolean shouldBeEmissive() {
         public String getPower() {
             return bean.properties.apoliPower;
         }
+
+        public boolean usingEncodedPalette() {
+            return bean.encodedPalette;
+        }
     }
 
     public static ArrayList<MaterialBeanWrapper> SIMPLE_TRIM_MATERIALS = new ArrayList<>();

src/main/java/net/diamonddev/simpletrims/common/command/ArmorTrimPatternArgument.java

@@ -56,8 +56,8 @@ public static void updateSpecificTrimPowerApplication(LivingEntity livingEntity,
         if (stack.getOrCreateNbt().contains(ArmorTrim.NBT_KEY)) {
             NbtCompound trim = stack.getSubNbt(ArmorTrim.NBT_KEY);
             if (trim != null) {
-                if (trim.contains("Material")) {
-                    Identifier material = new Identifier(trim.getString("Material"));
+                if (trim.contains("material")) {
+                    Identifier material = new Identifier(trim.getString("material"));
 
                     String powerId = null;
                     if (MEMOIZED_POWERS.containsKey(material)) {
@@ -66,7 +66,9 @@ public static void updateSpecificTrimPowerApplication(LivingEntity livingEntity,
                         var mbw = SimpleTrimsDataLoader.lookupWrapper(material);
                         if (mbw != null) {
                             powerId = mbw.getPower();
+                            MEMOIZED_POWERS.put(material, powerId); // memoize
                         }
+
                     }
 
                     if (powerId != null) {

src/main/java/net/diamonddev/simpletrims/common/command/CmdInit.java

@@ -18,6 +18,6 @@ public LivingEntityMixin(EntityType<?> type, World world) {
 
     @Inject(method = "tick", at = @At("HEAD"))
     private void simpletrims$applyTrimPowers(CallbackInfo ci) {
-        TrimApoliPowerUtil.updateAllTrimPowerApplications((LivingEntity)(Object)this);
+        //TrimApoliPowerUtil.updateAllTrimPowerApplications((LivingEntity)(Object)this); //todo
     }
 }

src/main/java/net/diamonddev/simpletrims/common/command/TrimCommand.java

@@ -27,6 +27,8 @@ public class PlayerManagerMixin {
     @Inject(method = "onPlayerConnect", at = @At("TAIL"))
     private void simpletrims$onPlayerConnectToServer(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) {
         String playername = player.getGameProfile().getName();
+        boolean shouldQuietReload = false;
+
 
         // Asset Names to Palette Paths
         HashMap<String, String> assetsToPaths = new HashMap<>();
@@ -47,6 +49,12 @@ public class PlayerManagerMixin {
         HashMap<Identifier, HashMap<String, String>> translations = new HashMap<>();
         int translationCount = 0, materialCount = 0;
         for (var bean : SimpleTrimsDataLoader.SIMPLE_TRIM_MATERIALS) {
+            if (!shouldQuietReload) {
+                if (bean.usingEncodedPalette()) {
+                    shouldQuietReload = true;
+                }
+            }
+
             if (bean.usingTranslationMap()) {
                 var hash = bean.getTranslationHashmap();
                 var id = new Identifier(bean.getNamespace(), bean.getAssetName());
@@ -59,8 +67,10 @@ public class PlayerManagerMixin {
         ServerPlayNetworking.send(player, SendTranslations.SEND_TRANSLATIONS, SendTranslations.write(translations));
 
         // Quiet Reload Request
-        SimpleTrims.LOGGER.info("Telling user {}'s client to quietly reload..", playername);
-        ServerPlayNetworking.send(player, SendQuietReload.SEND_QUIET_RELOAD, PacketByteBufs.empty());
+        if (shouldQuietReload) {
+            SimpleTrims.LOGGER.info("Telling user {}'s client to quietly reload..", playername);
+            ServerPlayNetworking.send(player, SendQuietReload.SEND_QUIET_RELOAD, PacketByteBufs.empty());
+        }
 
 
         // finish