From 77afb084686b1b44be334461b3188fabbe56831f Mon Sep 17 00:00:00 2001 From: Brian Wuest Date: Fri, 20 Sep 2024 06:16:17 -0500 Subject: [PATCH] Code and recipe cleanup --- .../java/com/wuest/prefab/blocks/BlockBoundary.java | 11 ----------- .../java/com/wuest/prefab/blocks/BlockCustomWall.java | 5 ----- .../java/com/wuest/prefab/blocks/BlockDirtStairs.java | 4 ++-- .../com/wuest/prefab/blocks/BlockGrassStairs.java | 3 ++- .../com/wuest/prefab/blocks/BlockLightSwitch.java | 9 +++++---- .../com/wuest/prefab/blocks/BlockPaperLantern.java | 1 - .../java/com/wuest/prefab/blocks/BlockPhasic.java | 1 + src/main/java/com/wuest/prefab/gui/GuiBase.java | 1 - .../com/wuest/prefab/mixins/ClientWorldMixin.java | 7 ++++++- .../prefab/recipe/ConditionedShapelessRecipe.java | 4 ++-- .../prefab/recipe/ConditionedSmeltingRecipe.java | 2 +- .../structures/render/StructureRenderHandler.java | 11 +++++++++-- .../data/prefab/recipes/bundle_of_timber_to_logs.json | 2 +- .../coil_of_lanterns_to_string_of_lanterns.json | 2 +- .../data/prefab/recipes/compressed_dirt_to_dirt.json | 2 +- .../recipes/compressed_glowstone_to_glowstone.json | 2 +- ...ssed_obsidian_from_double_compressed_obsidian.json | 2 +- .../recipes/compressed_obsidian_to_obsidian.json | 2 +- .../compressed_quartz_crete_to_quartz_crete.json | 2 +- .../prefab/recipes/compressed_stone_to_stone.json | 2 +- src/main/resources/data/prefab/recipes/dirt_slab.json | 2 +- .../data/prefab/recipes/dirt_slab_reverse.json | 2 +- .../resources/data/prefab/recipes/dirt_stairs.json | 2 +- .../data/prefab/recipes/dirt_stairs_reverse.json | 2 +- src/main/resources/data/prefab/recipes/dirt_wall.json | 2 +- .../data/prefab/recipes/dirt_wall_reverse.json | 2 +- .../double_compressed_dirt_to_compressed_dirt.json | 2 +- ..._compressed_glowstone_to_compressed_glowstone.json | 2 +- ...essed_quartz_crete_to_compressed_quartz_crete.json | 2 +- .../double_compressed_stone_to_compressed_stone.json | 2 +- .../resources/data/prefab/recipes/grass_slab.json | 2 +- .../data/prefab/recipes/grass_slab_reverse.json | 2 +- .../resources/data/prefab/recipes/grass_stairs.json | 2 +- .../data/prefab/recipes/grass_stairs_reverse.json | 2 +- .../resources/data/prefab/recipes/grass_wall.json | 2 +- .../data/prefab/recipes/grass_wall_reverse.json | 2 +- .../data/prefab/recipes/heap_of_timber_to_bundle.json | 2 +- .../resources/data/prefab/recipes/house_advanced.json | 2 +- .../resources/data/prefab/recipes/house_improved.json | 2 +- .../recipes/lanterns_from_string_of_lanterns.json | 2 +- .../data/prefab/recipes/modern_buildings.json | 9 ++------- .../prefab/recipes/modern_buildings_improved.json | 9 ++------- .../recipes/pallet_of_bricks_to_pile_of_bricks.json | 2 +- .../resources/data/prefab/recipes/paper_lantern.json | 2 +- .../data/prefab/recipes/pile_of_bricks_to_bricks.json | 2 +- .../resources/data/prefab/recipes/quartz_crete.json | 2 +- .../data/prefab/recipes/quartz_crete_smooth.json | 2 +- .../data/prefab/recipes/ton_of_timber_to_heap.json | 2 +- ...e_compressed_stone_to_double_compressed_stone.json | 2 +- 49 files changed, 67 insertions(+), 80 deletions(-) diff --git a/src/main/java/com/wuest/prefab/blocks/BlockBoundary.java b/src/main/java/com/wuest/prefab/blocks/BlockBoundary.java index 6fc37710..75fd41d1 100644 --- a/src/main/java/com/wuest/prefab/blocks/BlockBoundary.java +++ b/src/main/java/com/wuest/prefab/blocks/BlockBoundary.java @@ -54,17 +54,6 @@ public BlockBoundary() { this.registerDefaultState(this.getStateDefinition().any().setValue(Powered, false)); } - /** - * Queries if this block should render in a given layer. - */ - public static boolean canRenderInLayer(RenderType layer) { - // NOTE: This code is in a partial state. Need to find out how to get block state to determine if the block should be rendered this pass. - boolean powered = false;// state.get(Powered); - - // first part is translucent, second is for solid. - return (layer == RenderType.translucent() && !powered) || (layer == RenderType.solid() && powered); - } - @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(BlockBoundary.Powered); diff --git a/src/main/java/com/wuest/prefab/blocks/BlockCustomWall.java b/src/main/java/com/wuest/prefab/blocks/BlockCustomWall.java index 85d6e953..41bf85b1 100644 --- a/src/main/java/com/wuest/prefab/blocks/BlockCustomWall.java +++ b/src/main/java/com/wuest/prefab/blocks/BlockCustomWall.java @@ -96,11 +96,6 @@ public String getSerializedName() { return this.name; } -// public Material getMaterial() { -// return this.material; -// } - - public BlockBehaviour getBlockBehaviour() { return blockBehaviour; } diff --git a/src/main/java/com/wuest/prefab/blocks/BlockDirtStairs.java b/src/main/java/com/wuest/prefab/blocks/BlockDirtStairs.java index 38d44500..d989aa14 100644 --- a/src/main/java/com/wuest/prefab/blocks/BlockDirtStairs.java +++ b/src/main/java/com/wuest/prefab/blocks/BlockDirtStairs.java @@ -7,7 +7,6 @@ import net.minecraft.util.RandomSource; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; /** @@ -20,7 +19,8 @@ public class BlockDirtStairs extends StairBlock implements IGrassSpreadable { * Initializes a new instance of the BlockDirtStairs class. */ public BlockDirtStairs() { - super(Blocks.DIRT.defaultBlockState(), FabricBlockSettings.ofFullCopy(Blocks.DIRT)); + super(Blocks.DIRT.defaultBlockState(), + FabricBlockSettings.ofFullCopy(Blocks.DIRT)); } /** diff --git a/src/main/java/com/wuest/prefab/blocks/BlockGrassStairs.java b/src/main/java/com/wuest/prefab/blocks/BlockGrassStairs.java index cf836091..2bfffcbe 100644 --- a/src/main/java/com/wuest/prefab/blocks/BlockGrassStairs.java +++ b/src/main/java/com/wuest/prefab/blocks/BlockGrassStairs.java @@ -13,6 +13,7 @@ public class BlockGrassStairs extends StairBlock { public BlockGrassStairs() { - super(Blocks.GRASS_BLOCK.defaultBlockState(), FabricBlockSettings.ofFullCopy(Blocks.GRASS_BLOCK)); + super(Blocks.GRASS_BLOCK.defaultBlockState(), + FabricBlockSettings.ofFullCopy(Blocks.GRASS_BLOCK)); } } diff --git a/src/main/java/com/wuest/prefab/blocks/BlockLightSwitch.java b/src/main/java/com/wuest/prefab/blocks/BlockLightSwitch.java index ca05ab5e..d7bed8cb 100644 --- a/src/main/java/com/wuest/prefab/blocks/BlockLightSwitch.java +++ b/src/main/java/com/wuest/prefab/blocks/BlockLightSwitch.java @@ -49,9 +49,7 @@ public class BlockLightSwitch extends TileBlockBase { public static final EnumProperty FACE; public static final BooleanProperty POWERED; -// public static final MapCodec CODEC = ()->{ -// return RecordCodecBuilder.mapCodec((instance -> instance.group(propertiesCodec()).apply(instance,BlockLightSwitch::new))); -// }; + public static final MapCodec CODEC = simpleCodec(BlockLightSwitch::new); static { @@ -96,7 +94,10 @@ public BlockLightSwitch() { .mapColor(MapColor.TERRACOTTA_RED) .pushReaction(PushReaction.DESTROY) .noOcclusion() - .strength(1.5F, 10.0F).noCollission().strength(0.5F).sound(SoundType.WOOD)); + .strength(1.5F, 10.0F) + .noCollission() + .strength(0.5F). + sound(SoundType.WOOD)); this.registerDefaultState(this.defaultBlockState() .setValue(BlockLightSwitch.FACING, Direction.NORTH) diff --git a/src/main/java/com/wuest/prefab/blocks/BlockPaperLantern.java b/src/main/java/com/wuest/prefab/blocks/BlockPaperLantern.java index a3803b97..689d95d5 100644 --- a/src/main/java/com/wuest/prefab/blocks/BlockPaperLantern.java +++ b/src/main/java/com/wuest/prefab/blocks/BlockPaperLantern.java @@ -24,7 +24,6 @@ public class BlockPaperLantern extends Block { * Initializes a new instance of the BlockPaperLantern class. */ public BlockPaperLantern() { - // The "func_226896_b_" function causes the "isSolid" field on the block to be set to false. super(Prefab.SeeThroughImmovable.get() .sound(SoundType.SNOW) .strength(0.6f) diff --git a/src/main/java/com/wuest/prefab/blocks/BlockPhasic.java b/src/main/java/com/wuest/prefab/blocks/BlockPhasic.java index ee6a136b..23448824 100644 --- a/src/main/java/com/wuest/prefab/blocks/BlockPhasic.java +++ b/src/main/java/com/wuest/prefab/blocks/BlockPhasic.java @@ -121,6 +121,7 @@ public BlockState playerWillDestroy(Level world, BlockPos pos, BlockState state, // Set this block and all neighbor Phasic Blocks to base. This will cascade to tall touching Phasic blocks. this.updateNeighborPhasicBlocks(false, world, pos, state, false, false); } + return state; } diff --git a/src/main/java/com/wuest/prefab/gui/GuiBase.java b/src/main/java/com/wuest/prefab/gui/GuiBase.java index 2a89dc00..6443463e 100644 --- a/src/main/java/com/wuest/prefab/gui/GuiBase.java +++ b/src/main/java/com/wuest/prefab/gui/GuiBase.java @@ -354,7 +354,6 @@ protected Tuple getAdjustedXYValue() { * @return Some integer value. */ public int drawString(GuiGraphics guiGraphics, String text, float x, float y, int color) { -// return this.getFontRenderer().wordWrapHeight(text,Integer.parseInt(String.valueOf(y))); guiGraphics.drawWordWrap(font, Utils.createTextComponent(text), (int) x, (int) y, 9999, color); return 0; } diff --git a/src/main/java/com/wuest/prefab/mixins/ClientWorldMixin.java b/src/main/java/com/wuest/prefab/mixins/ClientWorldMixin.java index 82e37bf2..e6c3d17c 100644 --- a/src/main/java/com/wuest/prefab/mixins/ClientWorldMixin.java +++ b/src/main/java/com/wuest/prefab/mixins/ClientWorldMixin.java @@ -4,13 +4,18 @@ import com.wuest.prefab.structures.render.StructureRenderHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.world.entity.Entity; +import org.jetbrains.annotations.Nullable; 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.CallbackInfo; @Mixin(GameRenderer.class) -public class ClientWorldMixin { +public abstract class ClientWorldMixin { + @Shadow public abstract void checkEntityPostEffect(@Nullable Entity entity); + @Inject(method = "renderLevel", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/GameRenderer;renderHand:Z")) public void renderWorldLast(float tickDelta, long limitTime, PoseStack matrix, CallbackInfo ci) { Minecraft prefabMinecraft = Minecraft.getInstance(); diff --git a/src/main/java/com/wuest/prefab/recipe/ConditionedShapelessRecipe.java b/src/main/java/com/wuest/prefab/recipe/ConditionedShapelessRecipe.java index 23a6b8ec..989b7bdc 100644 --- a/src/main/java/com/wuest/prefab/recipe/ConditionedShapelessRecipe.java +++ b/src/main/java/com/wuest/prefab/recipe/ConditionedShapelessRecipe.java @@ -116,8 +116,8 @@ public static class Serializer implements RecipeSerializer { return shapelessRecipe.ingredients; - }), ExtraCodecs.strictOptionalField(Codec.STRING, "config", "").forGetter((shapelessRecipe) -> { - return shapelessRecipe.group; + }), ExtraCodecs.strictOptionalField(Codec.STRING, "configName", "").forGetter((shapelessRecipe) -> { + return shapelessRecipe.configName; })).apply(instance, ConditionedShapelessRecipe::new); }); diff --git a/src/main/java/com/wuest/prefab/recipe/ConditionedSmeltingRecipe.java b/src/main/java/com/wuest/prefab/recipe/ConditionedSmeltingRecipe.java index 0c5155f3..667ec40b 100644 --- a/src/main/java/com/wuest/prefab/recipe/ConditionedSmeltingRecipe.java +++ b/src/main/java/com/wuest/prefab/recipe/ConditionedSmeltingRecipe.java @@ -35,7 +35,7 @@ public static class Serializer implements RecipeSerializer o.result), ExtraCodecs.strictOptionalField(Codec.FLOAT, "experience", 0.1f).forGetter((o) -> o.experience), ExtraCodecs.strictOptionalField(Codec.INT, "cookingtime", 200).forGetter((o) -> o.cookingTime), - ExtraCodecs.strictOptionalField(Codec.STRING, "config", "").forGetter((o) -> o.configName) + ExtraCodecs.strictOptionalField(Codec.STRING, "configName", "").forGetter((o) -> o.configName) ).apply(instance, ConditionedSmeltingRecipe::new) ); diff --git a/src/main/java/com/wuest/prefab/structures/render/StructureRenderHandler.java b/src/main/java/com/wuest/prefab/structures/render/StructureRenderHandler.java index d47c0f5f..3a43437e 100644 --- a/src/main/java/com/wuest/prefab/structures/render/StructureRenderHandler.java +++ b/src/main/java/com/wuest/prefab/structures/render/StructureRenderHandler.java @@ -37,6 +37,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.Shapes; import org.joml.Matrix4f; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -88,10 +89,16 @@ public static void renderPlayerLook(Player player, HitResult src, PoseStack matr MultiBufferSource.BufferSource entityVertexConsumer = Minecraft.getInstance().renderBuffers().bufferSource(); - Frustum frustum = new Frustum(matrixStack.last().pose(), RenderSystem.getProjectionMatrix()); + // Preparing cull frustum + Vec3 playerEyePosition = player.getEyePosition(1.0F); + Matrix4f matrix4f = matrixStack.last().pose(); + Frustum frustum = new Frustum(matrix4f, RenderSystem.getProjectionMatrix()); + frustum.prepare(playerEyePosition.x, playerEyePosition.y, playerEyePosition.z); + + /*Frustum frustum = new Frustum(matrixStack.last().pose(), RenderSystem.getProjectionMatrix()); Vec3i vec = new Vec3i((int) player.getEyePosition(1.0F).x, (int) player.getEyePosition(1.0F).y, (int) player.getEyePosition(1.0F).z); BlockPos cameraPos = new BlockPos(vec); - frustum.prepare(cameraPos.getX(), cameraPos.getY(), cameraPos.getZ()); + frustum.prepare(cameraPos.getX(), cameraPos.getY(), cameraPos.getZ());*/ for (BuildBlock buildBlock : StructureRenderHandler.currentStructure.getBlocks()) { Block foundBlock = BuiltInRegistries.BLOCK.get(buildBlock.getResourceLocation()); diff --git a/src/main/resources/data/prefab/recipes/bundle_of_timber_to_logs.json b/src/main/resources/data/prefab/recipes/bundle_of_timber_to_logs.json index 6fbdcbe4..3f1b76c8 100644 --- a/src/main/resources/data/prefab/recipes/bundle_of_timber_to_logs.json +++ b/src/main/resources/data/prefab/recipes/bundle_of_timber_to_logs.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Bundle of Timber", + "configName": "Bundle of Timber", "group": "Bundle of Timber", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/coil_of_lanterns_to_string_of_lanterns.json b/src/main/resources/data/prefab/recipes/coil_of_lanterns_to_string_of_lanterns.json index 22c68adf..bb463b67 100644 --- a/src/main/resources/data/prefab/recipes/coil_of_lanterns_to_string_of_lanterns.json +++ b/src/main/resources/data/prefab/recipes/coil_of_lanterns_to_string_of_lanterns.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Paper Lantern", + "configName": "Paper Lantern", "group": "Paper Lantern", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/compressed_dirt_to_dirt.json b/src/main/resources/data/prefab/recipes/compressed_dirt_to_dirt.json index 9864e364..90930a45 100644 --- a/src/main/resources/data/prefab/recipes/compressed_dirt_to_dirt.json +++ b/src/main/resources/data/prefab/recipes/compressed_dirt_to_dirt.json @@ -3,7 +3,7 @@ "Compressed dirt to normal dirt" ], "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Dirt", + "configName": "Compressed Dirt", "group": "Compressed Dirt", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/compressed_glowstone_to_glowstone.json b/src/main/resources/data/prefab/recipes/compressed_glowstone_to_glowstone.json index be96d91d..bef86f98 100644 --- a/src/main/resources/data/prefab/recipes/compressed_glowstone_to_glowstone.json +++ b/src/main/resources/data/prefab/recipes/compressed_glowstone_to_glowstone.json @@ -3,7 +3,7 @@ "Compressed Glowstone to glowstone" ], "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Glowstone", + "configName": "Compressed Glowstone", "group": "Compressed Glowstone", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/compressed_obsidian_from_double_compressed_obsidian.json b/src/main/resources/data/prefab/recipes/compressed_obsidian_from_double_compressed_obsidian.json index 83883f79..7a0e9e66 100644 --- a/src/main/resources/data/prefab/recipes/compressed_obsidian_from_double_compressed_obsidian.json +++ b/src/main/resources/data/prefab/recipes/compressed_obsidian_from_double_compressed_obsidian.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Obsidian", + "configName": "Compressed Obsidian", "group": "Compressed Obsidian", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/compressed_obsidian_to_obsidian.json b/src/main/resources/data/prefab/recipes/compressed_obsidian_to_obsidian.json index a98cbd03..f91afa97 100644 --- a/src/main/resources/data/prefab/recipes/compressed_obsidian_to_obsidian.json +++ b/src/main/resources/data/prefab/recipes/compressed_obsidian_to_obsidian.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Obsidian", + "configName": "Compressed Obsidian", "group": "Compressed Obsidian", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/compressed_quartz_crete_to_quartz_crete.json b/src/main/resources/data/prefab/recipes/compressed_quartz_crete_to_quartz_crete.json index 356e819f..741b7d9c 100644 --- a/src/main/resources/data/prefab/recipes/compressed_quartz_crete_to_quartz_crete.json +++ b/src/main/resources/data/prefab/recipes/compressed_quartz_crete_to_quartz_crete.json @@ -3,7 +3,7 @@ "Compressed dirt to normal dirt" ], "type": "prefab:condition_crafting_shapeless", - "config": "Quartz-Crete", + "configName": "Quartz-Crete", "group": "Quartz-Crete", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/compressed_stone_to_stone.json b/src/main/resources/data/prefab/recipes/compressed_stone_to_stone.json index 840ae1de..a2accc91 100644 --- a/src/main/resources/data/prefab/recipes/compressed_stone_to_stone.json +++ b/src/main/resources/data/prefab/recipes/compressed_stone_to_stone.json @@ -3,7 +3,7 @@ "Compressed Stone to normal stone" ], "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Stone", + "configName": "Compressed Stone", "group": "Compressed Stone", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/dirt_slab.json b/src/main/resources/data/prefab/recipes/dirt_slab.json index 07518a84..5ac7a9bd 100644 --- a/src/main/resources/data/prefab/recipes/dirt_slab.json +++ b/src/main/resources/data/prefab/recipes/dirt_slab.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "###" diff --git a/src/main/resources/data/prefab/recipes/dirt_slab_reverse.json b/src/main/resources/data/prefab/recipes/dirt_slab_reverse.json index 4d7dbef8..1fe6458e 100644 --- a/src/main/resources/data/prefab/recipes/dirt_slab_reverse.json +++ b/src/main/resources/data/prefab/recipes/dirt_slab_reverse.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "#", diff --git a/src/main/resources/data/prefab/recipes/dirt_stairs.json b/src/main/resources/data/prefab/recipes/dirt_stairs.json index a4091bd6..cb1983de 100644 --- a/src/main/resources/data/prefab/recipes/dirt_stairs.json +++ b/src/main/resources/data/prefab/recipes/dirt_stairs.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "# ", diff --git a/src/main/resources/data/prefab/recipes/dirt_stairs_reverse.json b/src/main/resources/data/prefab/recipes/dirt_stairs_reverse.json index 3487ad7f..b3f18126 100644 --- a/src/main/resources/data/prefab/recipes/dirt_stairs_reverse.json +++ b/src/main/resources/data/prefab/recipes/dirt_stairs_reverse.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "#", diff --git a/src/main/resources/data/prefab/recipes/dirt_wall.json b/src/main/resources/data/prefab/recipes/dirt_wall.json index f50d5f53..22bae136 100644 --- a/src/main/resources/data/prefab/recipes/dirt_wall.json +++ b/src/main/resources/data/prefab/recipes/dirt_wall.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "###", diff --git a/src/main/resources/data/prefab/recipes/dirt_wall_reverse.json b/src/main/resources/data/prefab/recipes/dirt_wall_reverse.json index c3fbcacc..d13972e9 100644 --- a/src/main/resources/data/prefab/recipes/dirt_wall_reverse.json +++ b/src/main/resources/data/prefab/recipes/dirt_wall_reverse.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "#" diff --git a/src/main/resources/data/prefab/recipes/double_compressed_dirt_to_compressed_dirt.json b/src/main/resources/data/prefab/recipes/double_compressed_dirt_to_compressed_dirt.json index 691d70e1..c028cd23 100644 --- a/src/main/resources/data/prefab/recipes/double_compressed_dirt_to_compressed_dirt.json +++ b/src/main/resources/data/prefab/recipes/double_compressed_dirt_to_compressed_dirt.json @@ -3,7 +3,7 @@ "Double compressed dirt to compressed dirt" ], "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Dirt", + "configName": "Compressed Dirt", "group": "Compressed Dirt", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/double_compressed_glowstone_to_compressed_glowstone.json b/src/main/resources/data/prefab/recipes/double_compressed_glowstone_to_compressed_glowstone.json index d0e78d28..ed3a155f 100644 --- a/src/main/resources/data/prefab/recipes/double_compressed_glowstone_to_compressed_glowstone.json +++ b/src/main/resources/data/prefab/recipes/double_compressed_glowstone_to_compressed_glowstone.json @@ -3,7 +3,7 @@ "Double compressed glowstone to compressed glowstone" ], "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Glowstone", + "configName": "Compressed Glowstone", "group": "Compressed Glowstone", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/double_compressed_quartz_crete_to_compressed_quartz_crete.json b/src/main/resources/data/prefab/recipes/double_compressed_quartz_crete_to_compressed_quartz_crete.json index e4ba76c4..bc72af38 100644 --- a/src/main/resources/data/prefab/recipes/double_compressed_quartz_crete_to_compressed_quartz_crete.json +++ b/src/main/resources/data/prefab/recipes/double_compressed_quartz_crete_to_compressed_quartz_crete.json @@ -3,7 +3,7 @@ "Compressed dirt to normal dirt" ], "type": "prefab:condition_crafting_shapeless", - "config": "Quartz-Crete", + "configName": "Quartz-Crete", "group": "Quartz-Crete", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/double_compressed_stone_to_compressed_stone.json b/src/main/resources/data/prefab/recipes/double_compressed_stone_to_compressed_stone.json index a64b7093..be7f0df2 100644 --- a/src/main/resources/data/prefab/recipes/double_compressed_stone_to_compressed_stone.json +++ b/src/main/resources/data/prefab/recipes/double_compressed_stone_to_compressed_stone.json @@ -3,7 +3,7 @@ "Double compressed Stone to compressed stone" ], "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Stone", + "configName": "Compressed Stone", "group": "Compressed Stone", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/grass_slab.json b/src/main/resources/data/prefab/recipes/grass_slab.json index 5759175d..a816496a 100644 --- a/src/main/resources/data/prefab/recipes/grass_slab.json +++ b/src/main/resources/data/prefab/recipes/grass_slab.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "###" diff --git a/src/main/resources/data/prefab/recipes/grass_slab_reverse.json b/src/main/resources/data/prefab/recipes/grass_slab_reverse.json index 6d0cbeca..3a75e462 100644 --- a/src/main/resources/data/prefab/recipes/grass_slab_reverse.json +++ b/src/main/resources/data/prefab/recipes/grass_slab_reverse.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "#", diff --git a/src/main/resources/data/prefab/recipes/grass_stairs.json b/src/main/resources/data/prefab/recipes/grass_stairs.json index edee9852..68130009 100644 --- a/src/main/resources/data/prefab/recipes/grass_stairs.json +++ b/src/main/resources/data/prefab/recipes/grass_stairs.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "# ", diff --git a/src/main/resources/data/prefab/recipes/grass_stairs_reverse.json b/src/main/resources/data/prefab/recipes/grass_stairs_reverse.json index 692070ea..65f304ad 100644 --- a/src/main/resources/data/prefab/recipes/grass_stairs_reverse.json +++ b/src/main/resources/data/prefab/recipes/grass_stairs_reverse.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "#", diff --git a/src/main/resources/data/prefab/recipes/grass_wall.json b/src/main/resources/data/prefab/recipes/grass_wall.json index 5b87f689..05e96350 100644 --- a/src/main/resources/data/prefab/recipes/grass_wall.json +++ b/src/main/resources/data/prefab/recipes/grass_wall.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "###", diff --git a/src/main/resources/data/prefab/recipes/grass_wall_reverse.json b/src/main/resources/data/prefab/recipes/grass_wall_reverse.json index 08596110..bd19ee12 100644 --- a/src/main/resources/data/prefab/recipes/grass_wall_reverse.json +++ b/src/main/resources/data/prefab/recipes/grass_wall_reverse.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Dirt Recipes", + "configName": "Dirt Recipes", "group": "Dirt Recipes", "pattern": [ "#" diff --git a/src/main/resources/data/prefab/recipes/heap_of_timber_to_bundle.json b/src/main/resources/data/prefab/recipes/heap_of_timber_to_bundle.json index bd0eb32e..32f10443 100644 --- a/src/main/resources/data/prefab/recipes/heap_of_timber_to_bundle.json +++ b/src/main/resources/data/prefab/recipes/heap_of_timber_to_bundle.json @@ -3,7 +3,7 @@ "Heap of timber to bundle of timber" ], "type": "prefab:condition_crafting_shapeless", - "config": "Heap of Timber", + "configName": "Heap of Timber", "group": "Heap of Timber", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/house_advanced.json b/src/main/resources/data/prefab/recipes/house_advanced.json index e7539122..9c9a9130 100644 --- a/src/main/resources/data/prefab/recipes/house_advanced.json +++ b/src/main/resources/data/prefab/recipes/house_advanced.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Advanced House", + "configName": "Advanced House", "group": "Advanced House", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/house_improved.json b/src/main/resources/data/prefab/recipes/house_improved.json index 0cf02f10..892e87ff 100644 --- a/src/main/resources/data/prefab/recipes/house_improved.json +++ b/src/main/resources/data/prefab/recipes/house_improved.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Improved House", + "configName": "Improved House", "group": "Improved House", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/lanterns_from_string_of_lanterns.json b/src/main/resources/data/prefab/recipes/lanterns_from_string_of_lanterns.json index ff71a6f0..c9652935 100644 --- a/src/main/resources/data/prefab/recipes/lanterns_from_string_of_lanterns.json +++ b/src/main/resources/data/prefab/recipes/lanterns_from_string_of_lanterns.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Paper Lantern", + "configName": "Paper Lantern", "group": "Paper Lantern", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/modern_buildings.json b/src/main/resources/data/prefab/recipes/modern_buildings.json index 523c159d..a6958963 100644 --- a/src/main/resources/data/prefab/recipes/modern_buildings.json +++ b/src/main/resources/data/prefab/recipes/modern_buildings.json @@ -1,11 +1,6 @@ { - "conditions": [ - { - "type": "prefab:config_recipe", - "recipeKey": "Modern Buildings" - } - ], - "type": "minecraft:crafting_shaped", + "type": "prefab:condition_crafting_shaped", + "configName": "Modern Buildings", "group": "Modern Buildings", "pattern": [ "a a", diff --git a/src/main/resources/data/prefab/recipes/modern_buildings_improved.json b/src/main/resources/data/prefab/recipes/modern_buildings_improved.json index 82aabae5..36c19b02 100644 --- a/src/main/resources/data/prefab/recipes/modern_buildings_improved.json +++ b/src/main/resources/data/prefab/recipes/modern_buildings_improved.json @@ -1,11 +1,6 @@ { - "conditions": [ - { - "type": "prefab:config_recipe", - "recipeKey": "Modern Buildings" - } - ], - "type": "minecraft:crafting_shaped", + "type": "prefab:condition_crafting_shaped", + "configName": "Modern Buildings", "group": "Modern Buildings", "pattern": [ "a a", diff --git a/src/main/resources/data/prefab/recipes/pallet_of_bricks_to_pile_of_bricks.json b/src/main/resources/data/prefab/recipes/pallet_of_bricks_to_pile_of_bricks.json index cffe2f83..047b9da1 100644 --- a/src/main/resources/data/prefab/recipes/pallet_of_bricks_to_pile_of_bricks.json +++ b/src/main/resources/data/prefab/recipes/pallet_of_bricks_to_pile_of_bricks.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Pile of Bricks", + "configName": "Pile of Bricks", "group": "Pile of Bricks", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/paper_lantern.json b/src/main/resources/data/prefab/recipes/paper_lantern.json index 5f2a4786..24849253 100644 --- a/src/main/resources/data/prefab/recipes/paper_lantern.json +++ b/src/main/resources/data/prefab/recipes/paper_lantern.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Paper Lantern", + "configName": "Paper Lantern", "group": "Paper Lantern", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/pile_of_bricks_to_bricks.json b/src/main/resources/data/prefab/recipes/pile_of_bricks_to_bricks.json index 6168d9ad..4d918fb1 100644 --- a/src/main/resources/data/prefab/recipes/pile_of_bricks_to_bricks.json +++ b/src/main/resources/data/prefab/recipes/pile_of_bricks_to_bricks.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shapeless", - "config": "Pile of Bricks", + "configName": "Pile of Bricks", "group": "Pile of Bricks", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/quartz_crete.json b/src/main/resources/data/prefab/recipes/quartz_crete.json index b4dd8de7..b97dd91d 100644 --- a/src/main/resources/data/prefab/recipes/quartz_crete.json +++ b/src/main/resources/data/prefab/recipes/quartz_crete.json @@ -1,6 +1,6 @@ { "type": "prefab:condition_crafting_shaped", - "config": "Quartz-Crete", + "configName": "Quartz-Crete", "group": "Quartz-Crete", "pattern": [ "aaa", diff --git a/src/main/resources/data/prefab/recipes/quartz_crete_smooth.json b/src/main/resources/data/prefab/recipes/quartz_crete_smooth.json index d6891fa8..83ab45bc 100644 --- a/src/main/resources/data/prefab/recipes/quartz_crete_smooth.json +++ b/src/main/resources/data/prefab/recipes/quartz_crete_smooth.json @@ -1,7 +1,7 @@ { "type": "prefab:condition_smelting", "group": "Quartz-Crete", - "config": "Quartz-Crete", + "configName": "Quartz-Crete", "category": "blocks", "ingredient": { "item": "prefab:block_quartz_crete" diff --git a/src/main/resources/data/prefab/recipes/ton_of_timber_to_heap.json b/src/main/resources/data/prefab/recipes/ton_of_timber_to_heap.json index fe6d842b..683d06f9 100644 --- a/src/main/resources/data/prefab/recipes/ton_of_timber_to_heap.json +++ b/src/main/resources/data/prefab/recipes/ton_of_timber_to_heap.json @@ -3,7 +3,7 @@ "Ton of timber to heap of timber" ], "type": "prefab:condition_crafting_shapeless", - "config": "Ton of Timber", + "configName": "Ton of Timber", "group": "Ton of Timber", "ingredients": [ { diff --git a/src/main/resources/data/prefab/recipes/triple_compressed_stone_to_double_compressed_stone.json b/src/main/resources/data/prefab/recipes/triple_compressed_stone_to_double_compressed_stone.json index 2800a494..09eaf6e8 100644 --- a/src/main/resources/data/prefab/recipes/triple_compressed_stone_to_double_compressed_stone.json +++ b/src/main/resources/data/prefab/recipes/triple_compressed_stone_to_double_compressed_stone.json @@ -3,7 +3,7 @@ "Triple compressed Stone to double compressed stone" ], "type": "prefab:condition_crafting_shapeless", - "config": "Compressed Stone", + "configName": "Compressed Stone", "group": "Compressed Stone", "ingredients": [ {