Resolve merge issues

Author: cakeGit

Changelog.md

@@ -2,7 +2,7 @@
 - Fixed display bug, thanks to discord user @karolofgutovo for reporting
 - Created ponder system with 1 ponder about printing (contraption ponder coming soon)
 - (Technical) Created datagen
-- 
+
 1.1.4:
 - Fixed a bug with deployers placing at the wrong offsets
 - Created bulk apply system to reduce pain of having to put a schematic on each individual deployer
@@ -22,4 +22,4 @@
 
 1.1.8:
 - Made the schematicannon result in the proper item (previously would give Create's schematic no matter what)
-- Added an indicator when applying a non positioned schematic to a contraption deployer
+- Added an indicator when applying a non positioned schematic to a contraption deployer_

common/src/generated/resources/.cache/d70dbc0fd4486830ea17f4c13c0b898ae5c564e3

@@ -1,5 +1,5 @@
-// 1.19.2	2024-08-04T14:33:10.2803239	Registrate Provider for create_pattern_schematics [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
+// 1.19.2	2024-08-12T10:49:58.5148174	Registrate Provider for create_pattern_schematics [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
 ef2d06ece9923cc75b5e3dc3070df2808f1cdb74 assets\create_pattern_schematics\models\item\pattern_schematic.json
-942ec2c362ab8fe5bb67e1ab30ffc6559ffcb677 assets\create_pattern_schematics\lang\en_us.json
-57ae8de9deafee3b663ab9547d413bf9ccc3130d assets\create_pattern_schematics\lang\en_ud.json
+8810e95491d447d2f23ff40d2a9dc511b4922ca8 assets\create_pattern_schematics\lang\en_us.json
+1a219ed86763a03c3793a893757a3c253c4c620e assets\create_pattern_schematics\lang\en_ud.json
 19e25b53bb643c63106b1f83e2f1fe5a6ac63f13 assets\create_pattern_schematics\models\item\empty_pattern_schematic.json

common/src/main/java/com/cak/pattern_schematics/content/ponder/PatternSchematicPonderScenes.java

@@ -160,116 +160,6 @@ public static void schematicPrinting(SceneBuilder scene, SceneBuildingUtil util)
         scene.markAsFinished();
     }
 
-    public static void trainSchematicPrinting(SceneBuilder scene, SceneBuildingUtil util) {
-        scene.title("train_schematic_printing", "Infinite schematic printing with trains");
-        scene.scaleSceneView(0.75f);
-        scene.configureBasePlate(0, 0, 12);
-        scene.world.showSection(util.select.layer(0), Direction.UP);
-        scene.idle(20);
-        
-        //Remove the flowerbed so it can be replaced later#
-        Selection flowerBed = util.select.fromTo(1, 1, 2, 10, 2, 4);
-        scene.world.replaceBlocks(
-            flowerBed, Blocks.AIR.defaultBlockState(), false
-        );
-        scene.world.showSection(flowerBed, Direction.DOWN);
-        
-        //Fill in train tracks
-        BlockPos
-            sectionFrom = new BlockPos(11, 1, 6),
-            selectionTo = new BlockPos(11, 2, 8);
-        
-        for (int i = 0; i <= 12; i++) {
-            scene.world.showSection(util.select.fromTo(sectionFrom, selectionTo), Direction.DOWN);
-            scene.idle(2);
-            
-            sectionFrom = sectionFrom.offset(-1, 0, 0);
-            selectionTo = selectionTo.offset(-1, 0, 0);
-        }
-        
-        scene.idle(10);
-        
-        //Place train
-        scene.world.showSection(util.select.fromTo(10, 3, 7, 11, 4, 7), Direction.DOWN);
-        scene.idle(20);
-        scene.world.showSection(util.select.fromTo(10, 3, 2, 10, 4, 6), Direction.SOUTH);
-        scene.idle(20);
-        
-        //Applying schematic
-        scene.addKeyframe();
-        
-        scene.overlay.showSelectionWithText(util.select.fromTo(10, 3, 2, 10, 3, 4), 80)
-            .placeNearTarget()
-            .pointAt(new Vec3(10.5, 3.5, 3.5))
-            .text("A single pattern schematic can be applied to a group of assembled deployers with Shift + Right Click");
-        
-        scene.idle(80);
-        
-        scene.overlay.showControls(
-            new InputWindowElement(new Vec3(10.5, 3.5, 3.5), Pointing.DOWN)
-                .withItem(PatternSchematicsRegistry.PATTERN_SCHEMATIC.get().getDefaultInstance())
-                .rightClick()
-                .whileSneaking(), 50
-        );
-        scene.idle(60);
-        
-        //Train moves 2 blocks to show original schematic
-        scene.addKeyframe();
-        
-        ElementLink<WorldSectionElement> trainSection = scene.world.makeSectionIndependent(
-            util.select.fromTo(10, 3, 2, 11, 4, 7)
-        );
-        
-        scene.world.moveSection(trainSection, new Vec3(-1, 0, 0), 10);
-        scene.world.animateBogey(util.grid.at(10, 3, 7), 1f, 10);
-        
-        for (int x = 10; x >= 9; x--) {
-            for (int z = 2; z <= 4; z++) {
-                scene.world.moveDeployer(util.grid.at(10, 3, z), 1, 4);
-            }
-            scene.idle(4);
-            scene.world.restoreBlocks(util.select.fromTo(x, 1, 2, x, 2, 4));
-            scene.idle(1);
-            for (int z = 2; z <= 4; z++) {
-                scene.world.moveDeployer(util.grid.at(10, 3, z), -1, 4);
-            }
-            scene.idle(5);
-        }
-        scene.idle(30);
-        
-        scene.overlay.showSelectionWithText(util.select.fromTo(9, 1, 2, 10, 2, 4), 80)
-            .placeNearTarget()
-            .pointAt(new Vec3(10, 2, 3.5))
-            .text("Here, the schematic has been placed as usual");
-        scene.idle(90);
-        
-        scene.overlay.showText(80)
-            .placeNearTarget()
-            .pointAt(new Vec3(8.5, 3.5, 7.5))
-            .text("But moving the train further will result in the schematic repeating");
-        scene.idle(90);
-        
-        scene.world.moveSection(trainSection, new Vec3(-8, 0, 0), 80);
-        scene.world.animateBogey(util.grid.at(10, 3, 7), 8f, 80);
-        
-        scene.idle(5);
-        for (int x = 8; x >= 1; x--) {
-            for (int z = 2; z <= 4; z++) {
-                scene.world.moveDeployer(util.grid.at(10, 3, z), 1, 4);
-            }
-            scene.idle(4);
-            scene.world.restoreBlocks(util.select.fromTo(x, 1, 2, x, 2, 4));
-            scene.idle(1);
-            for (int z = 2; z <= 4; z++) {
-                scene.world.moveDeployer(util.grid.at(10, 3, z), -1, 4);
-            }
-            scene.idle(5);
-        }
-        
-        scene.idle(20);
-        scene.markAsFinished();
-    }
-    
     public static void trainSchematicPrinting(SceneBuilder scene, SceneBuildingUtil util) {
         scene.title("train_schematic_printing", "Infinite schematic printing with trains");
         scene.scaleSceneView(0.75f);

common/src/main/java/com/cak/pattern_schematics/foundation/mirror/CloneSchematicOutlineRenderer.java

@@ -8,6 +8,8 @@
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Iterate;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
 import java.util.List;
@@ -16,22 +18,34 @@ public class CloneSchematicOutlineRenderer {
 
   public static void renderCloneGridLines(PoseStack ms, PatternSchematicHandler schematicHandler, SuperRenderTypeBuffer buffer) {
     ms.pushPose();
-    AABBOutline outline = schematicHandler.getGreaterOutline();
-    outline.setBounds(schematicHandler.calculateGreaterOutlineBounds());
+    AABBOutline outline = schematicHandler.getOutline();
     outline.getParams()
-        .colored(0x6886c5)
-        .lineWidth(1/16f);
-    for (Direction.Axis axis : Iterate.axes) {
-      List<Direction.Axis> secondaries =
-          axis == Direction.Axis.X ? List.of(Direction.Axis.Y, Direction.Axis.Z) :
-              axis == Direction.Axis.Y ? List.of(Direction.Axis.Y, Direction.Axis.Z) :
-                  List.of(Direction.Axis.X, Direction.Axis.Y);
-      
-      
-      
-      continue;
+        .colored(0xa6a1af)
+        .withFaceTexture(AllSpecialTextures.CHECKERED)
+        .lineWidth(1/32f);
+//    for (Direction.Axis axis : Iterate.axes) {
+//      List<Direction.Axis> secondaries =
+//          axis == Direction.Axis.X ? List.of(Direction.Axis.Y, Direction.Axis.Z) :
+//              axis == Direction.Axis.Y ? List.of(Direction.Axis.Y, Direction.Axis.Z) :
+//                  List.of(Direction.Axis.X, Direction.Axis.Y);
+    //TODO: Actually do the optimisation, draw only outer lines
+    Vec3i min = schematicHandler.cloneScaleMin;
+    Vec3i max = schematicHandler.cloneScaleMax;
+    AABB bounds = schematicHandler.getBounds();
+    Vec3i size = new Vec3i(bounds.getXsize(), bounds.getYsize(), bounds.getZsize());
+    
+    for (int x = min.getX(); x <= max.getX(); x++) {
+      for (int y = min.getY(); y <= max.getY(); y++) {
+        for (int z = min.getZ(); z <= max.getZ(); z++) {
+          boolean isRenderingMain = (x == 0) && (y == 0) && (z == 0);
+          if (isRenderingMain) continue;
+          ms.pushPose();
+          ms.translate(x * size.getX(), y * size.getY(), z * size.getZ());
+          outline.render(ms, buffer, Vec3.ZERO, AnimationTickHolder.getPartialTicks());
+          ms.popPose();
+        }
+      }
     }
-    outline.render(ms, buffer, Vec3.ZERO, AnimationTickHolder.getPartialTicks());
     ms.popPose();
   }
 

common/src/main/java/com/cak/pattern_schematics/foundation/mirror/PatternSchematicHandler.java

@@ -264,8 +264,6 @@ else if (fb && !lr)
       if (isRenderingMain) {
         currentTool.getTool()
             .renderOnSchematic(ms, buffer);
-      } else if (deployed) {
-        SimpleSchematicOutlineRenderer.render(ms, this, buffer);
       }
 
     ms.popPose();

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

@@ -51,7 +51,7 @@ public void handlePlayerInteraction(
         InteractionHand interactionHand, CallbackInfoReturnable<Boolean> cir
     ) {
         ItemStack stack = player.getItemInHand(interactionHand);
-        if (player.level().isClientSide || !player.isShiftKeyDown() || !stack.is(PatternSchematicsRegistry.PATTERN_SCHEMATIC.get()))
+        if (player.level.isClientSide || !player.isShiftKeyDown() || !stack.is(PatternSchematicsRegistry.PATTERN_SCHEMATIC.get()))
             return;
 
         if (!stack.hasTag() || !stack.getOrCreateTag().getBoolean("Deployed")) {
@@ -70,7 +70,7 @@ public void handlePlayerInteraction(
             return;
 
         int appliedCount = pattern_schematics$performBulkSchematicApply(
-            actor.getLeft().state().getValue(DeployerBlock.FACING),
+            actor.getLeft().state.getValue(DeployerBlock.FACING),
             actor.getRight().localPos,
             player.getItemInHand(interactionHand)
         );

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

@@ -1,11 +1,9 @@
 package com.cak.pattern_schematics.mixin;
 
 import com.cak.pattern_schematics.PatternSchematicsClient;
+import com.cak.pattern_schematics.foundation.mirror.CloneSchematicOutlineRenderer;
 import com.cak.pattern_schematics.foundation.mirror.PatternSchematicHandler;
 import com.cak.pattern_schematics.foundation.mirror.PatternSchematicsToolType;
-import com.cak.pattern_schematics.foundation.mirror.CloneSchematicOutlineRenderer;
-import com.cak.pattern_schematics.foundation.mirror.SimpleSchematicOutlineRenderer;
-import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.schematics.client.SchematicHandler;
 import com.simibubi.create.content.schematics.client.tools.SchematicToolBase;
@@ -43,7 +41,7 @@ public void init(CallbackInfo ci) {
 
     @Inject(method = "renderOnSchematic", at = @At(value = "INVOKE", shift = At.Shift.BEFORE, target = "Lcom/simibubi/create/foundation/outliner/AABBOutline;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/simibubi/create/foundation/render/SuperRenderTypeBuffer;Lnet/minecraft/world/phys/Vec3;F)V", remap = true))
     public void renderOnSchematic(CallbackInfo ci) {
-        SimpleSchematicOutlineRenderer.applyOutlineModification(schematicHandler);
+        CloneSchematicOutlineRenderer.applyOutlineModification(schematicHandler);
     }
 
     @Unique

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

@@ -12,7 +12,6 @@
     "DeployBaseMixin",
     "DeployerMovementBehaviorMixin",
     "MovementContextMixin",
-    "SchematicannonBlockEntityMixin",
     "SchematicInstancesMixin",
     "SchematicItemMixin",
     "SchematicPrinterMixin",

fabric/src/main/java/com/cak/pattern_schematics/fabric/mixin/SchematicannonBlockEntityMixin.java

@@ -0,0 +1,52 @@
+package com.cak.pattern_schematics.fabric.mixin;
+
+import com.cak.pattern_schematics.registry.PatternSchematicsRegistry;
+import com.simibubi.create.AllItems;
+import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity;
+import com.simibubi.create.content.schematics.cannon.SchematicannonInventory;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+/**Change the second inventory set item call to be the pattern schematic if there was a pattern schematic previously present
+ * Note that due to class resolution issues, the mixin has to be duplicated across both platforms*/
+@Mixin(value = SchematicannonBlockEntity.class, remap = false)
+public class SchematicannonBlockEntityMixin {
+    
+    @Shadow public SchematicannonInventory inventory;
+    @Unique
+    private boolean pattern_schematics$currentThreadIsOfPatternSchematic = false;
+    
+    @Inject(method = "finishedPrinting", at = @At("HEAD"))
+    private void finishedPrinting(CallbackInfo ci) {
+        pattern_schematics$currentThreadIsOfPatternSchematic = !inventory.getStackInSlot(0).isEmpty() &&
+            inventory.getStackInSlot(0).is(PatternSchematicsRegistry.PATTERN_SCHEMATIC.get());
+    }
+    
+    @Redirect(method = "finishedPrinting", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/schematics/cannon/SchematicannonInventory;setStackInSlot(ILnet/minecraft/world/item/ItemStack;)V", remap = true))
+    private void setStackInSlot(SchematicannonInventory instance, int slot, ItemStack stack) {
+        if (slot != 1) {
+            instance.setStackInSlot(slot, stack);
+            return;
+        }
+        
+        Item resultItem = pattern_schematics$currentThreadIsOfPatternSchematic ?
+            PatternSchematicsRegistry.EMPTY_PATTERN_SCHEMATIC.get() :
+            AllItems.EMPTY_SCHEMATIC.get();
+        
+        //Check if the result slot is either empty or matching
+        ItemStack current = inventory.getStackInSlot(1);
+        boolean resultSlotIsAvailable = current.isEmpty() ||
+            current.is(resultItem);
+        
+        int putSlot = resultSlotIsAvailable ? 1 : 0;
+        inventory.setStackInSlot(putSlot, resultItem.getDefaultInstance());
+    }
+    
+}

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

@@ -6,6 +6,7 @@
   "client": [
   ],
   "mixins": [
+    "SchematicannonBlockEntityMixin",
     "SchematicannonInventoryMixin",
     "SchematicTableBlockEntityMixin",
     "SchematicTableMenuMixin"