diff --git a/Common/src/generated/resources/data/hexcasting/recipe/edified_panel.json b/Common/src/generated/resources/data/hexcasting/recipe/edified_panel.json index 0baf420f31..f00ce30bd5 100644 --- a/Common/src/generated/resources/data/hexcasting/recipe/edified_panel.json +++ b/Common/src/generated/resources/data/hexcasting/recipe/edified_panel.json @@ -2,20 +2,17 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "tag": "hexcasting:edified_planks" - }, - "D": { + "W": { "tag": "hexcasting:edified_planks" } }, "pattern": [ - "DCD", - "C C", - "DCD" + "WWW", + "WWW", + "WWW" ], "result": { - "count": 8, + "count": 9, "id": "hexcasting:edified_panel" } } \ No newline at end of file diff --git a/Common/src/main/java/at/petrak/hexcasting/api/addldata/ItemDelegatingEntityIotaHolder.java b/Common/src/main/java/at/petrak/hexcasting/api/addldata/ItemDelegatingEntityIotaHolder.java index af2198eb1f..009c301836 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/addldata/ItemDelegatingEntityIotaHolder.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/addldata/ItemDelegatingEntityIotaHolder.java @@ -77,5 +77,10 @@ public ToWallScroll(EntityWallScroll entity) { public boolean writeIota(@Nullable Iota datum, boolean simulate) { return false; } + + @Override + public boolean writeable() { + return false; + } } } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/rw/OpTheCoolerWritable.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/rw/OpTheCoolerWritable.kt index 3fac90b52f..f0ea943b6a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/rw/OpTheCoolerWritable.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/rw/OpTheCoolerWritable.kt @@ -21,8 +21,7 @@ object OpTheCoolerWritable : ConstMediaAction { val datumHolder = IXplatAbstractions.INSTANCE.findDataHolder(target) ?: return false.asActionResult - val success = datumHolder.writeIota(NullIota(), true) - + val success = datumHolder.writeable() return success.asActionResult } } diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java index ca8f5038da..879e93860d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java @@ -337,8 +337,11 @@ public void buildRecipes(RecipeOutput recipes) { .unlockedBy("has_item", hasItem(log)).save(recipes); } - ring(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_PANEL, 8, - HexTags.Items.EDIFIED_PLANKS, null) + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_PANEL, 9) + .define('W', HexTags.Items.EDIFIED_PLANKS) + .pattern("WWW") + .pattern("WWW") + .pattern("WWW") .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_TILE, 6) diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 528f826464..302b83b7c9 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -1548,7 +1548,7 @@ "1": "I have discovered new and horrifying modes of failure. I must not succumb to them.", "bad_mindflay.title": "Inert Mindflay", - bad_mindflay: "Attempted to flay the mind of something that I have either already used, or of a character not suitable for the target block.$(br2)Causes dark green sparks, and kills the subject. If a villager sees that, I doubt they would look on it favorably.", + bad_mindflay: "Attempted to flay the mind of something that I have either already used, or of a character not suitable for the target block.$(br2)Causes dark green sparks. Subjects I have already used will be killed outright, while those that are simply unsuitable will be slightly damaged.", "no_circle.title": "Lack Spell Circle", no_circle: "Tried to cast an action requiring a spell circle without a spell circle.$(br2)Causes light blue sparks, and upends my inventory onto the ground.", diff --git a/Fabric/src/generated/resources/data/hexcasting/recipe/edified_panel.json b/Fabric/src/generated/resources/data/hexcasting/recipe/edified_panel.json index 0baf420f31..f00ce30bd5 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipe/edified_panel.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipe/edified_panel.json @@ -2,20 +2,17 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "tag": "hexcasting:edified_planks" - }, - "D": { + "W": { "tag": "hexcasting:edified_planks" } }, "pattern": [ - "DCD", - "C C", - "DCD" + "WWW", + "WWW", + "WWW" ], "result": { - "count": 8, + "count": 9, "id": "hexcasting:edified_panel" } } \ No newline at end of file diff --git a/Fabric/src/main/resources/data/hexcasting/tags/action/cannot_modify_cost.json b/Fabric/src/main/resources/data/hexcasting/tags/action/cannot_modify_cost.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/Fabric/src/main/resources/data/hexcasting/tags/action/cannot_modify_cost.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/Neoforge/src/generated/resources/data/hexcasting/recipe/edified_panel.json b/Neoforge/src/generated/resources/data/hexcasting/recipe/edified_panel.json index 0baf420f31..f00ce30bd5 100644 --- a/Neoforge/src/generated/resources/data/hexcasting/recipe/edified_panel.json +++ b/Neoforge/src/generated/resources/data/hexcasting/recipe/edified_panel.json @@ -2,20 +2,17 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "tag": "hexcasting:edified_planks" - }, - "D": { + "W": { "tag": "hexcasting:edified_planks" } }, "pattern": [ - "DCD", - "C C", - "DCD" + "WWW", + "WWW", + "WWW" ], "result": { - "count": 8, + "count": 9, "id": "hexcasting:edified_panel" } } \ No newline at end of file diff --git a/Neoforge/src/main/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json b/Neoforge/src/main/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/Neoforge/src/main/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file