Merge pull request #64 from Truly-Modular/release/1.20.1

Release/1.20.1

Author: Smartin-b

CHANGELOG.md

@@ -5,4 +5,6 @@
 - improved armor compatibility
 - fixed heavy attack not multiplying damage
 - actually enabled NBT Property
-- fixed crash with minecolonies
+- fixed crash with minecolonies
+- fixed enchantment transformers
+- added Save Area Mining Config option to only allow area mining to start on blocks the player is looking at

common/src/main/java/smartin/miapi/Miapi.java

@@ -51,6 +51,18 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
+/**
+ * The following docs are used for automatic wiki generation
+ *
+ * @header Wiki for 1.20
+ * @description_start Welcome to the Wiki for Truly Modular 1.20
+ * This Wiki is structured to help Modpack developers/people who want to add/modify content in Truly Modular via Datapacks
+ * It goes in-depth about various Unique things to truly modular, but also over some common Datapack things,
+ * It is aimed at all people
+ * @description_end
+ * @path root
+ * @java false
+ */
 public class Miapi {
     public static final String MOD_ID = "miapi";
     public static final Logger LOGGER = LoggerFactory.getLogger("ModularItem API");

common/src/main/java/smartin/miapi/config/MiapiServerConfig.java

@@ -30,6 +30,12 @@ public static class OtherCategory {
         @AutoCodec.Name("development_mode")
         public boolean developmentMode = Platform.isDevelopmentEnvironment();
 
+        @Comment("""
+                Save Area Mining adds additional checks to prevent explosive behaviour when pared with other mods
+                """)
+        @AutoCodec.Name("save_area_mining")
+        public boolean saveAreaMining = true;
+
         @Comment("""
                 Truly Modular Logs more aggressivly""")
         @AutoCodec.Name("verbose_logging")

common/src/main/java/smartin/miapi/craft/CraftAction.java

@@ -91,6 +91,9 @@ public CraftAction(PacketByteBuf buf, @Nullable ModularWorkBenchEntity bench) {
         String modules = buf.readString();
         if (!modules.equals("null")) {
             toAdd = RegistryInventory.modules.get(modules);
+            if (toAdd == null) {
+                Miapi.LOGGER.error("could not find module " + modules + " craft action failed!");
+            }
         } else {
             toAdd = null;
         }
@@ -245,7 +248,7 @@ public ItemStack perform() {
     private ItemStack craft() {
         ItemStack craftingStack = old.copy();
         if (toAdd == null) {
-            return ItemStack.EMPTY;
+            //return ItemStack.EMPTY;
         }
         if (slotId.size() == 1) {
         } else if (!old.hasNbt() || !(old.hasNbt() && old.getOrCreateNbt().contains(ItemModule.MODULE_KEY) || (old.hasNbt() && old.getOrCreateNbt().contains(NBT_MODULE_KEY)))) {
@@ -278,6 +281,10 @@ private ItemStack craft() {
         ItemModule.ModuleInstance parsingInstance = newBaseModule;
         for (int i = slotId.size() - 1; i > 0; i--) {
             parsingInstance = parsingInstance.subModules.get(slotId.get(i));
+            if (parsingInstance == null) {
+                Miapi.LOGGER.error("cannot find editing Slot aborting craft action!");
+                return craftingStack;
+            }
         }
 
         if (toAdd == null) {

common/src/main/java/smartin/miapi/item/modular/items/ModularToolMaterial.java

@@ -3,7 +3,7 @@
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.recipe.Ingredient;
 
-public class ModularToolMaterial implements ToolMaterial{
+public class ModularToolMaterial implements ToolMaterial {
     public static ModularToolMaterial toolMaterial = new ModularToolMaterial();
 
     @Override

common/src/main/java/smartin/miapi/mixin/BCWeaponRegistryMixin.java

@@ -18,7 +18,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import smartin.miapi.events.MiapiEvents;
-import smartin.miapi.item.FakeEnchantment;
 import smartin.miapi.item.modular.ModularItem;
 import smartin.miapi.modules.properties.ChannelingProperty;
 import smartin.miapi.modules.properties.EnchantAbilityProperty;
@@ -131,17 +130,6 @@ public class EnchantmentHelperMixin {
         return original;
     }
 
-    @ModifyReturnValue(
-            method = "getLevel(Lnet/minecraft/enchantment/Enchantment;Lnet/minecraft/item/ItemStack;)I",
-            at = @At("RETURN")
-    )
-    private static int miapi$modifyPossibleEntries(int original, Enchantment enchantment, ItemStack stack) {
-        if (stack.getItem() instanceof ModularItem) {
-            return FakeEnchantment.getFakeLevel(enchantment, stack, original);
-        }
-        return original;
-    }
-
     private static List<EnchantmentLevelEntry> getLevels(int power, ItemStack stack, boolean treasureAllowed) {
         ArrayList<EnchantmentLevelEntry> list = Lists.newArrayList();
         if (stack.getItem() instanceof ModularItem) {
@@ -158,12 +146,4 @@ private static List<EnchantmentLevelEntry> getLevels(int power, ItemStack stack,
         }
         return list;
     }
-
-    @Inject(
-            method = "forEachEnchantment(Lnet/minecraft/enchantment/EnchantmentHelper$Consumer;Lnet/minecraft/item/ItemStack;)V",
-            at = @At("TAIL"),
-            cancellable = true)
-    private static void miapi$addFakeEnchants(EnchantmentHelper.Consumer consumer, ItemStack stack, CallbackInfo ci) {
-        FakeEnchantment.addEnchantments(consumer, stack);
-    }
 }

common/src/main/java/smartin/miapi/mixin/EnchantmentHelperMixin.java

@@ -295,17 +295,17 @@ public static void onReloadServer() {
                     .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 -> MaterialProperty.getMaterialFromIngredient(itemStack) != null && !itemStack.getItem().equals(Items.BARRIER)))
+                    .filter(toolMaterial -> toolMaterial.getRepairIngredient().getMatchingStacks()[0].getItem().equals(Items.BARRIER))
                     .forEach(toolMaterial -> {
                         Material material = MaterialProperty.getMaterialFromIngredient(toolMaterial.getRepairIngredient().getMatchingStacks()[0]);
-                        List<Item> toolMaterials = toolItems.stream()
-                                .filter(toolMat -> toolMaterial.equals(toolMat.getMaterial()))
-                                .filter(tool -> {
-                                    ItemStack toolItem = tool.getDefaultStack();
-                                    return ModularItemStackConverter.getModularVersion(toolItem)==toolItem;
-                                })
-                                .collect(Collectors.toList());
                         if (material != null) {
+                            List<Item> toolMaterials = toolItems.stream()
+                                    .filter(toolMat -> toolMaterial.equals(toolMat.getMaterial()))
+                                    .filter(tool -> {
+                                        ItemStack toolItem = tool.getDefaultStack();
+                                        return ModularItemStackConverter.getModularVersion(toolItem)==toolItem;
+                                    })
+                                    .collect(Collectors.toList());
                             if (material.generateConverters()) {
                                 try {
                                     MiapiEvents.GENERATE_MATERIAL_CONVERTERS.invoker().generated(material, toolMaterials, false);

common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java

@@ -10,6 +10,7 @@
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import smartin.miapi.config.MiapiConfig;
 import smartin.miapi.item.modular.StatResolver;
 import smartin.miapi.modules.ItemModule;
 import smartin.miapi.modules.cache.ModularItemCache;
@@ -55,6 +56,9 @@ public MiningShapeProperty() {
                 List<MiningShapeJson> miningShapeJsons = get(miningItem);
                 HitResult hitResult = player.raycast(getBlockBreakDistance(player), 0, false);
                 if (hitResult instanceof BlockHitResult blockHitResult) {
+                    if (MiapiConfig.INSTANCE.server.other.saveAreaMining && !blockHitResult.getBlockPos().equals(pos)) {
+                        return EventResult.pass();
+                    }
                     Direction facing = blockHitResult.getSide();
                     miningShapeJsons.stream().filter(miningShapeJson ->
                                     miningShapeJson.miningCondition.canMine(player, level, miningItem, pos, facing)).

common/src/main/java/smartin/miapi/modules/properties/mining/MiningShapeProperty.java

@@ -2,7 +2,7 @@
 @path /attributes
 @keywords attribute, attributes
 
-# Attributes
+
 Miapi Implements a couple of custom attributes.
 Some of them will only work on Modular Items, so using them outside of Modular Items is not recommended.