From 5378442a53588db7420fafe4d49ba8ed532b5ba7 Mon Sep 17 00:00:00 2001 From: woodiertexas Date: Sat, 11 Jan 2025 20:12:46 -0800 Subject: [PATCH] get minimal version of arch-ex 4.0 working --- README.md | 2 +- gradle.properties | 2 +- .../ArchExItemGroups.java | 34 +++++++ .../ArchitectureExtensions.java | 29 ++++++ .../ArchitectureExtensionsBlocks.java | 23 +++++ .../blocks/BeamBlock.java | 89 +++++++++++++++++++ .../blockstates/birch_beam.json | 16 ++++ .../models/block/birch_beam.json | 7 ++ .../models/block/template_beam.json | 51 +++++++++++ .../models/item/birch_beam.json | 3 + .../recipes/debuggy_block.json | 38 -------- .../recipes/end_rod_with_nub.json | 12 --- .../recipes/end_rod_without_nub.json | 12 --- .../recipes/fake_end_portal_block.json | 21 ----- .../templates/recipe/bamboo_rod.json | 17 ---- .../templates/recipe/copper_rod.json | 17 ---- .../templates/recipe/fence_to_post.json | 20 ----- .../templates/recipe/h_beam.json | 19 ---- .../templates/recipe/i_beam.json | 16 ---- .../templates/recipe/iron_rod.json | 17 ---- .../templates/recipe/post_to_fence.json | 20 ----- .../templates/recipe/post_to_wall.json | 20 ----- .../templates/recipe/sawing.json | 10 --- .../templates/recipe/stonecutting.json | 8 -- .../templates/recipe/tube_metal.json | 17 ---- .../templates/recipe/wall_to_post.json | 20 ----- src/main/resources/fabric.mod.json | 6 +- src/main/resources/quilt.mod.json | 56 ------------ 28 files changed, 258 insertions(+), 344 deletions(-) create mode 100644 src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java create mode 100644 src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensions.java create mode 100644 src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java create mode 100644 src/main/java/gay/debuggy/architecture_extensions/blocks/BeamBlock.java create mode 100644 src/main/resources/assets/architecture_extensions/blockstates/birch_beam.json create mode 100644 src/main/resources/assets/architecture_extensions/models/block/birch_beam.json create mode 100644 src/main/resources/assets/architecture_extensions/models/block/template_beam.json create mode 100644 src/main/resources/assets/architecture_extensions/models/item/birch_beam.json delete mode 100644 src/main/resources/data/architecture_extensions/recipes/debuggy_block.json delete mode 100644 src/main/resources/data/architecture_extensions/recipes/end_rod_with_nub.json delete mode 100644 src/main/resources/data/architecture_extensions/recipes/end_rod_without_nub.json delete mode 100644 src/main/resources/data/architecture_extensions/recipes/fake_end_portal_block.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/bamboo_rod.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/copper_rod.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/fence_to_post.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/h_beam.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/i_beam.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/iron_rod.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/post_to_fence.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/post_to_wall.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/sawing.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/stonecutting.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/tube_metal.json delete mode 100644 src/main/resources/data/architecture_extensions/templates/recipe/wall_to_post.json delete mode 100644 src/main/resources/quilt.mod.json diff --git a/README.md b/README.md index 4f6aa40..96e2b6a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## 4.0 Goals - [ ] Use Debuggycore datagen when that's a thing -- [ ] Change modid to `arch_ex` (?) +- [ ] Change modid to `architecture_extensions` (?) - [ ] Migrate over to Quilt Static Resources API when its a thing - [ ] Use other Quilt APIs when appropriate (ex: Recipe API) - [ ] Figure out the creative tab situation because currently, its a mess diff --git a/gradle.properties b/gradle.properties index 1f8c119..382e314 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ loader_version=0.16.9 # Mod Properties mod_version=4.0.0+mc1.20.1 maven_group=gay.debuggy -archives_base_name=arch_ex +archives_base_name=architecture_extensions # Dependencies fabric_version=0.92.3+1.20.1 diff --git a/src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java b/src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java new file mode 100644 index 0000000..4e7ad4f --- /dev/null +++ b/src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java @@ -0,0 +1,34 @@ +package gay.debuggy.architecture_extensions; + +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.minecraft.block.Blocks; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKey; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +import static gay.debuggy.architecture_extensions.ArchitectureExtensions.MOD_ID; +import static gay.debuggy.architecture_extensions.ArchitectureExtensionsBlocks.BIRCH_BEAM; + +public class ArchExItemGroups { + public static RegistryKey makeItemGroupKey(String mod_id, String itemGroupPath) { + return RegistryKey.of(Registries.ITEM_GROUP.getKey(), new Identifier(mod_id, itemGroupPath)); + } + + public static final RegistryKey ARCH_EX_JSON_BLOCKS_KEY = makeItemGroupKey(MOD_ID, "json_blocks"); + public static final RegistryKey ARCH_EX_GLTF_BLOCKS_KEY = makeItemGroupKey(MOD_ID, "gltf_blocks"); + + public static final ItemGroup ARCH_EX_JSON_BLOCKS = FabricItemGroup.builder() + .icon(() -> new ItemStack(BIRCH_BEAM)) + .name(Text.of("Arch-Ex Building Blocks")) + .build(); + + public static final ItemGroup ARCH_EX_GLTF_BLOCKS = FabricItemGroup.builder() + .icon(() -> new ItemStack(Blocks.ACACIA_LEAVES)) + .name(Text.of("Arch-Ex Building Blocks")) + .build(); + + public static void init() {} +} diff --git a/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensions.java b/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensions.java new file mode 100644 index 0000000..2ee0e35 --- /dev/null +++ b/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensions.java @@ -0,0 +1,29 @@ +package gay.debuggy.architecture_extensions; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; + +import static gay.debuggy.architecture_extensions.ArchitectureExtensionsBlocks.BIRCH_BEAM; + +public class ArchitectureExtensions implements ModInitializer { + public static final String MOD_ID = "architecture_extensions"; + + @Override + public void onInitialize() { + Registry.register(Registries.ITEM_GROUP, ArchExItemGroups.ARCH_EX_JSON_BLOCKS_KEY, ArchExItemGroups.ARCH_EX_JSON_BLOCKS); + Registry.register(Registries.ITEM_GROUP, ArchExItemGroups.ARCH_EX_GLTF_BLOCKS_KEY, ArchExItemGroups.ARCH_EX_GLTF_BLOCKS); + + ItemGroupEvents.modifyEntriesEvent(ArchExItemGroups.ARCH_EX_JSON_BLOCKS_KEY).register(itemGroup -> { + itemGroup.addItem(BIRCH_BEAM); + }); + + ItemGroupEvents.modifyEntriesEvent(ArchExItemGroups.ARCH_EX_GLTF_BLOCKS_KEY).register(itemGroup -> { + itemGroup.addItem(BIRCH_BEAM); + }); + + ArchitectureExtensionsBlocks.init(); + ArchExItemGroups.init(); + } +} diff --git a/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java b/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java new file mode 100644 index 0000000..e0fe55c --- /dev/null +++ b/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java @@ -0,0 +1,23 @@ +package gay.debuggy.architecture_extensions; + +import gay.debuggy.architecture_extensions.blocks.BeamBlock; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class ArchitectureExtensionsBlocks { + private static T registerBlock(String path, T block) { + Registry.register(Registries.BLOCK, new Identifier(ArchitectureExtensions.MOD_ID, path), block); + Registry.register(Registries.ITEM, new Identifier(ArchitectureExtensions.MOD_ID, path), new BlockItem(block, new Item.Settings())); + return block; + } + + public static final BeamBlock BIRCH_BEAM = registerBlock("birch_beam", new BeamBlock(FabricBlockSettings.copyOf(Blocks.BIRCH_LOG))); + + public static void init() {} +} diff --git a/src/main/java/gay/debuggy/architecture_extensions/blocks/BeamBlock.java b/src/main/java/gay/debuggy/architecture_extensions/blocks/BeamBlock.java new file mode 100644 index 0000000..dafcf9e --- /dev/null +++ b/src/main/java/gay/debuggy/architecture_extensions/blocks/BeamBlock.java @@ -0,0 +1,89 @@ +package gay.debuggy.architecture_extensions.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.PillarBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; +import org.joml.Vector3d; + +public class BeamBlock extends PillarBlock implements Waterloggable { + public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; + + protected static final VoxelShape X_AXIS_BOX = Block.createCuboidShape(0.0, 2.0, 2.0, 16.0, 14.0, 14.0); + protected static final VoxelShape Y_AXIS_BOX = Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 16.0, 14.0); + protected static final VoxelShape Z_AXIS_BOX = Block.createCuboidShape(2.0, 2.0, 0.0, 14.0, 14.0, 16.0); + + public BeamBlock(Settings settings) { + super(settings); + setDefaultState(this.stateManager.getDefaultState().with(AXIS, Direction.Axis.Y)); + this.setDefaultState(this.getDefaultState().with(WATERLOGGED, false)); // Thanks LambdAurora! + } + + // The following deals with block rotation + @Override + public BlockState rotate(BlockState state, BlockRotation rotation) { + return changeRotation(state, rotation); + } + + public static BlockState changeRotation(BlockState state, BlockRotation rotation) { + return switch (rotation) { + case COUNTERCLOCKWISE_90, CLOCKWISE_90 -> switch (state.get(AXIS)) { + case X -> state.with(AXIS, Direction.Axis.Z); + case Z -> state.with(AXIS, Direction.Axis.X); + default -> state; + }; + default -> state; + }; + } + + // Both of the following blocks of code below deals with block collision. + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { + Direction.Axis cardinalDir = state.get(AXIS); + return switch (cardinalDir) { + case X -> X_AXIS_BOX; + case Y -> Y_AXIS_BOX; + case Z -> Z_AXIS_BOX; + }; + } + + // Deals with placing the block properly in accordance to direction. + @Override + public BlockState getPlacementState(ItemPlacementContext context) { + return this.getDefaultState().with(AXIS, context.getSide().getAxis()).with(WATERLOGGED, context.getWorld().getFluidState(context.getBlockPos()).getFluid() == Fluids.WATER); + } + + // Deals with block waterlogging. Thanks acikek! + @Override + public FluidState getFluidState(BlockState state) { + return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state); + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + if (state.get(WATERLOGGED)) { + world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + } + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + } + + // Appending block properties + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(new Property[]{AXIS, WATERLOGGED}); + } +} diff --git a/src/main/resources/assets/architecture_extensions/blockstates/birch_beam.json b/src/main/resources/assets/architecture_extensions/blockstates/birch_beam.json new file mode 100644 index 0000000..4034583 --- /dev/null +++ b/src/main/resources/assets/architecture_extensions/blockstates/birch_beam.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "architecture_extensions:block/birch_beam", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "architecture_extensions:block/birch_beam" + }, + "axis=z": { + "model": "architecture_extensions:block/birch_beam", + "x": 90 + } + } +} diff --git a/src/main/resources/assets/architecture_extensions/models/block/birch_beam.json b/src/main/resources/assets/architecture_extensions/models/block/birch_beam.json new file mode 100644 index 0000000..3e18f63 --- /dev/null +++ b/src/main/resources/assets/architecture_extensions/models/block/birch_beam.json @@ -0,0 +1,7 @@ +{ + "parent": "architecture_extensions:block/template_beam", + "textures": { + "texture_side": "minecraft:block/stripped_birch_log", + "texture_up": "minecraft:block/stripped_birch_log_top" + } +} diff --git a/src/main/resources/assets/architecture_extensions/models/block/template_beam.json b/src/main/resources/assets/architecture_extensions/models/block/template_beam.json new file mode 100644 index 0000000..15fb043 --- /dev/null +++ b/src/main/resources/assets/architecture_extensions/models/block/template_beam.json @@ -0,0 +1,51 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#texture_side" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#texture_side"}, + "east": {"uv": [2, 0, 14, 16], "texture": "#texture_side"}, + "south": {"uv": [2, 0, 14, 16], "texture": "#texture_side"}, + "west": {"uv": [2, 0, 14, 16], "texture": "#texture_side"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#texture_up", "cullface": "up"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#texture_up", "cullface": "down"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} diff --git a/src/main/resources/assets/architecture_extensions/models/item/birch_beam.json b/src/main/resources/assets/architecture_extensions/models/item/birch_beam.json new file mode 100644 index 0000000..2cc7c9c --- /dev/null +++ b/src/main/resources/assets/architecture_extensions/models/item/birch_beam.json @@ -0,0 +1,3 @@ +{ + "parent": "architecture_extensions:block/birch_beam" +} diff --git a/src/main/resources/data/architecture_extensions/recipes/debuggy_block.json b/src/main/resources/data/architecture_extensions/recipes/debuggy_block.json deleted file mode 100644 index b87df71..0000000 --- a/src/main/resources/data/architecture_extensions/recipes/debuggy_block.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "BCL", - "M W", - "PRY" - ], - "key": { - "B": { - "item": "minecraft:blue_dye" - }, - "C": { - "item": "minecraft:cyan_dye" - }, - "L": { - "item": "minecraft:light_blue_dye" - }, - "M": { - "item": "minecraft:magenta_dye" - }, - "W": { - "item": "minecraft:white_dye" - }, - "P": { - "item": "minecraft:pink_dye" - }, - "R": { - "item": "minecraft:red_dye" - }, - "Y": { - "item": "minecraft:yellow_dye" - } - }, - "result": { - "item": "architecture_extensions:debuggy_block", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/recipes/end_rod_with_nub.json b/src/main/resources/data/architecture_extensions/recipes/end_rod_with_nub.json deleted file mode 100644 index 51ac175..0000000 --- a/src/main/resources/data/architecture_extensions/recipes/end_rod_with_nub.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "architecture_extensions:end_rod_nubless" - } - ], - "result": { - "item": "minecraft:end_rod", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/recipes/end_rod_without_nub.json b/src/main/resources/data/architecture_extensions/recipes/end_rod_without_nub.json deleted file mode 100644 index b2db4e0..0000000 --- a/src/main/resources/data/architecture_extensions/recipes/end_rod_without_nub.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:end_rod" - } - ], - "result": { - "item": "architecture_extensions:end_rod_nubless", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/recipes/fake_end_portal_block.json b/src/main/resources/data/architecture_extensions/recipes/fake_end_portal_block.json deleted file mode 100644 index d7e2349..0000000 --- a/src/main/resources/data/architecture_extensions/recipes/fake_end_portal_block.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:black_wool" - }, - { - "item": "minecraft:black_wool" - }, - { - "item": "minecraft:black_wool" - }, - { - "item": "minecraft:white_dye" - } - ], - "result": { - "item": "architecture_extensions:fake_end_portal_block", - "count": 3 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/bamboo_rod.json b/src/main/resources/data/architecture_extensions/templates/recipe/bamboo_rod.json deleted file mode 100644 index bca2b47..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/bamboo_rod.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#", - "#" - ], - "key": { - "#": { - "item": "{group}" - } - }, - "result": { - "item": "{result}", - "count": 6 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/copper_rod.json b/src/main/resources/data/architecture_extensions/templates/recipe/copper_rod.json deleted file mode 100644 index 38ca0b5..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/copper_rod.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " c", - " c ", - "c " - ], - "key": { - "c": { - "item": "{group}_ingot" - } - }, - "result": { - "item": "{result}", - "count": 8 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/fence_to_post.json b/src/main/resources/data/architecture_extensions/templates/recipe/fence_to_post.json deleted file mode 100644 index 1e1b39e..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/fence_to_post.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:registry_contains", - "values": [ - "{group}_fence" - ] - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "{group}_fence" - } - ], - "result": { - "item": "{result}", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/h_beam.json b/src/main/resources/data/architecture_extensions/templates/recipe/h_beam.json deleted file mode 100644 index 6a16c08..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/h_beam.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "iii", - " I ", - "iii" - ], - "key": { - "i": { - "item": "{group}_ingot" - }, - "I": { - "item": "{group}_block" - } - }, - "result": { - "item": "{result}" - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/i_beam.json b/src/main/resources/data/architecture_extensions/templates/recipe/i_beam.json deleted file mode 100644 index 4c42aab..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/i_beam.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "iii", - " i ", - "iii" - ], - "key": { - "i": { - "item": "{group}_ingot" - } - }, - "result": { - "item": "{result}" - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/iron_rod.json b/src/main/resources/data/architecture_extensions/templates/recipe/iron_rod.json deleted file mode 100644 index fa19b91..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/iron_rod.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " i", - " i ", - "i " - ], - "key": { - "i": { - "item": "{group}_ingot" - } - }, - "result": { - "item": "{result}", - "count": 8 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/post_to_fence.json b/src/main/resources/data/architecture_extensions/templates/recipe/post_to_fence.json deleted file mode 100644 index cd838ef..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/post_to_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:registry_contains", - "values": [ - "{group}_fence" - ] - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "{result}" - } - ], - "result": { - "item": "{group}_fence", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/post_to_wall.json b/src/main/resources/data/architecture_extensions/templates/recipe/post_to_wall.json deleted file mode 100644 index 6178fee..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/post_to_wall.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:registry_contains", - "values": [ - "{group}_wall" - ] - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "{result}" - } - ], - "result": { - "item": "{group}_wall", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/sawing.json b/src/main/resources/data/architecture_extensions/templates/recipe/sawing.json deleted file mode 100644 index 9e3e68e..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/sawing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "input": { - "item": "{group}_planks", - "count": 1 - }, - "result": { - "item": "{result}", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/stonecutting.json b/src/main/resources/data/architecture_extensions/templates/recipe/stonecutting.json deleted file mode 100644 index d4ab091..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "{base}" - }, - "result": "{result}", - "count": 1 -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/tube_metal.json b/src/main/resources/data/architecture_extensions/templates/recipe/tube_metal.json deleted file mode 100644 index 321d0d0..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/tube_metal.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "iii", - "i i", - "iii" - ], - "key": { - "i": { - "item": "{group}_ingot" - } - }, - "result": { - "item": "{result}", - "count": 1 - } -} diff --git a/src/main/resources/data/architecture_extensions/templates/recipe/wall_to_post.json b/src/main/resources/data/architecture_extensions/templates/recipe/wall_to_post.json deleted file mode 100644 index 85ceb98..0000000 --- a/src/main/resources/data/architecture_extensions/templates/recipe/wall_to_post.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:registry_contains", - "values": [ - "{group}_wall" - ] - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "{group}_wall" - } - ], - "result": { - "item": "{result}", - "count": 1 - } -} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f612a4c..ab348e7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "arch_ex", + "id": "architecture_extensions", "version": "${version}", "name": "Architecture Extensions", "description": "Make more detailed builds with all kinds of new building blocks and shapes.", @@ -20,7 +20,9 @@ "license": "MIT", "icon": "assets/architecture_extensions/icon.png", "environment": "*", - "entrypoints": {}, + "entrypoints": { + "main": ["gay.debuggy.architecture_extensions.ArchitectureExtensions"] + }, "mixins": [], "depends": { "fabricloader": ">=0.16.9", diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json deleted file mode 100644 index c85509a..0000000 --- a/src/main/resources/quilt.mod.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "schema_version": 1, - "quilt_loader": { - "group": "io.github.debuggyteam", - "id": "architecture_extensions", - "version": "${version}", - "metadata": { - "name": "Architecture Extensions", - "description": "A mod that allows you to make more detailed builds with all kinds of new building blocks and shapes.", - "contributors": { - "Debuggy Team": "Owner", - "woodiertexas": "Author", - "maximum": "Rewrite", - "Falkreon": "Additional Code", - "Crackers0106": "Mod Icon", - "Carter": "Textures + Block model fixes", - "Azagwen": "Block Models" - }, - "contact": { - "homepage": "https://modrinth.com/mod/arch-ex", - "discord": "https://debuggy.gay/discord", - "issues": "https://github.com/debuggyteam/architecture-extensions/issues", - "sources": "https://github.com/debuggyteam/architecture-extensions" - }, - "icon": "assets/architecture_extensions/icon.png" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": "io.github.debuggyteam.architecture_extensions.ArchitectureExtensions", - "client_init": "io.github.debuggyteam.architecture_extensions.client.ArchitectureExtensionsClient" - }, - "depends": [ - { - "id": "quilt_loader", - "versions": ">=0.24.0" - }, - { - "id": "quilted_fabric_api", - "versions": ">=7.0.1+0.83.0-1.20" - }, - { - "id": "minecraft", - "versions": ">=1.20.4" - }, - { - "id": "staticdata", - "versions": ">=1.1.0+1.20.4" - }, - { - "id": "suspicious_shapes", - "versions": ">=1.0.5+1.20.4" - } - ] - }, - "mixin": ["architecture_extensions.mixins.json"] -}