Merge remote-tracking branch 'origin/forge/1.20.1' into forge/1.20.1

Author: ko-lja

src/generated/resources/assets/expandedae/lang/en_us.json

@@ -61,6 +61,7 @@
   "gui.expandedae.filter_terminal": "Filter Terminal",
   "gui.expandedae.giga_pattern_provider": "Giga Pattern Provider",
   "gui.expandedae.highlight": "Shift-Click to highlight",
+  "gui.expandedae.patterns_with_page": "Patterns - %s",
   "gui.expandedae.shift_info": "§7Press §o[SHIFT] §r§7for more info",
   "gui.expandedae.switch_page": "%s Page",
   "gui.expandedae.switch_page.hint": "Click to go to the %s page",

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -0,0 +1,29 @@
+{
+  "values": [
+    "expandedae:exp_pattern_provider",
+    "expandedae:exp_io_port",
+    "expandedae:exp_energy_cell",
+    "expandedae:giga_pattern_provider",
+    "expandedae:exp_crafting_unit",
+    "expandedae:exp_crafting_accelerator_2",
+    "expandedae:exp_crafting_accelerator_4",
+    "expandedae:exp_crafting_accelerator_8",
+    "expandedae:exp_crafting_accelerator_16",
+    "expandedae:exp_crafting_accelerator_32",
+    "expandedae:exp_crafting_accelerator_64",
+    "expandedae:exp_crafting_accelerator_128",
+    "expandedae:exp_crafting_accelerator_256",
+    "expandedae:exp_crafting_accelerator_512",
+    "expandedae:exp_crafting_accelerator_1k",
+    "expandedae:exp_crafting_accelerator_2k",
+    "expandedae:exp_crafting_accelerator_4k",
+    "expandedae:exp_crafting_accelerator_8k",
+    "expandedae:exp_crafting_accelerator_16k",
+    "expandedae:exp_crafting_accelerator_32k",
+    "expandedae:exp_crafting_accelerator_64k",
+    "expandedae:exp_crafting_accelerator_128k",
+    "expandedae:exp_crafting_accelerator_256k",
+    "expandedae:exp_crafting_accelerator_512k",
+    "expandedae:exp_crafting_accelerator_1m"
+  ]
+}

src/main/java/lu/kolja/expandedae/datagen/ExpBlockTagsProvider.java

@@ -0,0 +1,25 @@
+package lu.kolja.expandedae.datagen;
+
+import lu.kolja.expandedae.Expandedae;
+import lu.kolja.expandedae.definition.ExpBlocks;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.PackOutput;
+import net.minecraft.tags.BlockTags;
+import net.minecraftforge.common.data.BlockTagsProvider;
+import net.minecraftforge.common.data.ExistingFileHelper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.CompletableFuture;
+
+public class ExpBlockTagsProvider extends BlockTagsProvider {
+
+    public ExpBlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
+        super(output, lookupProvider, Expandedae.MODID, existingFileHelper);
+    }
+
+    @Override
+    protected void addTags(HolderLookup.Provider provider) {
+        var pickaxe = tag(BlockTags.MINEABLE_WITH_PICKAXE);
+        ExpBlocks.getBlocks().forEach(blockDef -> pickaxe.add(blockDef.block()));
+    }
+}

src/main/java/lu/kolja/expandedae/datagen/ExpDataGen.java

@@ -14,10 +14,12 @@ public static void onGatherData(GatherDataEvent event) {
         var gen = event.getGenerator();
         var out = gen.getPackOutput();
         var existing = event.getExistingFileHelper();
+        var lookup = event.getLookupProvider();
 
         gen.addProvider(event.includeClient(), new ExpLangProvider(out));
         gen.addProvider(event.includeClient(), new ExpModelProvider(out, existing));
         gen.addProvider(event.includeClient(), new ExpItemModelProvider(out, existing));
+        gen.addProvider(event.includeServer(), new ExpBlockTagsProvider(out, lookup, existing));
         gen.addProvider(event.includeServer(), new ExpRecipeProvider(out));
         gen.addProvider(event.includeServer(), new ExpLootProvider(out));
     }

src/main/java/lu/kolja/expandedae/definition/ExpLang.java

@@ -69,6 +69,8 @@ public enum ExpLang implements LocalizationEnum {
     SWITCH_PAGE("gui.expandedae.switch_page", "%s Page"),
     SWITCH_PAGE_HINT("gui.expandedae.switch_page.hint", "Click to go to the %s page"),
 
+    PATTERNS("gui.expandedae.patterns_with_page", "Patterns - %s"),
+
     SHIFT_INFO("gui.expandedae.shift_info", "§7Press §o[SHIFT] §r§7for more info"),
 
     HIGHLIGHTED_BLOCK("msg.expandedae.highlighted", "Highlighted block at %s §rin %s"),

src/main/java/lu/kolja/expandedae/item/misc/PriorityCardItem.java

@@ -1,11 +1,12 @@
 package lu.kolja.expandedae.item.misc;
 
-import appeng.api.parts.IPartHost;
+import appeng.blockentity.networking.CableBusBlockEntity;
 import appeng.helpers.IPriorityHost;
 import appeng.items.AEBaseItem;
 import appeng.util.InteractionUtil;
 import lu.kolja.expandedae.definition.ExpLang;
 import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
@@ -15,6 +16,8 @@
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -25,14 +28,17 @@
 public class PriorityCardItem extends AEBaseItem {
     public static final String NBT_PRIO = "priority";
     public static final String NBT_MODE = "mode";
+
     public PriorityCardItem(Properties properties) {
         super(properties);
     }
 
     @Override
     public InteractionResult useOn(UseOnContext ctx) {
         if (ctx.getLevel().isClientSide) return InteractionResult.FAIL;
-        var block = ctx.getLevel().getBlockEntity(ctx.getClickedPos());
+
+        BlockPos hitPos = ctx.getClickedPos();
+        var block = ctx.getLevel().getBlockEntity(hitPos);
         var tag = ctx.getItemInHand().getOrCreateTag();
         var prio = tag.getInt(NBT_PRIO);
         var mode = tag.getBoolean(NBT_MODE);
@@ -41,10 +47,15 @@ public InteractionResult useOn(UseOnContext ctx) {
         if (block instanceof IPriorityHost prioHost) {
             prioHost.setPriority(prio);
             be = block.getBlockState().getBlock().getName();
-        } else if (block instanceof IPartHost partHost && partHost.getPart(ctx.getHorizontalDirection()) instanceof IPriorityHost prioPart) {
-            prioPart.setPriority(prio);
-            var partItem = partHost.getPart(ctx.getClickedFace()).getPartItem().asItem();
-            be = partItem.getName(new ItemStack(partItem));
+        } else if (block instanceof CableBusBlockEntity cable) {
+            Vec3 hitVec = ctx.getClickLocation();
+            Vec3 hitInBlock = new Vec3(hitVec.x - hitPos.getX(), hitVec.y - hitPos.getY(), hitVec.z - hitPos.getZ());
+            var selected = cable.getCableBus().selectPartLocal(hitInBlock);
+            if (selected.part instanceof IPriorityHost prioPart) {
+                prioPart.setPriority(prio);
+                var partItem = selected.part.getPartItem().asItem();
+                be = partItem.getName(new ItemStack(partItem));
+            } else return InteractionResult.FAIL;
         } else return InteractionResult.FAIL;
         ctx.getPlayer().sendSystemMessage(ExpLang.PRIO_CHANGED.text(be, "§b" + prio));
         prio += mode ? 1 : -1;

src/main/java/lu/kolja/expandedae/mixin/compat/appflux/MixinPatternProviderLogicAppFlux.java

@@ -105,10 +105,12 @@ private PatternProviderTarget findAdapter(Direction side) {
 
     @Inject(
             method = "pushPattern",
-            at = @At("HEAD")
+            at = @At("RETURN")
     )
     private void expandedae$onPushPatternSuccess(IPatternDetails patternDetails, KeyCounter[] inputHolder, CallbackInfoReturnable<Boolean> cir) {
-        expandedae$tryAutoCompleteCraft(patternDetails);
+        if (cir.getReturnValue()) {
+            expandedae$tryAutoCompleteCraft(patternDetails);
+        }
     }
 
     @Unique

src/main/java/lu/kolja/expandedae/mixin/patternprovider/MixinPatternProviderLogic.java

@@ -168,10 +168,12 @@ private PatternProviderTarget findAdapter(Direction side) {
 
     @Inject(
             method = "pushPattern",
-            at = @At("HEAD")
+            at = @At("RETURN")
     )
     private void expandedae$onPushPatternSuccess(IPatternDetails patternDetails, KeyCounter[] inputHolder, CallbackInfoReturnable<Boolean> cir) {
-        expandedae$tryAutoCompleteCraft(patternDetails);
+        if (cir.getReturnValue()) {
+            expandedae$tryAutoCompleteCraft(patternDetails);
+        }
     }
 
     @Unique

src/main/java/lu/kolja/expandedae/screen/GigaPatternProviderScreen.java

@@ -4,6 +4,7 @@
 import appeng.client.gui.style.ScreenStyle;
 import lu.kolja.expandedae.client.gui.widgets.ExpActionButton;
 import lu.kolja.expandedae.client.gui.widgets.ExpActionItems;
+import lu.kolja.expandedae.definition.ExpLang;
 import lu.kolja.expandedae.menu.GigaPatternProviderMenu;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
@@ -33,5 +34,6 @@ protected void updateBeforeRender() {
 
         this.nextPageButton.visible = menu.getCurrentPage() < 3;
         this.prevPageButton.visible = menu.getCurrentPage() > 0;
+        this.setTextContent("interface_config", ExpLang.PATTERNS.text(this.getMenu().getCurrentPage() + 1));
     }
 }

src/main/resources/assets/expandedae/ae2guide/_zh_cn/cards.md

@@ -11,8 +11,8 @@ item_ids:
 - expandedae:pattern_refiller_card
 ---
 
-## 截至目前，本模组共添加了两个升级卡：
-- 自动完成卡: 样板供应器升级，它会在当样板供应器推送完物品时自动完成合成任务。*注：与合成样板冲突，请谨慎使用。* 
+## 当前，本模组只添加了以下两种升级卡
+- 自动完成卡：该卡是样板供应器的一项升级，会在样板供应器推送样板内容后自动取消合成任务。_注意：会破坏合成样板的工作，使用时需小心_
 <ItemImage id="auto_complete_card" />
-- 样板补充卡: 能为 <ItemLink id="ae2wtlib:wireless_universal_terminal" /> 自动补充空白样板的升级。
+- 样板补充卡：该卡是<ItemLink id="ae2wtlib:wireless_universal_terminal" />的一项升级，会自动装填拓展编码终端的空白样板槽位，只会在点击编码按钮时尝试装填样板
 <ItemImage id="pattern_refiller_card" />