2.0.7 - Pattern schematic and quill item

cakeGit · cakeGit · commit dc89af735b05 · 2025-05-24T17:44:18.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -274,9 +274,9 @@ publishMods {
         requires("create")
     }
 
-    discord("discordUniversal") {
-        webhookUrl = TOKENS.get("DISCORD_WEBHOOK")
-        username = "New Version Announcement | Create: Pattern Schematics"
-        content = "\n# Create: Pattern Schematics has been updated to $mod_version for $minecraft_version ($forgeEmoji)\n " + changelogText
-    }
+//    discord("discordUniversal") {
+//        webhookUrl = TOKENS.get("DISCORD_WEBHOOK")
+//        username = "New Version Announcement | Create: Pattern Schematics"
+    println("\n# Create: Pattern Schematics has been updated to $mod_version for $minecraft_version ($forgeEmoji)\n " + changelogText)
+//    }
 }
diff --git a/changelog.yaml b/changelog.yaml
@@ -53,4 +53,6 @@
   - Fixed misalignment in the schematic table menu
 1.21.1-2.0.6: |
   - Added ru_ru translation for 1.21.1 (1.20.1 coming soon)
+1.21.1-2.0.7: |
+  - Added 'Pattern Schematic and Quill' item
 ...
diff --git a/gradle.properties b/gradle.properties
@@ -34,7 +34,7 @@ mod_name=Create: Pattern Schematics
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=2.0.6
+mod_version=2.0.7
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
diff --git a/src/generated/resources/.cache/c0f17e4d5c6f03c955154d36376689fc634586c4 b/src/generated/resources/.cache/c0f17e4d5c6f03c955154d36376689fc634586c4
@@ -1,5 +1,6 @@
-// 1.21.1	2025-03-15T09:36:44.0186008	Registrate Provider for create_pattern_schematics [Registries, Data Maps, Recipes, Advancements, Loot Tables, Tags (enchantments), Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider]
-2bcf99344dc07aa391877323dcc6e25700681645 assets/create_pattern_schematics/lang/en_ud.json
-9a552aaa4870e6f168a4a9800aed5c2617383452 assets/create_pattern_schematics/lang/en_us.json
+// 1.21.1	2025-05-24T16:52:05.4827583	Registrate Provider for create_pattern_schematics [Registries, Data Maps, Recipes, Advancements, Loot Tables, Tags (enchantments), Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider]
+c927e24de03aee4a6d858c5d717655bb3f0083bd assets/create_pattern_schematics/lang/en_ud.json
+2c4669a4910478bf50434719f18be71ef73db5e4 assets/create_pattern_schematics/lang/en_us.json
 19e25b53bb643c63106b1f83e2f1fe5a6ac63f13 assets/create_pattern_schematics/models/item/empty_pattern_schematic.json
 ef2d06ece9923cc75b5e3dc3070df2808f1cdb74 assets/create_pattern_schematics/models/item/pattern_schematic.json
+8e73a6fcd1c4904d0f0a3be5be81d70c1e8e2684 assets/create_pattern_schematics/models/item/pattern_schematic_and_quill.json
diff --git a/src/generated/resources/assets/create_pattern_schematics/lang/en_ud.json b/src/generated/resources/assets/create_pattern_schematics/lang/en_ud.json
@@ -24,5 +24,11 @@
   "item.create_pattern_schematics.empty_pattern_schematic": "ɔıʇɐɯǝɥɔS uɹǝʇʇɐԀ ʎʇdɯƎ",
   "item.create_pattern_schematics.empty_pattern_schematic.tooltip.summary": "˙sǝɯıʇ ǝןdıʇןnɯ ‾ubısǝp ɐ ʇɐǝdǝɹ‾ oʇ suouuɐɔıʇɐɯǝɥɔs puɐ suoıʇdɐɹʇuoɔ sʍoןןɐ ɥɔıɥʍ ‾ɔıʇɐɯǝɥɔs s,ǝʇɐǝɹƆ ɟo uoısɹǝʌ pǝpuǝʇxǝ‾ uɐ ǝʞɐɯ oʇ uǝʇʇıɹʍ ǝq uɐƆ",
   "item.create_pattern_schematics.pattern_schematic": "ɔıʇɐɯǝɥɔS uɹǝʇʇɐԀ",
-  "item.create_pattern_schematics.pattern_schematic.tooltip.summary": "˙sǝɯıʇ ǝןdıʇןnɯ ‾ubısǝp ɐ ʇɐǝdǝɹ‾ oʇ suouuɐɔıʇɐɯǝɥɔs puɐ suoıʇdɐɹʇuoɔ sʍoןןɐ ɥɔıɥʍ ‾ɔıʇɐɯǝɥɔs s,ǝʇɐǝɹƆ ɟo uoısɹǝʌ pǝpuǝʇxǝ‾ uⱯ"
+  "item.create_pattern_schematics.pattern_schematic.tooltip.summary": "˙sǝɯıʇ ǝןdıʇןnɯ ‾ubısǝp ɐ ʇɐǝdǝɹ‾ oʇ suouuɐɔıʇɐɯǝɥɔs puɐ suoıʇdɐɹʇuoɔ sʍoןןɐ ɥɔıɥʍ ‾ɔıʇɐɯǝɥɔs s,ǝʇɐǝɹƆ ɟo uoısɹǝʌ pǝpuǝʇxǝ‾ uⱯ",
+  "item.create_pattern_schematics.pattern_schematic_and_quill": "ןןınὉ puⱯ ɔıʇɐɯǝɥɔS uɹǝʇʇɐԀ",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.behaviour1": "˙ɹıɐ-pıɯ suoıʇɐɔoן ʇɔǝןǝs oʇ ןןoɹɔS puɐ ‾ןɹʇƆ‾ pןoH ˙‾ʞɔıןƆ-ᴚ‾ buısn ‾sʇuıod ɹǝuɹoɔ‾ oʍʇ ʇɔǝןǝS",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.behaviour2": "˙ǝʌɐS oʇ uıɐbɐ ʞɔıןƆ-ᴚ uǝɥʇ 'ǝzıs ǝɥʇ ʇsnظpɐ oʇ sǝɔɐɟ ǝɥʇ uo ‾ןןoɹɔS-ןɹʇƆ‾",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.condition1": "uoıʇɔǝןǝs ɐ buıʇɐǝɹƆ",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.condition2": "buıʌɐS puɐ buıʇsnظpⱯ",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.summary": "˙‾ɔıʇɐɯǝɥɔs uɹǝʇʇɐd‾ ɐ oʇuı ʎןǝʇɐıpǝɯɯı pǝʇuıɹd ǝq ɹo ‾ǝןıɟ ʇqu˙‾ ɐ oʇ pןɹoʍ ɹnoʎ uı ‾ǝɹnʇɔnɹʇS ɐ buıʌɐs‾ ɹoɟ pǝs∩"
 }
diff --git a/src/generated/resources/assets/create_pattern_schematics/lang/en_us.json b/src/generated/resources/assets/create_pattern_schematics/lang/en_us.json
@@ -24,5 +24,11 @@
   "item.create_pattern_schematics.empty_pattern_schematic": "Empty Pattern Schematic",
   "item.create_pattern_schematics.empty_pattern_schematic.tooltip.summary": "Can be written to make an _extended version of Create's schematic_ which allows contraptions and schematicannons to _repeat a design_ multiple times.",
   "item.create_pattern_schematics.pattern_schematic": "Pattern Schematic",
-  "item.create_pattern_schematics.pattern_schematic.tooltip.summary": "An _extended version of Create's schematic_ which allows contraptions and schematicannons to _repeat a design_ multiple times."
+  "item.create_pattern_schematics.pattern_schematic.tooltip.summary": "An _extended version of Create's schematic_ which allows contraptions and schematicannons to _repeat a design_ multiple times.",
+  "item.create_pattern_schematics.pattern_schematic_and_quill": "Pattern Schematic And Quill",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.behaviour1": "Select two _corner points_ using _R-Click_. Hold _Ctrl_ and Scroll to select locations mid-air.",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.behaviour2": "_Ctrl-Scroll_ on the faces to adjust the size, then R-Click again to Save.",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.condition1": "Creating a selection",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.condition2": "Adjusting and Saving",
+  "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.summary": "Used for _saving a Structure_ in your world to a _.nbt file_ or be printed immediately into a _pattern schematic_."
 }
diff --git a/src/generated/resources/assets/create_pattern_schematics/models/item/pattern_schematic_and_quill.json b/src/generated/resources/assets/create_pattern_schematics/models/item/pattern_schematic_and_quill.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create_pattern_schematics:item/pattern_schematic_and_quill"
+  }
+}
diff --git a/src/main/java/com/cak/pattern_schematics/forge/mixin/schematic_and_quill/SchematicAndQuillHandlerMixin.java b/src/main/java/com/cak/pattern_schematics/forge/mixin/schematic_and_quill/SchematicAndQuillHandlerMixin.java
@@ -0,0 +1,23 @@
+package com.cak.pattern_schematics.forge.mixin.schematic_and_quill;
+
+import com.cak.pattern_schematics.registry.PatternSchematicsRegistry;
+import com.simibubi.create.AllItems;
+import com.simibubi.create.content.schematics.client.SchematicAndQuillHandler;
+import net.minecraft.client.Minecraft;
+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;
+
+@Mixin(SchematicAndQuillHandler.class)
+public abstract class SchematicAndQuillHandlerMixin {
+
+    @Shadow protected abstract boolean isPresent();
+
+    @Inject(method = "isActive", at = @At("RETURN"), cancellable = true)
+    private void isActive(CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(cir.getReturnValue() || isPresent() && PatternSchematicsRegistry.PATTERN_SCHEMATIC_AND_QUILL.isIn(Minecraft.getInstance().player.getMainHandItem()));
+    }
+
+}
diff --git a/src/main/java/com/cak/pattern_schematics/forge/mixin/schematic_and_quill/ServerSchematicLoaderMixin.java b/src/main/java/com/cak/pattern_schematics/forge/mixin/schematic_and_quill/ServerSchematicLoaderMixin.java
@@ -0,0 +1,37 @@
+package com.cak.pattern_schematics.forge.mixin.schematic_and_quill;
+
+import com.cak.pattern_schematics.content.item.PatternSchematicItem;
+import com.cak.pattern_schematics.registry.PatternSchematicsRegistry;
+import com.simibubi.create.content.schematics.SchematicItem;
+import com.simibubi.create.content.schematics.ServerSchematicLoader;
+import com.tterrag.registrate.util.entry.ItemEntry;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ServerSchematicLoader.class)
+public class ServerSchematicLoaderMixin {
+
+    @Unique
+    private static boolean pattern_Schematics$isHandlingInstantPatternSchematic = false;
+
+    @Redirect(method = "handleInstantSchematic", at = @At(value = "INVOKE", target = "Lcom/tterrag/registrate/util/entry/ItemEntry;isIn(Lnet/minecraft/world/item/ItemStack;)Z"))
+    public boolean handleInstantSchematic_isIn(ItemEntry<?> instance, ItemStack itemStack) {
+        pattern_Schematics$isHandlingInstantPatternSchematic = PatternSchematicsRegistry.PATTERN_SCHEMATIC_AND_QUILL.isIn(itemStack);
+        return instance.isIn(itemStack) || PatternSchematicsRegistry.PATTERN_SCHEMATIC_AND_QUILL.isIn(itemStack);
+    }
+
+    @Redirect(method = "handleInstantSchematic", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/schematics/SchematicItem;create(Lnet/minecraft/world/level/Level;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/world/item/ItemStack;"))
+    public ItemStack handleInstantSchematic_create(Level level, String schematic, String owner) {
+        if (pattern_Schematics$isHandlingInstantPatternSchematic) {
+            return PatternSchematicItem.create(level, schematic, owner);
+        }
+        return SchematicItem.create(level, schematic, owner);
+    }
+
+
+
+}
diff --git a/src/main/java/com/cak/pattern_schematics/forge/mixin/temp_platform/CreateCreativeModeTabMixin.java b/src/main/java/com/cak/pattern_schematics/forge/mixin/temp_platform/CreateCreativeModeTabMixin.java
@@ -14,7 +14,7 @@ public class CreateCreativeModeTabMixin {
     @Redirect(method = "outputAll", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/CreativeModeTab$Output;accept(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;)V"))
     private static void addAdditionalItemInject(CreativeModeTab.Output instance, ItemStack itemStack, CreativeModeTab.TabVisibility tabVisibility) {
         Item itemToAdd = itemStack.getItem();
-        //Ensure execution order, add the instance then add otherg
+        //Ensure execution order, add the instance then add other
         if (
             PatternSchematicsTabInsertions.getAllInsertsAfter()
                 .containsKey(itemToAdd)
diff --git a/src/main/java/com/cak/pattern_schematics/registry/PatternSchematicsLang.java b/src/main/java/com/cak/pattern_schematics/registry/PatternSchematicsLang.java
@@ -18,10 +18,22 @@ public static void register() {
             "create_pattern_schematics.contraption_application.applied_to", "Applied pattern schematic to ",
             "create_pattern_schematics.contraption_application.deployers", " deployer(s)",
             "create_pattern_schematics.contraption_application.not_positioned", "Couldn't apply schematic: Schematic not positioned!",
-            "item.create_pattern_schematics.empty_pattern_schematic.tooltip.summary"
-            , "Can be written to make an _extended version of Create's schematic_ which allows contraptions and schematicannons to _repeat a design_ multiple times.",
-            "item.create_pattern_schematics.pattern_schematic.tooltip.summary"
-            , "An _extended version of Create's schematic_ which allows contraptions and schematicannons to _repeat a design_ multiple times."
+
+            "item.create_pattern_schematics.empty_pattern_schematic.tooltip.summary",
+                "Can be written to make an _extended version of Create's schematic_ which allows contraptions and schematicannons to _repeat a design_ multiple times.",
+            "item.create_pattern_schematics.pattern_schematic.tooltip.summary",
+                "An _extended version of Create's schematic_ which allows contraptions and schematicannons to _repeat a design_ multiple times.",
+
+            "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.behaviour1",
+                "Select two _corner points_ using _R-Click_. Hold _Ctrl_ and Scroll to select locations mid-air.",
+            "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.behaviour2",
+                "_Ctrl-Scroll_ on the faces to adjust the size, then R-Click again to Save.",
+            "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.condition1",
+                "Creating a selection",
+            "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.condition2",
+                "Adjusting and Saving",
+            "item.create_pattern_schematics.pattern_schematic_and_quill.tooltip.summary",
+                "Used for _saving a Structure_ in your world to a _.nbt file_ or be printed immediately into a _pattern schematic_."
         );
     }
     
diff --git a/src/main/java/com/cak/pattern_schematics/registry/PatternSchematicsRegistry.java b/src/main/java/com/cak/pattern_schematics/registry/PatternSchematicsRegistry.java
@@ -2,6 +2,7 @@
 
 import com.cak.pattern_schematics.PatternSchematics;
 import com.cak.pattern_schematics.content.item.PatternSchematicItem;
+import com.simibubi.create.content.schematics.SchematicAndQuillItem;
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.tterrag.registrate.util.entry.ItemEntry;
 import net.minecraft.world.item.Item;
@@ -21,7 +22,12 @@ public class PatternSchematicsRegistry {
       .defaultModel()
       .properties(p -> p.stacksTo(1))
       .register();
-  
+
+
+  public static final ItemEntry<SchematicAndQuillItem> PATTERN_SCHEMATIC_AND_QUILL =
+      REGISTRATE.item("pattern_schematic_and_quill", SchematicAndQuillItem::new)
+          .properties(p -> p.stacksTo(1))
+          .register();
   public static void register() {}
   
 }
diff --git a/src/main/java/com/cak/pattern_schematics/registry/PatternSchematicsTabInsertions.java b/src/main/java/com/cak/pattern_schematics/registry/PatternSchematicsTabInsertions.java
@@ -13,8 +13,9 @@ public class PatternSchematicsTabInsertions {
     
     private static Map<Item, Item> INSERTS_AFTER = null;
     
-    public static final Map<ItemEntry<Item>, ItemEntry<Item>> REGISTRY_INSERTS_AFTER = Map.of(
-        AllItems.EMPTY_SCHEMATIC, PatternSchematicsRegistry.EMPTY_PATTERN_SCHEMATIC
+    public static final Map<ItemEntry<?>, ItemEntry<?>> REGISTRY_INSERTS_AFTER = Map.of(
+        AllItems.EMPTY_SCHEMATIC, PatternSchematicsRegistry.EMPTY_PATTERN_SCHEMATIC,
+        AllItems.SCHEMATIC_AND_QUILL, PatternSchematicsRegistry.PATTERN_SCHEMATIC_AND_QUILL
     );
     
     public static Map<Item, Item> getAllInsertsAfter() {
@@ -23,7 +24,7 @@ public static Map<Item, Item> getAllInsertsAfter() {
         }
         
         INSERTS_AFTER = new HashMap<>();
-        for (Map.Entry<ItemEntry<Item>, ItemEntry<Item>> entry : REGISTRY_INSERTS_AFTER.entrySet()) {
+        for (Map.Entry<ItemEntry<?>, ItemEntry<?>> entry : REGISTRY_INSERTS_AFTER.entrySet()) {
             INSERTS_AFTER.put(entry.getKey().get(), entry.getValue().get());
         }
         return INSERTS_AFTER;
diff --git a/src/main/resources/assets/create_pattern_schematics/textures/item/pattern_schematic_and_quill.png b/src/main/resources/assets/create_pattern_schematics/textures/item/pattern_schematic_and_quill.png
diff --git a/src/main/resources/data/create_pattern_schematics/recipe/pattern_schematic_and_quill.json b/src/main/resources/data/create_pattern_schematics/recipe/pattern_schematic_and_quill.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "create_pattern_schematics:empty_pattern_schematic"
+    },
+    {
+      "item": "minecraft:feather"
+    }
+  ],
+  "result": {
+    "count": 1,
+    "id": "create_pattern_schematics:pattern_schematic_and_quill"
+  }
+}
diff --git a/src/main/resources/pattern_schematics.mixins.json b/src/main/resources/pattern_schematics.mixins.json
@@ -8,6 +8,8 @@
   "mixins": [
     "SchematicannonInventoryMixin",
     "SchematicTableMenuMixin",
+    "schematic_and_quill.SchematicAndQuillHandlerMixin",
+    "schematic_and_quill.ServerSchematicLoaderMixin",
     "temp_platform.AbstractContraptionEntityMixin",
     "temp_platform.BlockHelperMixin",
     "temp_platform.CreateClientMixin",

Original file line number	Diff line number	Diff line change
`@@ -274,9 +274,9 @@ publishMods {`
`274`	`274`	`requires("create")`
`275`	`275`	`}`
`276`	`276`
`277`		`- discord("discordUniversal") {`
`278`		`- webhookUrl = TOKENS.get("DISCORD_WEBHOOK")`
`279`		`- username = "New Version Announcement \| Create: Pattern Schematics"`
`280`		`- content = "\n# Create: Pattern Schematics has been updated to $mod_version for $minecraft_version ($forgeEmoji)\n " + changelogText`
`281`		`- }`
	`277`	`+// discord("discordUniversal") {`
	`278`	`+// webhookUrl = TOKENS.get("DISCORD_WEBHOOK")`
	`279`	`+// username = "New Version Announcement \| Create: Pattern Schematics"`
	`280`	`+ println("\n# Create: Pattern Schematics has been updated to $mod_version for $minecraft_version ($forgeEmoji)\n " + changelogText)`
	`281`	`+// }`
`282`	`282`	`}`