Fixes to ponder register order

Author: cakeGit

common/src/main/java/com/cak/pattern_schematics/PatternSchematics.java

@@ -1,8 +1,6 @@
 package com.cak.pattern_schematics;
 
-import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderIndex;
 import com.cak.pattern_schematics.registry.PatternSchematicsRegistry;
-import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderTags;
 import com.cak.pattern_schematics.registry.PlatformPackets;
 import com.mojang.logging.LogUtils;
 import net.minecraft.resources.ResourceLocation;
@@ -19,8 +17,6 @@ public static void init() {
         PatternSchematicsRegistry.register();
         PlatformPackets.registerPackets();
         PlatformPackets.getChannel().initServerListener();
-        PatternSchematicsPonderTags.register();
-        PatternSchematicsPonderIndex.register();
     }
 
     public static ResourceLocation asResource(String loc) {

common/src/main/java/com/cak/pattern_schematics/PatternSchematicsClient.java

@@ -1,5 +1,6 @@
 package com.cak.pattern_schematics;
 
+import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderTags;
 import com.cak.pattern_schematics.foundation.mirror.PatternSchematicHandler;
 import com.cak.pattern_schematics.registry.PlatformPackets;
 
@@ -12,4 +13,8 @@ public static void init() {
     PlatformPackets.getChannel().initClientListener();
   }
 
+  public static void setup() {
+    PatternSchematicsPonderTags.register();
+  }
+  
 }

common/src/main/java/com/cak/pattern_schematics/mixin/AbstractContraptionEntityMixin.java

@@ -0,0 +1,40 @@
+package com.cak.pattern_schematics.mixin;
+
+import com.simibubi.create.AllBlocks;
+import com.simibubi.create.Create;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import org.apache.commons.lang3.tuple.Pair;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+/**
+ * Adding interaction for applying schematics onto deployers that are in assembled schematics
+ * */
+@Mixin(value = AbstractContraptionEntity.class, remap = false)
+public class AbstractContraptionEntityMixin {
+    
+//    @Shadow protected Contraption contraption;
+//
+//    @Inject(method = "handlePlayerInteraction", at = @At("HEAD"), cancellable = true)
+//    public void handlePlayerInteraction(
+//        Player player, BlockPos localPos, Direction side,
+//        InteractionHand interactionHand, CallbackInfoReturnable<Boolean> cir
+//    ) {
+//        Pair<StructureTemplate.StructureBlockInfo, MovementContext> actor = contraption.getActorAt(localPos);
+//        if (actor != null && actor.getLeft().state().is(AllBlocks.DEPLOYER.get()))  {
+//            Create.LOGGER.info("Found deployer");
+//            cir.setReturnValue(true);
+//        }
+//    }
+    
+}

common/src/main/resources/pattern_schematics.common.mixins.json

@@ -6,6 +6,7 @@
   "client": [
   ],
   "mixins": [
+    "AbstractContraptionEntityMixin",
     "CreateClientMixin",
     "DeployBaseMixin",
     "DeployerMovementBehaviorMixin",

fabric/src/main/java/com/cak/pattern_schematics/fabric/PatternSchematicsFabricClient.java

@@ -3,6 +3,8 @@
 import com.cak.pattern_schematics.PatternSchematics;
 import com.cak.pattern_schematics.PatternSchematicsClient;
 import com.cak.pattern_schematics.PatternSchematicsClientEvents;
+import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderIndex;
+import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderTags;
 import com.cak.pattern_schematics.foundation.mirror.fabric.PatternSchematicHandlerFabric;
 import com.mojang.blaze3d.platform.Window;
 import net.fabricmc.api.ClientModInitializer;
@@ -19,6 +21,8 @@ public void onInitializeClient() {
         PatternSchematicsClient.init();
         registerOverlays();
         PatternSchematicsFabricClientEvents.registerListeners();
+        PatternSchematicsPonderTags.register();
+        PatternSchematicsPonderIndex.register();
     }
 
     private static void registerOverlays() {

fabric/src/main/java/com/cak/pattern_schematics/fabric/PatternSchematicsFabricClientEvents.java

@@ -3,6 +3,7 @@
 import com.cak.pattern_schematics.PatternSchematicsClientEvents;
 import io.github.fabricators_of_create.porting_lib.event.client.KeyInputCallback;
 import io.github.fabricators_of_create.porting_lib.event.client.MouseInputEvents;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.minecraft.client.Minecraft;

forge/src/main/java/com/cak/pattern_schematics/forge/PatternSchematicsForgeClientEvents.java

@@ -2,6 +2,8 @@
 
 import com.cak.pattern_schematics.PatternSchematicsClient;
 import com.cak.pattern_schematics.PatternSchematicsClientEvents;
+import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderIndex;
+import com.cak.pattern_schematics.content.ponder.PatternSchematicsPonderTags;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
@@ -16,6 +18,7 @@
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
 @Mod.EventBusSubscriber(Dist.CLIENT)
 public class PatternSchematicsForgeClientEvents {
@@ -59,6 +62,12 @@ public static class ModBusEvents {
         public static void registerGuiOverlays(RegisterGuiOverlaysEvent event) {
             event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "pattern_schematic", PatternSchematicsClient.PATTERN_SCHEMATIC_HANDLER);
         }
+
+        @SubscribeEvent
+        public static void setupClient(FMLClientSetupEvent event) {
+            PatternSchematicsPonderTags.register();
+            PatternSchematicsPonderIndex.register();
+        }
 
     }
 

forge/src/main/java/com/cak/pattern_schematics/forge/mixin/SchematicTableMenuMixin.java

@@ -34,7 +34,7 @@ protected SchematicTableMenuMixin(MenuType<?> type, int id, Inventory inv, Frien
     super(type, id, inv, extraData);
   }
 
-  @Redirect(method = "addSlots", remap = false, at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lcom/simibubi/create/content/schematics/table/SchematicTableMenu;inputSlot:Lnet/minecraft/world/inventory/Slot;", remap = true))
+  @Redirect(method = "addSlots", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lcom/simibubi/create/content/schematics/table/SchematicTableMenu;inputSlot:Lnet/minecraft/world/inventory/Slot;", remap = true))
   private void addSlots_inputSlot(SchematicTableMenu instance, Slot value) {
     ((SchematicTableMenuMixinAccessor) instance).setInputSlot(new SlotItemHandler(contentHolder.inventory, 0, 21, 57) {
       @Override