Code and recipe cleanup

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<Block, BlockState> builder) {
         builder.add(BlockBoundary.Powered);

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;
         }

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));
     }
 
     /**

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));
     }
 }

src/main/java/com/wuest/prefab/blocks/BlockLightSwitch.java

@@ -49,9 +49,7 @@ public class BlockLightSwitch extends TileBlockBase<LightSwitchBlockEntity> {
     public static final EnumProperty<AttachFace> FACE;
 
     public static final BooleanProperty POWERED;
-//    public static final MapCodec<BlockLightSwitch> CODEC = ()->{
-//        return RecordCodecBuilder.mapCodec((instance -> instance.group(propertiesCodec()).apply(instance,BlockLightSwitch::new)));
-//    };
+
     public static final MapCodec<BlockLightSwitch> 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)

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)

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;
     }
 

src/main/java/com/wuest/prefab/gui/GuiBase.java

@@ -354,7 +354,6 @@ protected Tuple<Integer, Integer> 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;
     }

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();

src/main/java/com/wuest/prefab/recipe/ConditionedShapelessRecipe.java

@@ -116,8 +116,8 @@ public static class Serializer implements RecipeSerializer<ConditionedShapelessR
                         }
                     }, DataResult::success).forGetter((shapelessRecipe) -> {
                         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);
         });
 

src/main/java/com/wuest/prefab/recipe/ConditionedSmeltingRecipe.java

@@ -35,7 +35,7 @@ public static class Serializer implements RecipeSerializer<ConditionedSmeltingRe
                         ItemStack.CODEC.fieldOf("result").forGetter((o) -> 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)
         );

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());

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": [
     {

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": [
     {

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": [
     {

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": [
     {

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": [
     {

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": [
     {

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": [
     {

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": [
     {

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": [
     "###"

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": [
     "#",

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": [
     "#  ",

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": [
     "#",

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": [
     "###",

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": [
     "#"

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": [
     {

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": [
     {

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": [
     {

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": [
     {

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": [
     "###"

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": [
     "#",

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": [
     "#  ",

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": [
     "#",

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": [
     "###",

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": [
     "#"

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": [
     {

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": [
     {

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": [
     {