- drawtime adjustments

Smartin-b · Smartin-b · commit 4487e07b9920 · 2024-01-21T00:24:25.000+01:00
- fix for generative compat
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,4 +2,8 @@
 - added option to use modulekeys in material-properties
 - fixed scrolling in skin-gui
 - added Itemtag Property
-- added Advancement Condition
+- added Advancement Condition
+- fixed issue with generative compat
+- fixed Trim rendering issue in gui
+- buffed Blocking
+- added Thorns to Prismarine
diff --git a/arsenal b/arsenal
@@ -1 +1 @@
-Subproject commit 55cd76586887f01c0f6b0f73aa296d45c43bc2bd
+Subproject commit e6c7eaba2bd4aa344a4bbfba3ff73422676bbf6a
diff --git a/common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatListWidget.java b/common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatListWidget.java
@@ -24,6 +24,7 @@
 import smartin.miapi.client.gui.InteractAbleWidget;
 import smartin.miapi.client.gui.ScrollList;
 import smartin.miapi.client.gui.TransformableWidget;
+import smartin.miapi.item.modular.CustomDrawTimeItem;
 import smartin.miapi.modules.ItemModule;
 import smartin.miapi.modules.properties.*;
 import smartin.miapi.modules.properties.util.GuiWidgetSupplier;
@@ -180,7 +181,10 @@ public static void onReload() {
                 .setMin(1)
                 .setDefault(20)
                 .setValueGetter((stack) -> {
-                    if(stack.getItem() instanceof CrossbowItem){
+                    if (stack.getItem() instanceof CustomDrawTimeItem customDrawTimeItem) {
+                        return customDrawTimeItem.getActualDrawTime(stack);
+                    }
+                    if (stack.getItem() instanceof CrossbowItem) {
                         return 25 - AttributeProperty.getActualValue(stack, EquipmentSlot.MAINHAND, AttributeRegistry.BOW_DRAW_TIME);
                     }
                     return 20 - AttributeProperty.getActualValue(stack, EquipmentSlot.MAINHAND, AttributeRegistry.BOW_DRAW_TIME);
diff --git a/common/src/main/java/smartin/miapi/client/modelrework/Alt2BakedMiapiModel.java b/common/src/main/java/smartin/miapi/client/modelrework/Alt2BakedMiapiModel.java
@@ -109,50 +109,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
                 }
             }
         });
-        /*
-        quadLookupMap.computeIfAbsent(currentModel, model -> {
-            List<BakedQuad> rawQuads = new ArrayList<>();
-            for (Direction direction : Direction.values()) {
-                rawQuads.addAll(model.getQuads(null, direction, random));
-            }
-            List<BakedQuad> redoneQuads = new ArrayList<>();
-            rawQuads.forEach(bakedQuad -> {
-                float uStart = bakedQuad.getSprite().getMinU();
-                float uScale = 1 / (bakedQuad.getSprite().getMaxU() - bakedQuad.getSprite().getMinU());
-                float vStart = bakedQuad.getSprite().getMinV();
-                float vScale = 1 / (bakedQuad.getSprite().getMaxV() - bakedQuad.getSprite().getMinV());
-                int[] copiedArray = new int[bakedQuad.getVertexData().length];
-
-                System.arraycopy(bakedQuad.getVertexData(), 0, copiedArray, 0, bakedQuad.getVertexData().length);
-                for (int i = 0; i < bakedQuad.getVertexData().length / 8; i++) {
-                    copiedArray[i * 8 + 4] = Float.floatToRawIntBits((Float.intBitsToFloat(copiedArray[i * 8 + 4]) - uStart) * uScale);
-                    copiedArray[i * 8 + 5] = Float.floatToRawIntBits((Float.intBitsToFloat(copiedArray[i * 8 + 5]) - vStart) * vScale);
-                }
-                redoneQuads.add(new BakedQuad(copiedArray, bakedQuad.getColorIndex(), bakedQuad.getFace(), bakedQuad.getSprite(), bakedQuad.hasShade()));
-            });
-
-            return redoneQuads;
-        }).forEach(bakedQuad -> {
-            Identifier replaceId = MaterialSpriteManager.getMaterialSprite(bakedQuad.getSprite(), material);
-            if (replaceId != null) {
-                RenderLayer atlasRenderLayer = RenderLayer.getEntityTranslucentCull(replaceId);
-                //VertexConsumer atlasConsumer = ItemRenderer.getDirectDynamicDisplayGlintConsumer(vertexConsumers,atlasRenderLayer,matrices.peek());
-                VertexConsumer atlasConsumer = ItemRenderer.getDirectItemGlintConsumer(vertexConsumers, atlasRenderLayer, true, false);
-                //atlasConsumer = vertexConsumers.getBuffer(atlasRenderLayer);
-                atlasConsumer.quad(matrices.peek(), bakedQuad, colors[0], colors[1], colors[2], light, overlay);
 
-
-                if (trim != null) {
-                    if (armorMaterial != null) {
-                        if (!modelHolder.trimMode().equals(TrimRenderer.TrimMode.NONE)) {
-                            TrimRenderer.renderTrims(matrices, bakedQuad, modelHolder.trimMode(), light, vertexConsumers, armorMaterial, stack);
-
-                        }
-                    }
-                }
-            }
-        });
-        */
         if (modelHolder.entityRendering()) {
             ModelTransformer.getRescaleInverse(currentModel, random).forEach(bakedQuad -> {
                 Identifier replaceId = MaterialSpriteManager.getMaterialSprite(bakedQuad.getSprite(), material);
diff --git a/common/src/main/java/smartin/miapi/client/modelrework/BadShaderCompatModel.java b/common/src/main/java/smartin/miapi/client/modelrework/BadShaderCompatModel.java
@@ -71,14 +71,11 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
             });
         }
 
-        if (stack.getItem() instanceof ArmorItem armorItem) {
+        if (stack.getItem() instanceof ArmorItem armorItem && !modelHolder.trimMode().equals(TrimRenderer.TrimMode.NONE)) {
             ModelTransformer.getRescale(currentModel, random).forEach(bakedQuad -> {
                 TrimRenderer.renderTrims(matrices, bakedQuad, modelHolder.trimMode(), light, vertexConsumers, armorItem.getMaterial(), stack);
             });
         }
-        if (consumer instanceof VertexConsumerProvider.Immediate immediate) {
-            immediate.draw();
-        }
         MinecraftClient.getInstance().world.getProfiler().pop();
         matrices.pop();
     }
diff --git a/common/src/main/java/smartin/miapi/client/modelrework/BakedMiapiGlintModel.java b/common/src/main/java/smartin/miapi/client/modelrework/BakedMiapiGlintModel.java
@@ -78,7 +78,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
             });
         }
 
-        if (stack.getItem() instanceof ArmorItem armorItem) {
+        if (stack.getItem() instanceof ArmorItem armorItem && !modelHolder.trimMode().equals(TrimRenderer.TrimMode.NONE)) {
             ModelTransformer.getRescale(currentModel, random).forEach(bakedQuad -> {
                 TrimRenderer.renderTrims(matrices, bakedQuad, modelHolder.trimMode(), light, vertexConsumerProvider, armorItem.getMaterial(), stack);
             });
diff --git a/common/src/main/java/smartin/miapi/client/modelrework/BakedMiapiModel.java b/common/src/main/java/smartin/miapi/client/modelrework/BakedMiapiModel.java
@@ -53,7 +53,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
         assert MinecraftClient.getInstance().world != null;
         MinecraftClient.getInstance().world.getProfiler().push("BakedModel");
         matrices.push();
-        Transform.applyPosition(matrices,modelMatrix);
+        Transform.applyPosition(matrices, modelMatrix);
         BakedModel currentModel = model;
         if (model.getOverrides() != null && !model.getOverrides().equals(ModelOverrideList.EMPTY)) {
             currentModel = model.getOverrides().apply(model, stack, MinecraftClient.getInstance().world, entity, light);
@@ -72,7 +72,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
             });
         }
 
-        if (stack.getItem() instanceof ArmorItem armorItem) {
+        if (stack.getItem() instanceof ArmorItem armorItem && !modelHolder.trimMode().equals(TrimRenderer.TrimMode.NONE)) {
             ModelTransformer.getRescale(currentModel, random).forEach(bakedQuad -> {
                 TrimRenderer.renderTrims(matrices, bakedQuad, modelHolder.trimMode(), light, vertexConsumers, armorItem.getMaterial(), stack);
             });
diff --git a/common/src/main/java/smartin/miapi/craft/CraftAction.java b/common/src/main/java/smartin/miapi/craft/CraftAction.java
@@ -288,7 +288,7 @@ private ItemStack craft() {
             parsingInstance.subModules.put(slotId.get(0), newModule);
         }
         newBaseModule.writeToItem(craftingStack);
-        return craftingStack;
+        return craftingStack.copy();
     }
 
     /**
diff --git a/common/src/main/java/smartin/miapi/item/modular/CustomDrawTimeItem.java b/common/src/main/java/smartin/miapi/item/modular/CustomDrawTimeItem.java
@@ -0,0 +1,14 @@
+package smartin.miapi.item.modular;
+
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.item.ItemStack;
+import smartin.miapi.attributes.AttributeRegistry;
+import smartin.miapi.modules.properties.AttributeProperty;
+
+public interface CustomDrawTimeItem {
+    double getBaseDrawTime(ItemStack itemStack);
+
+    default double getActualDrawTime(ItemStack stack){
+        return getBaseDrawTime(stack) - AttributeProperty.getActualValue(stack, EquipmentSlot.MAINHAND, AttributeRegistry.BOW_DRAW_TIME);
+    }
+}
diff --git a/common/src/main/java/smartin/miapi/item/modular/items/ModularCrossbow.java b/common/src/main/java/smartin/miapi/item/modular/items/ModularCrossbow.java
@@ -34,6 +34,7 @@
 import smartin.miapi.attributes.AttributeRegistry;
 import smartin.miapi.client.model.ModularModelPredicateProvider;
 import smartin.miapi.entity.ItemProjectileEntity;
+import smartin.miapi.item.modular.CustomDrawTimeItem;
 import smartin.miapi.item.modular.ModularItem;
 import smartin.miapi.modules.properties.AttributeProperty;
 import smartin.miapi.modules.properties.DisplayNameProperty;
@@ -45,7 +46,7 @@
 
 import static smartin.miapi.item.modular.items.ModularBow.projectile;
 
-public class ModularCrossbow extends CrossbowItem implements ModularItem {
+public class ModularCrossbow extends CrossbowItem implements ModularItem, CustomDrawTimeItem {
 
     public ModularCrossbow() {
         super(new Item.Settings().maxCount(1).maxDamage(50));
@@ -119,7 +120,6 @@ public int getMaxUseTime(ItemStack stack) {
 
     private static float getPullProgress(int useTicks, ItemStack stack) {
         float progress = (float) useTicks / (float) getPullTime(stack);
-        Miapi.LOGGER.info("pull Progress " + useTicks + " pullTime " + getPullTime(stack) + " " + progress);
         return Math.max(0, Math.min(1, progress));
     }
 
@@ -345,4 +345,9 @@ public static List<ItemStack> getProjectiles(ItemStack crossbow) {
     public Predicate<ItemStack> getProjectiles() {
         return itemStack -> projectile.test(itemStack) || IsCrossbowShootAble.canCrossbowShoot(itemStack);
     }
+
+    @Override
+    public double getBaseDrawTime(ItemStack itemStack) {
+        return 25;
+    }
 }
diff --git a/common/src/main/java/smartin/miapi/mixin/BCWeaponRegistryMixin.java b/common/src/main/java/smartin/miapi/mixin/BCWeaponRegistryMixin.java
@@ -8,6 +8,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import smartin.miapi.Environment;
 import smartin.miapi.item.modular.ModularItem;
 import smartin.miapi.modules.properties.compat.BetterCombatHelper;
 
@@ -20,11 +21,29 @@ public class BCWeaponRegistryMixin {
             remap = true,
             require = -1)
     private static void miapi$getAttributes(ItemStack itemStack, CallbackInfoReturnable<WeaponAttributes> cir) {
-        if(itemStack.getItem() instanceof ModularItem && !itemStack.getOrCreateNbt().contains("weapon_attributes")){
+        if (itemStack.getItem() instanceof ModularItem && !itemStack.getOrCreateNbt().contains("weapon_attributes")) {
             WeaponAttributes attributes = BetterCombatHelper.getAttributes(itemStack);
             if (attributes != null) {
                 cir.setReturnValue(attributes);
             }
         }
     }
-}
+
+    /*
+    because BC fails to work properly on servers with NBT compat
+     */
+    @Inject(
+            method = "readFromNBT(Lnet/minecraft/item/ItemStack;)Lnet/bettercombat/api/WeaponAttributes;",
+            at = @At("HEAD"),
+            cancellable = true,
+            remap = true,
+            require = -1)
+    private static void miapi$getAttributesFix(ItemStack itemStack, CallbackInfoReturnable<WeaponAttributes> cir) {
+        if (itemStack.getItem() instanceof ModularItem && !Environment.isClientServer()) {
+            WeaponAttributes attributes = BetterCombatHelper.getAttributes(itemStack);
+            if (attributes != null) {
+                cir.setReturnValue(attributes);
+            }
+        }
+    }
+}
diff --git a/common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java b/common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java
@@ -382,6 +382,9 @@ public MaterialPalette getPalette() {
 
     @Override
     public double getValueOfItem(ItemStack item) {
+        if(toolMaterial.getRepairIngredient().test(item)){
+            return 1;
+        }
         return item.getItem().equals(mainIngredient.getItem()) ? 1 : 0;
     }
 
@@ -390,6 +393,9 @@ public double getValueOfItem(ItemStack item) {
         if (mainIngredient.getItem().equals(itemStack.getItem())) {
             return 0.0;
         }
+        if(toolMaterial.getRepairIngredient().test(itemStack)){
+            return 0.0;
+        }
         return null;
     }
 }
diff --git a/common/src/main/java/smartin/miapi/modules/material/MaterialProperty.java b/common/src/main/java/smartin/miapi/modules/material/MaterialProperty.java
@@ -96,6 +96,7 @@ public String resolveString(String data, ItemModule.ModuleInstance instance) {
                     .map(toolItem -> toolItem.getMaterial())
                     .collect(Collectors.toSet())
                     .stream()
+                    .filter(toolMaterial -> toolMaterial.getRepairIngredient() != null && toolMaterial.getRepairIngredient().getMatchingStacks() != null)
                     .filter(toolMaterial -> toolMaterial.getRepairIngredient().getMatchingStacks().length > 0)
                     .filter(toolMaterial -> !toolMaterial.getRepairIngredient().getMatchingStacks()[0].isIn(RegistryInventory.MIAPI_FORBIDDEN_TAG))
                     .filter(toolMaterial -> Arrays.stream(toolMaterial.getRepairIngredient().getMatchingStacks()).allMatch(itemStack -> getMaterialFromIngredient(itemStack) == null && !itemStack.getItem().equals(Items.BARRIER)))

Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,11 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod`
`71`	`71`	`});`
`72`	`72`	`}`
`73`	`73`
`74`		`- if (stack.getItem() instanceof ArmorItem armorItem) {`
	`74`	`+ if (stack.getItem() instanceof ArmorItem armorItem && !modelHolder.trimMode().equals(TrimRenderer.TrimMode.NONE)) {`
`75`	`75`	`ModelTransformer.getRescale(currentModel, random).forEach(bakedQuad -> {`
`76`	`76`	`TrimRenderer.renderTrims(matrices, bakedQuad, modelHolder.trimMode(), light, vertexConsumers, armorItem.getMaterial(), stack);`
`77`	`77`	`});`
`78`	`78`	`}`
`79`		`- if (consumer instanceof VertexConsumerProvider.Immediate immediate) {`
`80`		`- immediate.draw();`
`81`		`- }`
`82`	`79`	`MinecraftClient.getInstance().world.getProfiler().pop();`
`83`	`80`	`matrices.pop();`
`84`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod`
`78`	`78`	`});`
`79`	`79`	`}`
`80`	`80`
`81`		`- if (stack.getItem() instanceof ArmorItem armorItem) {`
	`81`	`+ if (stack.getItem() instanceof ArmorItem armorItem && !modelHolder.trimMode().equals(TrimRenderer.TrimMode.NONE)) {`
`82`	`82`	`ModelTransformer.getRescale(currentModel, random).forEach(bakedQuad -> {`
`83`	`83`	`TrimRenderer.renderTrims(matrices, bakedQuad, modelHolder.trimMode(), light, vertexConsumerProvider, armorItem.getMaterial(), stack);`
`84`	`84`	`});`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ private ItemStack craft() {`
`288`	`288`	`parsingInstance.subModules.put(slotId.get(0), newModule);`
`289`	`289`	`}`
`290`	`290`	`newBaseModule.writeToItem(craftingStack);`
`291`		`- return craftingStack;`
	`291`	`+ return craftingStack.copy();`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,9 @@ public MaterialPalette getPalette() {`
`382`	`382`
`383`	`383`	`@Override`
`384`	`384`	`public double getValueOfItem(ItemStack item) {`
	`385`	`+ if(toolMaterial.getRepairIngredient().test(item)){`
	`386`	`+ return 1;`
	`387`	`+ }`
`385`	`388`	`return item.getItem().equals(mainIngredient.getItem()) ? 1 : 0;`
`386`	`389`	`}`
`387`	`390`
`@@ -390,6 +393,9 @@ public double getValueOfItem(ItemStack item) {`
`390`	`393`	`if (mainIngredient.getItem().equals(itemStack.getItem())) {`
`391`	`394`	`return 0.0;`
`392`	`395`	`}`
	`396`	`+ if(toolMaterial.getRepairIngredient().test(itemStack)){`
	`397`	`+ return 0.0;`
	`398`	`+ }`
`393`	`399`	`return null;`
`394`	`400`	`}`
`395`	`401`	`}`