Merge pull request #21 from Tfarcenim/main

0vergrown · web-flow · commit 5371df695156 · 2026-02-25T15:37:33.000-05:00
Fix slot layout and features
diff --git a/src/main/generated/.cache/236ce7223e38bbaa4e078c6b9e285e43f381fcd6 b/src/main/generated/.cache/236ce7223e38bbaa4e078c6b9e285e43f381fcd6
@@ -1,5 +1,5 @@
-// 1.20.1	2025-11-18T14:53:58.796115346	Thaumaturge/Block Loot Tables
-99b5b8ebf671c199b1c642dd8400008f2091f979 data/thaumaturge/loot_tables/blocks/faucet.json
-6b4dcb17726730183d7a6f935f5f8b01f37d2ac1 data/thaumaturge/loot_tables/blocks/jar.json
-a74c123ceb69dd6f053345f89af5cbac4bca5752 data/thaumaturge/loot_tables/blocks/alchemical_furnace.json
-452284199e53138a27116cd17a1df6a202f0acea data/thaumaturge/loot_tables/blocks/vessel.json
+// 1.20.1	2025-12-30T15:41:39.1956443	Thaumaturge/Block Loot Tables
+6b4dcb17726730183d7a6f935f5f8b01f37d2ac1 data\thaumaturge\loot_tables\blocks\jar.json
+99b5b8ebf671c199b1c642dd8400008f2091f979 data\thaumaturge\loot_tables\blocks\faucet.json
+452284199e53138a27116cd17a1df6a202f0acea data\thaumaturge\loot_tables\blocks\vessel.json
+a74c123ceb69dd6f053345f89af5cbac4bca5752 data\thaumaturge\loot_tables\blocks\alchemical_furnace.json
diff --git a/src/main/generated/.cache/59987b824920fbe10c03130e6cf5867bfe8a3df8 b/src/main/generated/.cache/59987b824920fbe10c03130e6cf5867bfe8a3df8
@@ -1,2 +1,2 @@
-// 1.20.1	2025-11-18T14:53:58.795368961	Thaumaturge/Tags for minecraft:block
-e95a2aa55168b7a36c5e312ed432b6c015899c9f data/minecraft/tags/blocks/mineable/pickaxe.json
+// 1.20.1	2025-12-30T15:41:39.1946437	Thaumaturge/Tags for minecraft:block
+e95a2aa55168b7a36c5e312ed432b6c015899c9f data\minecraft\tags\blocks\mineable\pickaxe.json
diff --git a/src/main/generated/.cache/c5395a8a274105088f98066d646f03b47fce0c6e b/src/main/generated/.cache/c5395a8a274105088f98066d646f03b47fce0c6e
@@ -0,0 +1,3 @@
+// 1.20.1	2025-12-30T15:41:39.1936437	Thaumaturge/Model Definitions
+1606e361a951d85d5db82a1ffc043faacafec5b3 assets\thaumaturge\models\item\pedestal.json
+9afbcd5eab9843dfc27fe548e1637c2e3fc380f4 assets\thaumaturge\blockstates\pedestal.json
diff --git a/src/main/generated/.cache/f6a312a19ca234a760b131ce5f7b7c9cb187da48 b/src/main/generated/.cache/f6a312a19ca234a760b131ce5f7b7c9cb187da48
@@ -1,4 +1,3 @@
-// 1.20.1	2025-11-18T14:53:58.796485863	Thaumaturge/Tags for minecraft:item
-58fb688503f20fb08f1da2fe0f53dd6718a9b873 data/thaumaturge/tags/items/vessel_no_sludge.json
-909913006fe0a00db6337bb4adbdbef47140f961 data/thaumaturge/tags/items/dyeable.json
-909913006fe0a00db6337bb4adbdbef47140f961 data/minecraft/tags/items/trimmable_armor.json
+// 1.20.1	2025-12-30T15:41:39.1956443	Thaumaturge/Tags for minecraft:item
+909913006fe0a00db6337bb4adbdbef47140f961 data\minecraft\tags\items\trimmable_armor.json
+58fb688503f20fb08f1da2fe0f53dd6718a9b873 data\thaumaturge\tags\items\vessel_no_sludge.json
diff --git a/src/main/generated/assets/thaumaturge/blockstates/pedestal.json b/src/main/generated/assets/thaumaturge/blockstates/pedestal.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "thaumaturge:block/pedestal"
+    }
+  }
+}
diff --git a/src/main/generated/assets/thaumaturge/models/item/pedestal.json b/src/main/generated/assets/thaumaturge/models/item/pedestal.json
@@ -0,0 +1,3 @@
+{
+  "parent": "thaumaturge:block/pedestal"
+}
diff --git a/src/main/java/dev/overgrown/thaumaturge/Thaumaturge.java b/src/main/java/dev/overgrown/thaumaturge/Thaumaturge.java
@@ -56,6 +56,9 @@ public void onInitialize() {
         registerAspectEffects();
         registerModifierEffects();
 
+        //Creative Tabs
+        ModCreativeTabs.initialize();
+
         // Networking
         SpellCastPacket.registerServer();
 
diff --git a/src/main/java/dev/overgrown/thaumaturge/ThaumaturgeClient.java b/src/main/java/dev/overgrown/thaumaturge/ThaumaturgeClient.java
@@ -1,6 +1,7 @@
 package dev.overgrown.thaumaturge;
 
 import dev.overgrown.aspectslib.aspects.client.AspectsTooltipConfig;
+import dev.overgrown.thaumaturge.block.PedestalBlockEntityRenderer;
 import dev.overgrown.thaumaturge.block.focal_manipulator.screen.FocalManipulatorScreen;
 import dev.overgrown.thaumaturge.client.render.JarBlockEntityRenderer;
 import dev.overgrown.thaumaturge.client.render.VesselBlockEntityRenderer;
@@ -51,6 +52,8 @@ public void onInitializeClient() {
         EntityRendererRegistry.register(ModEntities.SPELL_BOLT, SpellBoltRenderer::new);
         EntityRendererRegistry.register(ModEntities.ARCANE_MINE, EmptyEntityRenderer::new);
         EntityRendererRegistry.register(ModEntities.ALKIMIA_CLOUD, EmptyEntityRenderer::new);
+        BlockEntityRendererFactories.register(ModBlocks.PEDESTAL_BE, PedestalBlockEntityRenderer::new);
+
 
         // Tooltips visible only with lens
         AspectsTooltipConfig.addVisibilityCondition((stack, player) -> AspectLensItem.hasLens(player));
diff --git a/src/main/java/dev/overgrown/thaumaturge/ThaumaturgeDataGenerator.java b/src/main/java/dev/overgrown/thaumaturge/ThaumaturgeDataGenerator.java
@@ -3,6 +3,7 @@
 import dev.overgrown.thaumaturge.data_generator.ModBlockLootTables;
 import dev.overgrown.thaumaturge.data_generator.ModBlockTags;
 import dev.overgrown.thaumaturge.data_generator.ModItemTags;
+import dev.overgrown.thaumaturge.data_generator.assets.ModModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 
@@ -13,5 +14,6 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
         pack.addProvider(ModBlockLootTables::new);
         pack.addProvider(ModBlockTags::new);
         pack.addProvider(ModItemTags::new);
+        pack.addProvider(ModModelProvider::new);
     }
 }
diff --git a/src/main/java/dev/overgrown/thaumaturge/block/MatrixBlock.java b/src/main/java/dev/overgrown/thaumaturge/block/MatrixBlock.java
@@ -0,0 +1,9 @@
+package dev.overgrown.thaumaturge.block;
+
+import net.minecraft.block.Block;
+
+public class MatrixBlock extends Block {
+    public MatrixBlock(Settings settings) {
+        super(settings);
+    }
+}
diff --git a/src/main/java/dev/overgrown/thaumaturge/block/PedestalBlock.java b/src/main/java/dev/overgrown/thaumaturge/block/PedestalBlock.java
@@ -0,0 +1,71 @@
+package dev.overgrown.thaumaturge.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockEntityProvider;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+
+public class PedestalBlock extends Block implements BlockEntityProvider {
+    public PedestalBlock(Settings settings) {
+        super(settings);
+    }
+
+    private static final VoxelShape BASE_SHAPE = Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 4.0, 14.0);
+    private static final VoxelShape X_STEP_SHAPE = Block.createCuboidShape(3.0, 4.0, 4.0, 13.0, 5.0, 12.0);
+    private static final VoxelShape X_STEM_SHAPE = Block.createCuboidShape(4.0, 5.0, 6.0, 12.0, 10.0, 10.0);
+    private static final VoxelShape X_FACE_SHAPE = Block.createCuboidShape(0.0, 10.0, 3.0, 16.0, 16.0, 13.0);
+    private static final VoxelShape X_AXIS_SHAPE = VoxelShapes.union(BASE_SHAPE, X_STEP_SHAPE, X_STEM_SHAPE, X_FACE_SHAPE);
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        return X_AXIS_SHAPE;
+    }
+
+    @Override
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        ItemStack handStack = player.getStackInHand(hand);
+        BlockEntity blockEntity = world.getBlockEntity(pos);
+        if (blockEntity instanceof PedestalBlockEntity pedestalBlockEntity) {
+            ItemStack pedestalStack = pedestalBlockEntity.getItem();
+            if (pedestalStack.isEmpty()) {
+                if (!handStack.isEmpty()) {
+                    if (!world.isClient) {
+                        ItemStack split = handStack.split(1);
+                        pedestalBlockEntity.setItem(split);
+                        //player.setStackInHand(hand, pedestalStack);
+                    }
+                    return ActionResult.success(world.isClient);
+                }
+            } else {
+                if (handStack.isEmpty()) {
+                    if (!world.isClient) {
+                        player.setStackInHand(hand,pedestalStack);
+                        pedestalBlockEntity.setItem(ItemStack.EMPTY);
+                    }
+                    return ActionResult.success(world.isClient);
+                }
+            }
+        }
+
+        return super.onUse(state, world, pos, player, hand, hit);
+    }
+
+    @Nullable
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new PedestalBlockEntity(pos, state);
+    }
+}
diff --git a/src/main/java/dev/overgrown/thaumaturge/block/PedestalBlockEntity.java b/src/main/java/dev/overgrown/thaumaturge/block/PedestalBlockEntity.java
@@ -0,0 +1,83 @@
+package dev.overgrown.thaumaturge.block;
+
+import dev.overgrown.thaumaturge.registry.ModBlocks;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.inventory.Inventories;
+import net.minecraft.inventory.SimpleInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtList;
+import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
+import net.minecraft.util.collection.DefaultedList;
+import net.minecraft.util.math.BlockPos;
+
+public class PedestalBlockEntity extends BlockEntity {
+    public PedestalBlockEntity(BlockPos pos, BlockState state) {
+        super(ModBlocks.PEDESTAL_BE, pos, state);
+    }
+
+    private final SimpleInventory inventory = new SimpleInventory(1) {
+        @Override
+        public void setStack(int slot, ItemStack stack) {
+            super.setStack(slot, stack);
+            PedestalBlockEntity.this.markDirty();
+        }
+
+        @Override
+        public int getMaxCountPerStack() {
+            return 1;
+        }
+    };
+
+    public ItemStack getItem() {
+        return inventory.getStack(0);
+    }
+
+    public void setItem(ItemStack stack){
+        inventory.setStack(0, stack);
+    }
+
+    @Override
+    public void readNbt(NbtCompound nbt) {
+        super.readNbt(nbt);
+        Inventories.readNbt(nbt, this.inventory.stacks);
+    }
+
+    @Override
+    public NbtCompound toInitialChunkDataNbt() {
+        return createNbt();
+    }
+
+    @Override
+    public void markDirty() {
+        super.markDirty();
+        if (world != null) {
+            world.updateListeners(pos, getCachedState(), getCachedState(), 3);
+        }
+    }
+
+    @Override
+    public BlockEntityUpdateS2CPacket toUpdatePacket() {
+        return BlockEntityUpdateS2CPacket.create(this);
+    }
+
+    @Override
+    protected void writeNbt(NbtCompound nbt) {
+        super.writeNbt(nbt);
+        writeNbt(nbt, this.inventory.stacks);
+    }
+
+    public static void writeNbt(NbtCompound nbt, DefaultedList<ItemStack> stacks) {
+        NbtList nbtList = new NbtList();
+
+        for (int i = 0; i < stacks.size(); i++) {
+            ItemStack itemStack = stacks.get(i);
+            NbtCompound nbtCompound = new NbtCompound();
+            nbtCompound.putByte("Slot", (byte)i);
+            itemStack.writeNbt(nbtCompound);
+            nbtList.add(nbtCompound);
+        }
+        nbt.put("Items", nbtList);
+    }
+}
diff --git a/src/main/java/dev/overgrown/thaumaturge/block/PedestalBlockEntityRenderer.java b/src/main/java/dev/overgrown/thaumaturge/block/PedestalBlockEntityRenderer.java
@@ -0,0 +1,39 @@
+package dev.overgrown.thaumaturge.block;
+
+import net.minecraft.client.render.OverlayTexture;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.render.item.ItemRenderer;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.json.ModelTransformationMode;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.RotationAxis;
+
+public class PedestalBlockEntityRenderer implements BlockEntityRenderer<PedestalBlockEntity> {
+
+    private final ItemRenderer itemRenderer;
+    public PedestalBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
+        itemRenderer = ctx.getItemRenderer();
+    }
+    @Override
+    public void render(PedestalBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+            ItemStack stack = entity.getItem();
+            if (!stack.isEmpty()) {
+                matrices.push();
+                //entity.random.setSeed(j);
+                BakedModel bakedModel = this.itemRenderer.getModel(stack, entity.getWorld(), null,0);
+                float m = bakedModel.getTransformation().getTransformation(ModelTransformationMode.GROUND).scale.y();
+                matrices.translate(0.5F, 1 + 0.25F * m, 0.5F);
+                float n = Util.getMeasuringTimeMs()/1000f;
+                matrices.multiply(RotationAxis.POSITIVE_Y.rotation(n));
+                matrices.push();
+                this.itemRenderer
+                        .renderItem(stack, ModelTransformationMode.GROUND, false, matrices, vertexConsumers, light, OverlayTexture.DEFAULT_UV, bakedModel);
+                matrices.pop();
+                matrices.pop();
+            }
+    }
+}
diff --git a/src/main/java/dev/overgrown/thaumaturge/block/focal_manipulator/screen/FocalManipulatorScreenHandler.java b/src/main/java/dev/overgrown/thaumaturge/block/focal_manipulator/screen/FocalManipulatorScreenHandler.java
@@ -41,27 +41,31 @@ public FocalManipulatorScreenHandler(int syncId, PlayerInventory playerInventory
         inventory.onOpen(playerInventory.player);
 
         // Focus slot (bottom left)
-        this.addSlot(new Slot(inventory, 0, 44, 142) {
+        this.addSlot(new Slot(inventory, 0, 31, 190) {
             @Override
             public boolean canInsert(ItemStack stack) {
                 return stack.getItem() instanceof FocusItem;
             }
         });
 
+        int xStart = -56;
+
         // Player main inventory (3 rows, 9 columns) - aligned with inventory texture
-        for (int row = 0; row < 3; ++row) {
-            for (int col = 0; col < 9; ++col) {
+        for (int row = 0; row < 9; ++row) {
+            for (int col = 0; col < 3; ++col) {
                 this.addSlot(new Slot(playerInventory,
-                        col + row * 9 + 9,
-                        INV_START_X + col * SLOT_SIZE,
-                        INV_START_Y + row * SLOT_SIZE));
+                        col + row * 3 + 9,
+                        xStart + col * SLOT_SIZE,
+                        62 + row * SLOT_SIZE));
             }
         }
         // Player hotbar (1 row, 9 columns) - below main inventory
-        for (int col = 0; col < 9; ++col) {
-            this.addSlot(new Slot(playerInventory, col,
-                    INV_START_X + col * SLOT_SIZE,
-                    HOTBAR_Y));
+        for (int col = 0; col < 3; ++col) {
+            for (int row = 0; row < 3; ++row) {
+                this.addSlot(new Slot(playerInventory, col * 3 + row,
+                        xStart + col * SLOT_SIZE,
+                        5 + row * SLOT_SIZE));
+            }
         }
     }
 
diff --git a/src/main/java/dev/overgrown/thaumaturge/data_generator/assets/ModModelProvider.java b/src/main/java/dev/overgrown/thaumaturge/data_generator/assets/ModModelProvider.java
@@ -0,0 +1,25 @@
+package dev.overgrown.thaumaturge.data_generator.assets;
+
+import dev.overgrown.thaumaturge.Thaumaturge;
+import dev.overgrown.thaumaturge.registry.ModBlocks;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.*;
+
+public class ModModelProvider extends FabricModelProvider {
+    public ModModelProvider(FabricDataOutput output) {
+        super(output);
+    }
+
+    @Override
+    public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
+        blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(ModBlocks.PEDESTAL,
+                Thaumaturge.identifier("block/pedestal")));
+    }
+
+    @Override
+    public void generateItemModels(ItemModelGenerator itemModelGenerator) {
+
+    }
+}
diff --git a/src/main/java/dev/overgrown/thaumaturge/mixin/AbstractContainerScreenMixin.java b/src/main/java/dev/overgrown/thaumaturge/mixin/AbstractContainerScreenMixin.java
@@ -0,0 +1,20 @@
+package dev.overgrown.thaumaturge.mixin;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.screen.slot.Slot;
+import org.spongepowered.asm.mixin.Debug;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(HandledScreen.class)
+@Debug(export = true)
+public class AbstractContainerScreenMixin {
+
+    @ModifyVariable(method = "mouseClicked",at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;isClickOutsideBounds(DDIII)Z",shift = At.Shift.BY,by = 2),ordinal = 1)
+    private boolean fixBug(boolean o, @Local Slot clicked) {
+        return clicked == null && o;
+    }
+}
diff --git a/src/main/java/dev/overgrown/thaumaturge/registry/ModBlocks.java b/src/main/java/dev/overgrown/thaumaturge/registry/ModBlocks.java
diff --git a/src/main/java/dev/overgrown/thaumaturge/registry/ModCreativeTabs.java b/src/main/java/dev/overgrown/thaumaturge/registry/ModCreativeTabs.java
diff --git a/src/main/java/dev/overgrown/thaumaturge/registry/ModItems.java b/src/main/java/dev/overgrown/thaumaturge/registry/ModItems.java
diff --git a/src/main/resources/data/thaumaturge/modonomicon/books/apophenia/categories/alchemy.json b/src/main/resources/data/thaumaturge/modonomicon/books/apophenia/categories/alchemy.json
diff --git a/src/main/resources/data/thaumaturge/modonomicon/books/apophenia/categories/infusion.json b/src/main/resources/data/thaumaturge/modonomicon/books/apophenia/categories/infusion.json
diff --git a/src/main/resources/thaumaturge.mixins.json b/src/main/resources/thaumaturge.mixins.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// 1.20.1 2025-12-30T15:41:39.1936437 Thaumaturge/Model Definitions`
	`2`	`+1606e361a951d85d5db82a1ffc043faacafec5b3 assets\thaumaturge\models\item\pedestal.json`
	`3`	`+9afbcd5eab9843dfc27fe548e1637c2e3fc380f4 assets\thaumaturge\blockstates\pedestal.json`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "variants": {
 +    "": {
 +      "model": "thaumaturge:block/pedestal"
 +    }
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "parent": "thaumaturge:block/pedestal"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import dev.overgrown.thaumaturge.data_generator.ModBlockLootTables;`
`4`	`4`	`import dev.overgrown.thaumaturge.data_generator.ModBlockTags;`
`5`	`5`	`import dev.overgrown.thaumaturge.data_generator.ModItemTags;`
	`6`	`+import dev.overgrown.thaumaturge.data_generator.assets.ModModelProvider;`
`6`	`7`	`import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;`
`7`	`8`	`import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;`
`8`	`9`
`@@ -13,5 +14,6 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {`
`13`	`14`	`pack.addProvider(ModBlockLootTables::new);`
`14`	`15`	`pack.addProvider(ModBlockTags::new);`
`15`	`16`	`pack.addProvider(ModItemTags::new);`
	`17`	`+ pack.addProvider(ModModelProvider::new);`
`16`	`18`	`}`
`17`	`19`	`}`