Teehee :3

CHANGELOG.md

@@ -1,2 +1,4 @@
-- Fixed spell slots in the player's inventory having a clickable hitbox when inactive.
-- Fixed an incorrect spell signature.
+- Fixed spells being able to read from hats. (@enjarai)
+- Tweaked the base Spell Construct recipe to be significantly cheaper. (@enjarai)
+- Tweaked hats to not open their ui when right-clicked in the player's offhand. (@enjarai)
+- Fixed graphics-card dependent z-fighting on the Witch Hat. (@enjarai)

gradle.properties

@@ -9,7 +9,7 @@ deps.yarn=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=2.0.0-beta.2d
+mod_version=2.0.0-beta.3
 maven_group=dev.enjarai
 archives_base_name=trickster
 

src/client/java/dev/enjarai/trickster/TricksterClient.java

@@ -66,6 +66,7 @@ public void onInitializeClient() {
         AccessoriesRendererRegistry.registerNoRenderer(ModItems.MACRO_RING);
 
         BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.SPELL_RESONATOR, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LIGHT, RenderLayer.getTranslucent());
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             if (client.player != null) {

src/main/generated/.cache/27614340de28b382d5f7ae74366bcf39e2ac3aeb

@@ -1,59 +1,60 @@
-// 1.21	2024-11-12T22:34:02.429774417	Trickster/Model Definitions
-731c4a8f7b5d2845410c03b22e2521bcf41f969c assets/trickster/models/item/scroll_and_quill_red.json
-7cd9a2d7e13659094779ee999474bc85392fe900 assets/trickster/models/item/scroll_and_quill_white.json
-c995dc518d2d7134ffe57b13897fda67a0b0f815 assets/trickster/models/item/scroll_and_quill_pink.json
-1d20d3356c7098ceded88807637ed3ced7cb8d26 assets/trickster/models/item/cracked_echo_knot.json
-e622027802fd7ffb1c2e6f6d1733f17ed239e61d assets/trickster/models/item/tome_of_tomfoolery.json
-2f7ac0d58a5c1dd9391452bdde2b219a584786f8 assets/trickster/models/item/written_scroll_cyan.json
-07cddf70df0f5e7a92f0c44af3f523be57bd80d6 assets/trickster/models/item/written_scroll_yellow.json
-96809df525387fe221827afd762b90062300440f assets/trickster/models/item/scroll_and_quill_black.json
-ce371fd6383c178fd713cbe03828b8015df480d8 assets/trickster/models/item/scroll_and_quill_gray.json
-c29f71428dcd472e97e6574b8cb1f156ea3b9fcd assets/trickster/models/item/written_scroll_pink.json
-11f88e31ee80e48a4b56df7363c1dfd36659bd76 assets/trickster/models/item/scroll_and_quill_yellow.json
-0c24009d9f713f084ff55efcb5aedef3924fc3bf assets/trickster/models/item/written_scroll_white.json
-52ba2ed5a5d7f67675af14a56e11cad44857f53b assets/trickster/models/item/diamond_knot.json
-1b60d5962f38ecaf3e79d678b2f069057b1c69ab assets/trickster/models/item/scroll_and_quill_purple.json
-b0c13ffb9082049c0ed38c75744d557504409e86 assets/trickster/models/item/written_scroll_gray.json
-1f778e1f2c30077615a7ea8b89c6da45b5c0631f assets/trickster/models/item/written_scroll_light_blue.json
-b2b1aaf26ce09fb4f7de2fbde84e56f568bc247d assets/trickster/models/item/scroll_and_quill_cyan.json
-1b9cef12c72abf3e20c0cb70743fb574e8d0cf04 assets/trickster/models/item/rusted_spell_core.json
-e5a42570471a60ff1e13197f121d3786ba39071c assets/trickster/models/item/spell_core.json
-f00b04573fa8a37423acbd2cfa58995b577acc9f assets/trickster/models/item/written_scroll_light_gray.json
-274e1f4724884bcb7cc8337d4ffac31a3af801fe assets/trickster/models/item/written_scroll_black.json
-9485ad9be41799d6c5bd48cd6dead8464f65beb5 assets/trickster/models/item/scroll_and_quill_magenta.json
-68b6bc87e4d5e9b2709e30d6a6ca9b139c4f5fee assets/trickster/models/item/macro_ring.json
-62cc6f617bc26a9ac45c2b21ff9e312062963258 assets/trickster/models/item/scroll_and_quill.json
-fe72cc051cf77ba7ea5b6ca82cabf06c56cb4503 assets/trickster/blockstates/spell_construct.json
-4320a21f02ba7db476a7dbf19eaa031ef40ca85c assets/trickster/models/item/scroll_and_quill_green.json
-2a8749d4361b2691332bd1d021866d7f9106ca0e assets/trickster/blockstates/modular_spell_construct.json
-22ef3ac293ebe5b86928380e232bfaccc6202a28 assets/trickster/models/item/warding_charm.json
-9faf558d1aa0f4946cf100c91b4f2819b7a07538 assets/trickster/models/item/written_scroll_orange.json
-0af8ae55bca54e5baea1b840c12340690af85f5c assets/trickster/models/item/written_scroll_green.json
-1e5f52dedfd765cf5c0ab6579f32614beb368576 assets/trickster/models/item/nan.json
-85f44373cd91352eb424318c4f289ae4829b3f80 assets/trickster/models/item/scroll_shelf.json
-575f98c294e9b0778c0bccf43bf742ffb333b925 assets/trickster/models/item/scroll_and_quill_light_blue.json
-b1b58c33f70e10632bb128929a2cc5548313f19a assets/trickster/models/item/ominous_spell_core.json
-8457e5235482b7f547386747d1f8fb2123926fdf assets/trickster/blockstates/scroll_shelf.json
-ce15632fcb3beb33453bccd6c7cc398b86834d85 assets/trickster/models/item/written_scroll_lime.json
-c651f1dafc6486d4b76b11cafb5adaf86b97f2eb assets/trickster/models/item/emerald_knot.json
-0365b58ff0a90639528778ad8ec3bdf3fd337ace assets/trickster/models/item/scroll_and_quill_lime.json
-edec8170be553ecb287cd4f9e718988b201f58a9 assets/trickster/models/item/wand.json
-f1968641f7837fe2083a928582b12d565cf59ce0 assets/trickster/models/item/spell_construct.json
-25fc9665ae52d7788aa19923c04ba3874290a007 assets/trickster/models/item/scroll_and_quill_orange.json
-032bd4c0ea04699e58ffbf43c29d1bf96fa19eb5 assets/trickster/models/block/scroll_shelf.json
-06fb6fc1c900f99d2dd7537b8c7d13481323604e assets/trickster/models/item/echo_knot.json
-4dadb13156ab71c0e20c3acad5c8e9506610137b assets/trickster/models/item/amethyst_knot.json
-76a7c57257f8f9538cf8c631e412d6c22ce1c1eb assets/trickster/models/item/scroll_and_quill_light_gray.json
-4b75bcb18c8f3e6ed30eaf767410a836b1be57d6 assets/trickster/models/item/written_scroll_magenta.json
-e7e256d1cc75121b08bfb8a9cf6c6bf4818b559f assets/trickster/models/item/modular_spell_construct.json
-21f8195436d581c8272b28d7a306ce8e14f53a5e assets/trickster/models/item/spell_ink.json
-1eed470d17d966cf34d3dada10b19053562c0c2f assets/trickster/models/item/written_scroll_purple.json
-49e029faed97e108d69b1a5339f092fa7c3ac913 assets/trickster/models/item/spell_resonator.json
-03ec5d0e130b285409440674fa4adf632312325a assets/trickster/models/item/scroll_and_quill_blue.json
-cf211674ac067136f295b34038fad600c1165b99 assets/trickster/models/item/written_scroll.json
-d29d7f82679d35538363d72edafd2229e0f26958 assets/trickster/models/item/scroll_and_quill_brown.json
-06af58b66840c735a18e12df1442fa2cd83c4df4 assets/trickster/models/item/written_scroll_brown.json
-be89ca0492892b810135472265a1fa873151a8f0 assets/trickster/models/item/command_knot.json
-ad5d09f6b76c65ada5383c567922cd74524f968c assets/trickster/models/item/written_scroll_red.json
-ac75d1dcaf4df0990b246b571b214c88c2043fc5 assets/trickster/models/item/written_scroll_blue.json
-9d5d343103d621d1a2f492cec156c06274efdc15 assets/trickster/blockstates/spell_resonator.json
+// 1.21	2024-11-15T12:36:46.8576614	Trickster/Model Definitions
+be89ca0492892b810135472265a1fa873151a8f0 assets\trickster\models\item\command_knot.json
+0c24009d9f713f084ff55efcb5aedef3924fc3bf assets\trickster\models\item\written_scroll_white.json
+96809df525387fe221827afd762b90062300440f assets\trickster\models\item\scroll_and_quill_black.json
+fe72cc051cf77ba7ea5b6ca82cabf06c56cb4503 assets\trickster\blockstates\spell_construct.json
+1b9cef12c72abf3e20c0cb70743fb574e8d0cf04 assets\trickster\models\item\rusted_spell_core.json
+f00b04573fa8a37423acbd2cfa58995b577acc9f assets\trickster\models\item\written_scroll_light_gray.json
+0365b58ff0a90639528778ad8ec3bdf3fd337ace assets\trickster\models\item\scroll_and_quill_lime.json
+4dadb13156ab71c0e20c3acad5c8e9506610137b assets\trickster\models\item\amethyst_knot.json
+7cd9a2d7e13659094779ee999474bc85392fe900 assets\trickster\models\item\scroll_and_quill_white.json
+1e5f52dedfd765cf5c0ab6579f32614beb368576 assets\trickster\models\item\nan.json
+731c4a8f7b5d2845410c03b22e2521bcf41f969c assets\trickster\models\item\scroll_and_quill_red.json
+ad5d09f6b76c65ada5383c567922cd74524f968c assets\trickster\models\item\written_scroll_red.json
+06fb6fc1c900f99d2dd7537b8c7d13481323604e assets\trickster\models\item\echo_knot.json
+032bd4c0ea04699e58ffbf43c29d1bf96fa19eb5 assets\trickster\models\block\scroll_shelf.json
+4b75bcb18c8f3e6ed30eaf767410a836b1be57d6 assets\trickster\models\item\written_scroll_magenta.json
+0af8ae55bca54e5baea1b840c12340690af85f5c assets\trickster\models\item\written_scroll_green.json
+8457e5235482b7f547386747d1f8fb2123926fdf assets\trickster\blockstates\scroll_shelf.json
+25fc9665ae52d7788aa19923c04ba3874290a007 assets\trickster\models\item\scroll_and_quill_orange.json
+274e1f4724884bcb7cc8337d4ffac31a3af801fe assets\trickster\models\item\written_scroll_black.json
+22ef3ac293ebe5b86928380e232bfaccc6202a28 assets\trickster\models\item\warding_charm.json
+cf211674ac067136f295b34038fad600c1165b99 assets\trickster\models\item\written_scroll.json
+4320a21f02ba7db476a7dbf19eaa031ef40ca85c assets\trickster\models\item\scroll_and_quill_green.json
+b0c13ffb9082049c0ed38c75744d557504409e86 assets\trickster\models\item\written_scroll_gray.json
+d29d7f82679d35538363d72edafd2229e0f26958 assets\trickster\models\item\scroll_and_quill_brown.json
+1b60d5962f38ecaf3e79d678b2f069057b1c69ab assets\trickster\models\item\scroll_and_quill_purple.json
+e5a42570471a60ff1e13197f121d3786ba39071c assets\trickster\models\item\spell_core.json
+c29f71428dcd472e97e6574b8cb1f156ea3b9fcd assets\trickster\models\item\written_scroll_pink.json
+b1b58c33f70e10632bb128929a2cc5548313f19a assets\trickster\models\item\ominous_spell_core.json
+9faf558d1aa0f4946cf100c91b4f2819b7a07538 assets\trickster\models\item\written_scroll_orange.json
+49e029faed97e108d69b1a5339f092fa7c3ac913 assets\trickster\models\item\spell_resonator.json
+85f44373cd91352eb424318c4f289ae4829b3f80 assets\trickster\models\item\scroll_shelf.json
+52ba2ed5a5d7f67675af14a56e11cad44857f53b assets\trickster\models\item\diamond_knot.json
+40c79ffc0e3c554e4c5f7b5e9f5144e6ce524f0e assets\trickster\blockstates\light.json
+2f7ac0d58a5c1dd9391452bdde2b219a584786f8 assets\trickster\models\item\written_scroll_cyan.json
+c995dc518d2d7134ffe57b13897fda67a0b0f815 assets\trickster\models\item\scroll_and_quill_pink.json
+03ec5d0e130b285409440674fa4adf632312325a assets\trickster\models\item\scroll_and_quill_blue.json
+ac75d1dcaf4df0990b246b571b214c88c2043fc5 assets\trickster\models\item\written_scroll_blue.json
+575f98c294e9b0778c0bccf43bf742ffb333b925 assets\trickster\models\item\scroll_and_quill_light_blue.json
+07cddf70df0f5e7a92f0c44af3f523be57bd80d6 assets\trickster\models\item\written_scroll_yellow.json
+76a7c57257f8f9538cf8c631e412d6c22ce1c1eb assets\trickster\models\item\scroll_and_quill_light_gray.json
+b2b1aaf26ce09fb4f7de2fbde84e56f568bc247d assets\trickster\models\item\scroll_and_quill_cyan.json
+e622027802fd7ffb1c2e6f6d1733f17ed239e61d assets\trickster\models\item\tome_of_tomfoolery.json
+1eed470d17d966cf34d3dada10b19053562c0c2f assets\trickster\models\item\written_scroll_purple.json
+9d5d343103d621d1a2f492cec156c06274efdc15 assets\trickster\blockstates\spell_resonator.json
+1f778e1f2c30077615a7ea8b89c6da45b5c0631f assets\trickster\models\item\written_scroll_light_blue.json
+c651f1dafc6486d4b76b11cafb5adaf86b97f2eb assets\trickster\models\item\emerald_knot.json
+edec8170be553ecb287cd4f9e718988b201f58a9 assets\trickster\models\item\wand.json
+2a8749d4361b2691332bd1d021866d7f9106ca0e assets\trickster\blockstates\modular_spell_construct.json
+11f88e31ee80e48a4b56df7363c1dfd36659bd76 assets\trickster\models\item\scroll_and_quill_yellow.json
+68b6bc87e4d5e9b2709e30d6a6ca9b139c4f5fee assets\trickster\models\item\macro_ring.json
+ce371fd6383c178fd713cbe03828b8015df480d8 assets\trickster\models\item\scroll_and_quill_gray.json
+21f8195436d581c8272b28d7a306ce8e14f53a5e assets\trickster\models\item\spell_ink.json
+f1968641f7837fe2083a928582b12d565cf59ce0 assets\trickster\models\item\spell_construct.json
+9485ad9be41799d6c5bd48cd6dead8464f65beb5 assets\trickster\models\item\scroll_and_quill_magenta.json
+06af58b66840c735a18e12df1442fa2cd83c4df4 assets\trickster\models\item\written_scroll_brown.json
+62cc6f617bc26a9ac45c2b21ff9e312062963258 assets\trickster\models\item\scroll_and_quill.json
+ce15632fcb3beb33453bccd6c7cc398b86834d85 assets\trickster\models\item\written_scroll_lime.json
+1d20d3356c7098ceded88807637ed3ced7cb8d26 assets\trickster\models\item\cracked_echo_knot.json
+e7e256d1cc75121b08bfb8a9cf6c6bf4818b559f assets\trickster\models\item\modular_spell_construct.json

src/main/generated/.cache/3ac65fa3d3c37fa00307c1168fcecdd37a25c66a

@@ -1 +1 @@
-// 1.21	2024-11-12T22:34:02.433090882	Trickster/Recipes
+// 1.21	2024-11-15T12:36:46.8596649	Trickster/Recipes

src/main/generated/.cache/de828e1c0b483619cb31befb2371ade13f1a18a1

@@ -1,3 +1,3 @@
-// 1.21	2024-11-12T22:34:02.433534721	Trickster/Tags for minecraft:item
-23bfb5af198cc6efbf9fdb01f4169f9c6df07968 data/trickster/tags/item/dyed_scroll_and_quill.json
-af8a8cadecd9999efde2ab4a363a6ac6a933d02b data/trickster/tags/item/dyed_written_scroll.json
+// 1.21	2024-11-15T12:36:46.8606643	Trickster/Tags for minecraft:item
+af8a8cadecd9999efde2ab4a363a6ac6a933d02b data\trickster\tags\item\dyed_written_scroll.json
+23bfb5af198cc6efbf9fdb01f4169f9c6df07968 data\trickster\tags\item\dyed_scroll_and_quill.json

src/main/generated/assets/trickster/blockstates/light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "trickster:block/light"
+    }
+  }
+}

src/main/java/dev/enjarai/trickster/block/LightBlock.java

@@ -33,6 +33,12 @@ protected LightBlock() {
         setDefaultState(getStateManager().getDefaultState().with(WATERLOGGED, false));
     }
 
+    // TODO decide if we can make this work?
+//    @Override
+//    protected BlockRenderType getRenderType(BlockState state) {
+//        return BlockRenderType.MODEL;
+//    }
+
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         builder.add(WATERLOGGED);

src/main/java/dev/enjarai/trickster/datagen/ModModelGenerator.java

@@ -60,6 +60,7 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen
                     )
             );
         }
+        blockStateModelGenerator.registerSimpleState(ModBlocks.LIGHT);
     }
 
     @Override

src/main/java/dev/enjarai/trickster/item/TrickHatItem.java

@@ -40,6 +40,10 @@ public EquipmentSlot getSlotType() {
 
     @Override
     public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
+        if (hand == Hand.OFF_HAND) {
+            return super.use(world, user, hand);
+        }
+
         var stack = user.getStackInHand(hand);
 
         user.openHandledScreen(new NamedScreenHandlerFactory() {

src/main/resources/assets/trickster/models/block/light.json

@@ -0,0 +1,22 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "trickster:block/light",
+		"particle": "trickster:block/light"
+	},
+	"elements": [
+		{
+			"from": [7, 7, 7],
+			"to": [9, 9, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 7]},
+			"faces": {
+				"north": {"uv": [2, 2, 4, 4], "texture": "#0"},
+				"east": {"uv": [0, 2, 2, 4], "texture": "#0"},
+				"south": {"uv": [6, 2, 8, 4], "texture": "#0"},
+				"west": {"uv": [4, 2, 6, 4], "texture": "#0"},
+				"up": {"uv": [4, 2, 2, 0], "texture": "#0"},
+				"down": {"uv": [6, 0, 4, 2], "texture": "#0"}
+			}
+		}
+	]
+}