-dual handle and forge fixes and other fixes

Smartin-b · Smartin-b · commit 4da4b82bb7f9 · 2023-08-07T19:37:27.000+02:00
diff --git a/common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatDisplay.java b/common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatDisplay.java
@@ -60,6 +60,24 @@ public class StatDisplay extends InteractAbleWidget {
                 .setDefault(1)
                 .setFormat("##.#")
                 .setMax(5).build());
+        addStatDisplay(AttributeSingleDisplay
+                .Builder(AttributeRegistry.SHIELD_BREAK)
+                .setTranslationKey("shield_break")
+                .setDefault(0)
+                .setFormat("##.#")
+                .setMax(5).build());
+        addStatDisplay(AttributeSingleDisplay
+                .Builder(AttributeRegistry.REACH)
+                .setTranslationKey("reach")
+                .setDefault(0)
+                .setFormat("##.#")
+                .setMax(2).build());
+        addStatDisplay(AttributeSingleDisplay
+                .Builder(AttributeRegistry.ATTACK_RANGE)
+                .setTranslationKey("attack_range")
+                .setDefault(0)
+                .setFormat("##.#")
+                .setMax(2).build());
         addStatDisplay(MiningLevelStatDisplay
                 .Builder("pickaxe")
                 .setAttribute(AttributeRegistry.MINING_SPEED_PICKAXE).build());
diff --git a/common/src/main/java/smartin/miapi/datapack/ReloadListener.java b/common/src/main/java/smartin/miapi/datapack/ReloadListener.java
@@ -1,15 +1,19 @@
 package smartin.miapi.datapack;
 
+import dev.architectury.platform.Platform;
+import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.ResourceReloader;
 import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.profiler.Profiler;
 import smartin.miapi.Miapi;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -23,44 +27,48 @@ public CompletableFuture load(ResourceManager manager, Profiler profiler, Execut
         ReloadEvents.inReload = true;
         timeStart = System.nanoTime();
         ReloadEvents.START.fireEvent(false);
-        Map<String, String> data = new HashMap<>();
-        manager.streamResourcePacks().forEach(resourcePack -> {
-            ReloadEvents.syncedPaths.keySet().forEach(nameSpace -> {
-                resourcePack.findResources(ResourceType.SERVER_DATA, nameSpace, "", (identifier, inputSupplier) -> {
-                    if (ReloadEvents.syncedPaths.get(nameSpace).stream().anyMatch(path -> identifier.getPath().startsWith(path))) {
-                        try {
-                            BufferedReader reader = new BufferedReader(new InputStreamReader(inputSupplier.get(), StandardCharsets.UTF_8));
-                            String dataString = reader.lines().collect(Collectors.joining());
-                            String fullPath = identifier.getPath();
-                            data.put(fullPath, dataString);
-                        } catch (Exception e) {
-                            Miapi.LOGGER.warn("Error Loading Resource" + identifier);
-                        }
-                    }
-                });
-            });
-        });
-        /*
-        ReloadEvents.syncedPaths.forEach((modID, dataPaths) -> {
-            dataPaths.forEach(dataPath -> {
-                Map<Identifier, List<Resource>> map = manager.findAllResources(dataPath, (fileName) -> true);
-                map.forEach((identifier, resources) -> {
-                    if (identifier.getNamespace().equals(modID)) {
-                        resources.forEach(resource -> {
+        Map<String, String> data = new LinkedHashMap<>();
+
+        if(Platform.isFabric()){
+            //TODO:figure out why this does nto work on forge.
+            manager.streamResourcePacks().forEach(resourcePack -> {
+                ReloadEvents.syncedPaths.keySet().forEach(nameSpace -> {
+                    resourcePack.findResources(ResourceType.SERVER_DATA, nameSpace, "", (identifier, inputSupplier) -> {
+                        if (ReloadEvents.syncedPaths.get(nameSpace).stream().anyMatch(path -> identifier.getPath().startsWith(path))) {
                             try {
-                                BufferedReader reader = resource.getReader();
+                                BufferedReader reader = new BufferedReader(new InputStreamReader(inputSupplier.get(), StandardCharsets.UTF_8));
                                 String dataString = reader.lines().collect(Collectors.joining());
                                 String fullPath = identifier.getPath();
                                 data.put(fullPath, dataString);
                             } catch (Exception e) {
-                                Miapi.LOGGER.warn("Error Loading Resource" + identifier + " " + resources);
+                                Miapi.LOGGER.warn("Error Loading Resource" + identifier);
                             }
-                        });
-                    }
+                        }
+                    });
                 });
             });
-        });
-        */
+        }
+        else{
+            ReloadEvents.syncedPaths.forEach((modID, dataPaths) -> {
+                dataPaths.forEach(dataPath -> {
+                    Map<Identifier, List<Resource>> map = manager.findAllResources(dataPath, (fileName) -> true);
+                    map.forEach((identifier, resources) -> {
+                        if (identifier.getNamespace().equals(modID)) {
+                            resources.forEach(resource -> {
+                                try {
+                                    BufferedReader reader = resource.getReader();
+                                    String dataString = reader.lines().collect(Collectors.joining());
+                                    String fullPath = identifier.getPath();
+                                    data.put(fullPath, dataString);
+                                } catch (Exception e) {
+                                    Miapi.LOGGER.warn("Error Loading Resource" + identifier + " " + resources);
+                                }
+                            });
+                        }
+                    });
+                });
+            });
+        }
         return CompletableFuture.completedFuture(data);
     }
 
diff --git a/common/src/main/java/smartin/miapi/modules/properties/SlotProperty.java b/common/src/main/java/smartin/miapi/modules/properties/SlotProperty.java
@@ -46,6 +46,7 @@ public static Transform getTransform(ModuleSlot moduleSlot) {
         Transform mergedTransform = Transform.IDENTITY;
         while (current != null) {
             mergedTransform = Transform.merge(getLocalTransform(current), mergedTransform);
+            //mergedTransform = Transform.merge(mergedTransform,getLocalTransform(current));
             current = current.parent;
         }
         mergedTransform = Transform.merge(mergedTransform, moduleSlot.transform);
@@ -77,10 +78,11 @@ public static TransformMap getTransformStack(ModuleSlot moduleSlot) {
                 mergedTransform.set(stack.primary, mergedTransform.get(null));
                 mergedTransform.set(null, Transform.IDENTITY);
             }
-            mergedTransform = TransformMap.merge(mergedTransform,getLocalTransformStack(current));
+            //mergedTransform = TransformMap.merge(mergedTransform,getLocalTransformStack(current));
+            mergedTransform = TransformMap.merge(getLocalTransformStack(current),mergedTransform);
             current = current.parent;
         }
-        mergedTransform = TransformMap.merge(mergedTransform, moduleSlot.getTransformStack());
+        mergedTransform = TransformMap.merge(moduleSlot.getTransformStack(),mergedTransform);
         return mergedTransform;
     }
 
diff --git a/common/src/main/java/smartin/miapi/modules/properties/compat/BetterCombatProperty.java b/common/src/main/java/smartin/miapi/modules/properties/compat/BetterCombatProperty.java
@@ -37,6 +37,11 @@ public boolean load(String moduleKey, JsonElement data) throws Exception {
 
     @Override
     public JsonElement merge(JsonElement old, JsonElement toMerge, MergeType type) {
+        if (type == MergeType.SMART || type == MergeType.EXTEND) {
+            return toMerge;
+        } else if (type == MergeType.OVERWRITE) {
+            return old;
+        }
         return ModuleProperty.super.merge(old, toMerge, type);
     }
 }
diff --git a/common/src/main/java/smartin/miapi/modules/properties/render/GuiOffsetProperty.java b/common/src/main/java/smartin/miapi/modules/properties/render/GuiOffsetProperty.java
@@ -41,12 +41,14 @@ public GuiOffsetProperty() {
                 }
                 //guiOffsetJson.x -= (guiOffsetJson.sizeX/2);
                 //guiOffsetJson.y -= (guiOffsetJson.sizeY/2);
-                guiOffsetJson.x = guiOffsetJson.x / 16f;
-                guiOffsetJson.y = guiOffsetJson.y / 16f;
-                guiOffsetJson.sizeX = 1 - guiOffsetJson.sizeX / 16.0f;
-                guiOffsetJson.sizeY = 1 - guiOffsetJson.sizeY / 16.0f;
+                float baseSize = 16f;
+                guiOffsetJson.x = guiOffsetJson.x / baseSize;
+                guiOffsetJson.y = guiOffsetJson.y / baseSize;
+                guiOffsetJson.sizeX = (baseSize) / (baseSize + guiOffsetJson.sizeX);
+                guiOffsetJson.sizeY = (baseSize) / (baseSize + guiOffsetJson.sizeY);
+                float zScale = (guiOffsetJson.sizeX + guiOffsetJson.sizeY) / 2;
                 matrices.translate(guiOffsetJson.x, guiOffsetJson.y, 0);
-                matrices.scale(guiOffsetJson.sizeX, guiOffsetJson.sizeY, 1);
+                matrices.scale(guiOffsetJson.sizeX, guiOffsetJson.sizeY, zScale);
 
             }
             return matrices;
diff --git a/common/src/main/resources/assets/miapi/lang/en_us.json b/common/src/main/resources/assets/miapi/lang/en_us.json
@@ -57,14 +57,18 @@
     "miapi.stat.attack_speed.description": "Attacks per Second",
     "miapi.stat.back_stab": "Back Stab",
     "miapi.stat.back_stab.description": "Multiplier if the Attacker is behind the Victim",
-    "miapi.stat.back_stab": "Back Stab",
-    "miapi.stat.back_stab.description": "Multiplier if the Attacker is behind the Victim",
     "miapi.stat.flexibility": "Flexibility",
     "miapi.stat.flexibility.description": "The Modability of the Item\n Items with Flexibility below 0\n cant be crafted",
     "miapi.stat.healthPercent": "Vitality Drain",
     "miapi.stat.healthPercent.description": "Deals %d percentage health Damage",
     "miapi.stat.armor_pen": "Armor Penetration",
     "miapi.stat.armor_pen.description": "Scales Target armor to %d percent",
+    "miapi.stat.shield_break": "Shield Break",
+    "miapi.stat.shield_break.description": "Time an attack disables a Victims Shield in seconds",
+    "miapi.stat.reach": "Block Reach",
+    "miapi.stat.reach.description": "Distance in witch blocks can be broken",
+    "miapi.stat.attack_range": "Attack Range",
+    "miapi.stat.attack_range.description": "Distance in witch one can attack a Target",
     "miapi.stat.blocking": "Blocking",
     "miapi.stat.blocking.description": "Blocks %d percent of incoming Damage",
     "miapi.stat.mining.level.pickaxe": "Pickaxe Mining",
@@ -239,6 +243,11 @@
     "miapi.module.handle_short.description": "A shorter handle suitable for one-handed swords, providing improved maneuverability.",
     "miapi.module.handle_short.short_description": "A Short Handle",
 
+    "miapi.module.handle_dual": "Dual Handle",
+    "miapi.module.handle_dual.name": "[translation.[material.translation]]Dual Handle",
+    "miapi.module.handle_dual.description": "Am impractical Dual Handle for double the Blades.\n Looks cool though.",
+    "miapi.module.handle_dual.short_description": "A Dual Handle",
+
     "miapi.module.axe_front": "Axe Head",
     "miapi.module.axe_front.name": "[translation.[material.translation]]Axe",
     "miapi.module.axe_front.description": "A front part of an axe used for cutting and stripping wood. Can also be used for combat.",
diff --git a/common/src/main/resources/data/miapi/materials/stone/prismarine.json b/common/src/main/resources/data/miapi/materials/stone/prismarine.json
@@ -1,7 +1,7 @@
 {
     "key": "stone_prismarine",
     "translation": "miapi.material.stone.prismarine",
-    "icon": "textures/block/prismarine.png",
+    "icon": "textures/item/prismarine_shard.png",
     "groups": [
         "stone"
     ],
diff --git a/common/src/main/resources/data/miapi/modules/sword/guard/guard_slim.json b/common/src/main/resources/data/miapi/modules/sword/guard/guard_slim.json
@@ -31,6 +31,5 @@
     "blocking": 10,
     "abilities": [
         "block"
-    ],
-    "flexibility": "-0.5"
+    ]
 }
diff --git a/common/src/main/resources/data/miapi/modules/sword/handle/hande_polearm.json b/common/src/main/resources/data/miapi/modules/sword/handle/hande_polearm.json
@@ -227,7 +227,6 @@
             "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
         }
     ],
-    "flexibility": 1,
     "guiOffset": {
         "x": 3,
         "y": 3,
diff --git a/common/src/main/resources/data/miapi/modules/sword/handle/hande_tool.json b/common/src/main/resources/data/miapi/modules/sword/handle/hande_tool.json
@@ -213,7 +213,6 @@
             "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
         }
     ],
-    "flexibility": 1,
     "isWeapon": false,
     "displayName": "miapi.module.handle_tool.name",
     "itemId": "miapi:modular_handle"
diff --git a/common/src/main/resources/data/miapi/modules/sword/handle/handle_dual.json b/common/src/main/resources/data/miapi/modules/sword/handle/handle_dual.json
diff --git a/common/src/main/resources/data/miapi/modules/sword/handle/handle_long.json b/common/src/main/resources/data/miapi/modules/sword/handle/handle_long.json
diff --git a/common/src/main/resources/data/miapi/modules/sword/handle/handle_normal.json b/common/src/main/resources/data/miapi/modules/sword/handle/handle_normal.json
diff --git a/common/src/main/resources/data/miapi/modules/sword/handle/handle_short.json b/common/src/main/resources/data/miapi/modules/sword/handle/handle_short.json
diff --git a/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public static Transform getTransform(ModuleSlot moduleSlot) {`
`46`	`46`	`Transform mergedTransform = Transform.IDENTITY;`
`47`	`47`	`while (current != null) {`
`48`	`48`	`mergedTransform = Transform.merge(getLocalTransform(current), mergedTransform);`
	`49`	`+ //mergedTransform = Transform.merge(mergedTransform,getLocalTransform(current));`
`49`	`50`	`current = current.parent;`
`50`	`51`	`}`
`51`	`52`	`mergedTransform = Transform.merge(mergedTransform, moduleSlot.transform);`
`@@ -77,10 +78,11 @@ public static TransformMap getTransformStack(ModuleSlot moduleSlot) {`
`77`	`78`	`mergedTransform.set(stack.primary, mergedTransform.get(null));`
`78`	`79`	`mergedTransform.set(null, Transform.IDENTITY);`
`79`	`80`	`}`
`80`		`- mergedTransform = TransformMap.merge(mergedTransform,getLocalTransformStack(current));`
	`81`	`+ //mergedTransform = TransformMap.merge(mergedTransform,getLocalTransformStack(current));`
	`82`	`+ mergedTransform = TransformMap.merge(getLocalTransformStack(current),mergedTransform);`
`81`	`83`	`current = current.parent;`
`82`	`84`	`}`
`83`		`- mergedTransform = TransformMap.merge(mergedTransform, moduleSlot.getTransformStack());`
	`85`	`+ mergedTransform = TransformMap.merge(moduleSlot.getTransformStack(),mergedTransform);`
`84`	`86`	`return mergedTransform;`
`85`	`87`	`}`
`86`	`88`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,11 @@ public boolean load(String moduleKey, JsonElement data) throws Exception {`
`37`	`37`
`38`	`38`	`@Override`
`39`	`39`	`public JsonElement merge(JsonElement old, JsonElement toMerge, MergeType type) {`
	`40`	`+ if (type == MergeType.SMART \|\| type == MergeType.EXTEND) {`
	`41`	`+ return toMerge;`
	`42`	`+ } else if (type == MergeType.OVERWRITE) {`
	`43`	`+ return old;`
	`44`	`+ }`
`40`	`45`	`return ModuleProperty.super.merge(old, toMerge, type);`
`41`	`46`	`}`
`42`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"key": "stone_prismarine",`
`3`	`3`	`"translation": "miapi.material.stone.prismarine",`
`4`		`- "icon": "textures/block/prismarine.png",`
	`4`	`+ "icon": "textures/item/prismarine_shard.png",`
`5`	`5`	`"groups": [`
`6`	`6`	`"stone"`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,5 @@`
`31`	`31`	`"blocking": 10,`
`32`	`32`	`"abilities": [`
`33`	`33`	`"block"`
`34`		`- ],`
`35`		`- "flexibility": "-0.5"`
	`34`	`+ ]`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,6 @@`
`227`	`227`	`"uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"`
`228`	`228`	`}`
`229`	`229`	`],`
`230`		`- "flexibility": 1,`
`231`	`230`	`"guiOffset": {`
`232`	`231`	`"x": 3,`
`233`	`232`	`"y": 3,`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,6 @@`
`213`	`213`	`"uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"`
`214`	`214`	`}`
`215`	`215`	`],`
`216`		`- "flexibility": 1,`
`217`	`216`	`"isWeapon": false,`
`218`	`217`	`"displayName": "miapi.module.handle_tool.name",`
`219`	`218`	`"itemId": "miapi:modular_handle"`