- bugfix update

Smartin-b · Smartin-b · commit a081d28d9e1e · 2024-02-16T20:25:51.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
 ## v1.1.11 (1.20.1)
 - fixed bug were wood tag wasnt picked up correctly
-- added config option for max generated materials to prevent crashes with default of 200 per type (generated,wood,stone)
+- fixed crash related to block ability
+- added config option for max generated materials to prevent crashes with default of 200 per type (generated,wood,stone)
+- minor fixes for generated Materials
+- fixed issues were woods were listed as stones and vice versa
diff --git a/common/src/main/java/smartin/miapi/client/atlas/MaterialSpriteManager.java b/common/src/main/java/smartin/miapi/client/atlas/MaterialSpriteManager.java
@@ -32,7 +32,7 @@ public class MaterialSpriteManager {
             })
             .build(new CacheLoader<>() {
                 @Override
-                public Identifier load(Holder key) throws Exception {
+                public Identifier load(Holder key) {
                     return getMaterialSprite(key);
                 }
             });
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
@@ -4,6 +4,7 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.advancement.criterion.Criteria;
+import net.minecraft.client.item.TooltipContext;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.CrossbowUser;
@@ -16,19 +17,18 @@
 import net.minecraft.item.*;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
-import net.minecraft.util.Hand;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.Rarity;
-import net.minecraft.util.TypedActionResult;
+import net.minecraft.util.*;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import smartin.miapi.Miapi;
@@ -295,7 +295,7 @@ private static void clearProjectiles(ItemStack crossbow) {
             nbtList.clear();
             nbtCompound.put("ChargedProjectiles", nbtList);
         }
-
+        crossbow.setNbt(nbtCompound);
     }
 
     public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
@@ -345,6 +345,26 @@ public static List<ItemStack> getProjectiles(ItemStack crossbow) {
         return list;
     }
 
+    public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
+        List<ItemStack> list = getProjectiles(stack);
+        if (isCharged(stack) && !list.isEmpty()) {
+            ItemStack itemStack = (ItemStack) list.get(0);
+            tooltip.add(Text.translatable("item.minecraft.crossbow.projectile").append(ScreenTexts.SPACE).append(itemStack.toHoverableText()));
+            if (context.isAdvanced() && itemStack.isOf(Items.FIREWORK_ROCKET)) {
+                List<Text> list2 = Lists.newArrayList();
+                Items.FIREWORK_ROCKET.appendTooltip(itemStack, world, list2, context);
+                if (!list2.isEmpty()) {
+                    for (int i = 0; i < list2.size(); ++i) {
+                        list2.set(i, Text.literal("  ").append((Text) list2.get(i)).formatted(Formatting.GRAY));
+                    }
+
+                    tooltip.addAll(list2);
+                }
+            }
+
+        }
+    }
+
     public Predicate<ItemStack> getProjectiles() {
         return itemStack -> projectile.test(itemStack) || IsCrossbowShootAble.canCrossbowShoot(itemStack);
     }
diff --git a/common/src/main/java/smartin/miapi/modules/abilities/util/ItemAbilityManager.java b/common/src/main/java/smartin/miapi/modules/abilities/util/ItemAbilityManager.java
@@ -12,7 +12,6 @@
 import net.minecraft.util.UseAction;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
-import smartin.miapi.Miapi;
 import smartin.miapi.modules.cache.ModularItemCache;
 import smartin.miapi.modules.properties.AbilityMangerProperty;
 import smartin.miapi.modules.properties.AbilityProperty;
@@ -68,12 +67,8 @@ private static ItemUseAbility getAbility(ItemStack itemStack) {
     }
 
     private static ItemUseAbility getAbility(ItemStack itemStack, World world, PlayerEntity player, Hand hand, AbilityHitContext abilityHitContext) {
-        Miapi.LOGGER.info("searching for ability " + itemStack.getTranslationKey());
         for (ItemUseAbility ability : AbilityMangerProperty.get(itemStack)) {
-            Miapi.LOGGER.info("checking ability " + useAbilityRegistry.findKey(ability));
             if (ability.allowedOnItem(itemStack, world, player, hand, abilityHitContext)) {
-                Miapi.LOGGER.info("Found ability" + useAbilityRegistry.findKey(ability));
-                Miapi.LOGGER.info("for Item " + itemStack.getTranslationKey());
                 return ability;
             }
         }
diff --git a/common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java b/common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java
@@ -100,12 +100,12 @@ public void interpretDataClient(PacketByteBuf buf) {
                 genMaterials = buf.readInt();
                 for (int i = 0; i < genMaterials; i++) {
                     Item item = buf.readItemStack().getItem();
-                    stoneMaterials.add(item);
+                    woodMaterials.add(item);
                 }
                 genMaterials = buf.readInt();
                 for (int i = 0; i < genMaterials; i++) {
                     Item item = buf.readItemStack().getItem();
-                    woodMaterials.add(item);
+                    stoneMaterials.add(item);
                 }
                 synchronized (generatedItems) {
                     generatedItems.clear();
@@ -210,8 +210,11 @@ public static void onReloadServer() {
                         if (isValidItem(item)) {
                             woodItems.add(item);
                             GeneratedMaterial generatedMaterial = new GeneratedMaterial(ToolMaterials.WOOD, item.getDefaultStack(), false);
-                            materials.put(generatedMaterial.getKey(), generatedMaterial);
-                            generatedMaterial.copyStatsFrom(materials.get("wood"));
+                            if (MaterialProperty.getMaterialFromIngredient(item.getDefaultStack()) != materials.get("wood")) {
+                                materials.put(generatedMaterial.getKey(), generatedMaterial);
+                                generatedMaterial.copyStatsFrom(materials.get("wood"));
+
+                            }
                         }
                     });
         }
@@ -225,8 +228,10 @@ public static void onReloadServer() {
                         if (isValidItem(item)) {
                             stoneItems.add(item);
                             GeneratedMaterial generatedMaterial = new GeneratedMaterial(ToolMaterials.STONE, item.getDefaultStack(), false);
-                            materials.put(generatedMaterial.getKey(), generatedMaterial);
-                            generatedMaterial.copyStatsFrom(materials.get("stone"));
+                            if (MaterialProperty.getMaterialFromIngredient(item.getDefaultStack()) != materials.get("stone")) {
+                                materials.put(generatedMaterial.getKey(), generatedMaterial);
+                                generatedMaterial.copyStatsFrom(materials.get("stone"));
+                            }
                         }
                     });
         }
diff --git a/common/src/main/java/smartin/miapi/modules/material/JsonMaterial.java b/common/src/main/java/smartin/miapi/modules/material/JsonMaterial.java
@@ -248,7 +248,7 @@ public Double getPriorityOfIngredientItem(ItemStack itemStack) {
                     String tagId = itemObj.get("tag").getAsString();
                     TagKey<Item> tag = TagKey.of(Registries.ITEM.getKey(), new Identifier(tagId));
                     if (tag != null && itemStack.isIn(tag)) {
-                        return 1.0;
+                        return 10.0;
                     }
                 }
             }
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 minecraft_version=1.20.1
 
 archives_base_name=Truly-Modular-miapi
-mod_version=1.1.10
+mod_version=1.1.11
 maven_group=smartin
 github=Truly-Modular.Modular-Item-API
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class MaterialSpriteManager {`
`32`	`32`	`})`
`33`	`33`	`.build(new CacheLoader<>() {`
`34`	`34`	`@Override`
`35`		`- public Identifier load(Holder key) throws Exception {`
	`35`	`+ public Identifier load(Holder key) {`
`36`	`36`	`return getMaterialSprite(key);`
`37`	`37`	`}`
`38`	`38`	`});`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`import net.minecraft.util.UseAction;`
`13`	`13`	`import net.minecraft.world.World;`
`14`	`14`	`import org.jetbrains.annotations.Nullable;`
`15`		`-import smartin.miapi.Miapi;`
`16`	`15`	`import smartin.miapi.modules.cache.ModularItemCache;`
`17`	`16`	`import smartin.miapi.modules.properties.AbilityMangerProperty;`
`18`	`17`	`import smartin.miapi.modules.properties.AbilityProperty;`
`@@ -68,12 +67,8 @@ private static ItemUseAbility getAbility(ItemStack itemStack) {`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`private static ItemUseAbility getAbility(ItemStack itemStack, World world, PlayerEntity player, Hand hand, AbilityHitContext abilityHitContext) {`
`71`		`- Miapi.LOGGER.info("searching for ability " + itemStack.getTranslationKey());`
`72`	`70`	`for (ItemUseAbility ability : AbilityMangerProperty.get(itemStack)) {`
`73`		`- Miapi.LOGGER.info("checking ability " + useAbilityRegistry.findKey(ability));`
`74`	`71`	`if (ability.allowedOnItem(itemStack, world, player, hand, abilityHitContext)) {`
`75`		`- Miapi.LOGGER.info("Found ability" + useAbilityRegistry.findKey(ability));`
`76`		`- Miapi.LOGGER.info("for Item " + itemStack.getTranslationKey());`
`77`	`72`	`return ability;`
`78`	`73`	`}`
`79`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public Double getPriorityOfIngredientItem(ItemStack itemStack) {`
`248`	`248`	`String tagId = itemObj.get("tag").getAsString();`
`249`	`249`	`TagKey<Item> tag = TagKey.of(Registries.ITEM.getKey(), new Identifier(tagId));`
`250`	`250`	`if (tag != null && itemStack.isIn(tag)) {`
`251`		`- return 1.0;`
	`251`	`+ return 10.0;`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`	`}`