remove unused boreal wisteria code

devs-immortal · Mar 14, 2024 · 56dfa97 · 56dfa97
1 parent a5b6903
commit 56dfa97
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 340 deletions.
diff --git a/src/main/java/net/id/paradiselost/ParadiseLost.java b/src/main/java/net/id/paradiselost/ParadiseLost.java
@@ -13,7 +13,6 @@
 import net.id.paradiselost.client.rendering.entity.ParadiseLostEntityRenderers;
 import net.id.paradiselost.client.rendering.item.ParadiseLostItemRenderers;
 import net.id.paradiselost.client.rendering.particle.ParadiseLostParticles;
-import net.id.paradiselost.client.rendering.shader.ParadiseLostShaders;
 import net.id.paradiselost.client.rendering.texture.ParadiseLostTextures;
 import net.id.paradiselost.client.rendering.util.ParadiseLostColorProviders;
 import net.id.paradiselost.commands.ParadiseLostCommands;
@@ -125,7 +124,6 @@ public void onInitializeClient() {
         ParadiseLostItemRenderers.initClient();
         ParadiseLostScreens.initClient();
         Conditions.clientInit();
-        ParadiseLostShaders.init();
         ParadiseLostScreens.clientInit();
     }
 

diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlockActions.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlockActions.java
@@ -28,8 +28,6 @@ protected static Action<Block> flammable(int spread, int burn) {
     protected static final Action<Block> translucentRenderLayer = onClient((id, block) -> RenderUtils.transparentRenderLayer(block));
     protected static final Action<Block> cutoutRenderLayer = onClient((id, block) -> RenderUtils.cutoutRenderLayer(block));
     protected static final Action<Block> cutoutMippedRenderLayer = onClient((id, block) -> RenderUtils.cutoutMippedRenderLayer(block));
-    protected static final Action<Block> auralRenderLayer = onClient((id, block) -> RenderUtils.auralRenderLayer(block));
-    protected static final Action<Block> auralCutoutMippedRenderLayer = onClient((id, block) -> RenderUtils.auralCutoutMippedRenderLayer(block));
 
     protected static Action<Block> stripsTo(Block stripped) {
         return (id, original) -> StrippableBlockRegistry.register(original, stripped);

diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java
@@ -283,13 +283,6 @@ protected static Settings flowerPot() {
     public static final FlowerPotBlock POTTED_LAVENDER_WISTERIA_SAPLING = add("potted_lavender_wisteria_sapling", new FlowerPotBlock(LAVENDER_WISTERIA_SAPLING, flowerPot()), cutoutRenderLayer);
     public static final ParadiseLostHangerBlock LAVENDER_WISTERIA_HANGER = add("lavender_wisteria_hanger", new ParadiseLostHangerBlock(lavenderWisteriaColors.hanger()), flammableLeaves, cutoutRenderLayer);
 
-    private static final WoodSettingsFactory borealWisteriaColors = wisteriaColors.withLeafColor(MapColor.CYAN);
-    private static final Vec3i[] auralLeafColors = new Vec3i[]{RenderUtils.toRGB(0xa6ffdd), RenderUtils.toRGB(0x96e5ff), RenderUtils.toRGB(0xd6b3ff), RenderUtils.toRGB(0xffadc6)};
-    public static final AuralLeavesBlock BOREAL_WISTERIA_LEAVES = add("boreal_wisteria_leaves", new AuralLeavesBlock(borealWisteriaColors.auralNoCollideLeaves(), false, auralLeafColors), flammableLeaves);
-    public static final SaplingBlock BOREAL_WISTERIA_SAPLING = add("boreal_wisteria_sapling", new ParadiseLostSaplingBlock(new BorealWisteriaSaplingGenerator(), borealWisteriaColors.sapling().luminance(state -> 5)), cutoutRenderLayer);
-    public static final FlowerPotBlock POTTED_BOREAL_WISTERIA_SAPLING = add("potted_boreal_wisteria_sapling", new FlowerPotBlock(BOREAL_WISTERIA_SAPLING, flowerPot().luminance(state -> 5)), cutoutRenderLayer);
-    public static final AuralHangerBlock BOREAL_WISTERIA_HANGER = add("boreal_wisteria_hanger", new AuralHangerBlock(borealWisteriaColors.auralHanger(), auralLeafColors), flammableLeaves, auralCutoutMippedRenderLayer);
-
     // Grasses
     private static Settings shrub() {
         return copy(Blocks.GRASS).mapColor(MapColor.PALE_GREEN);

diff --git a/src/main/java/net/id/paradiselost/blocks/natural/tree/AuralHangerBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/tree/AuralHangerBlock.java
diff --git a/src/main/java/net/id/paradiselost/blocks/natural/tree/AuralLeavesBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/tree/AuralLeavesBlock.java
diff --git a/src/main/java/net/id/paradiselost/blocks/natural/tree/ParadiseLostLeavesBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/tree/ParadiseLostLeavesBlock.java
@@ -32,8 +32,6 @@ public static BlockState getHanger(BlockState state) {
             return ParadiseLostBlocks.LAVENDER_WISTERIA_HANGER.getDefaultState();
         } else if (state.isOf(ParadiseLostBlocks.FROST_WISTERIA_LEAVES)) {
             return ParadiseLostBlocks.FROST_WISTERIA_HANGER.getDefaultState();
-        } else if (state.isOf(ParadiseLostBlocks.BOREAL_WISTERIA_LEAVES)) {
-            return ParadiseLostBlocks.BOREAL_WISTERIA_HANGER.getDefaultState();
         }
         return Blocks.AIR.getDefaultState();
     }

diff --git a/src/main/java/net/id/paradiselost/client/rendering/shader/ParadiseLostRenderLayers.java b/src/main/java/net/id/paradiselost/client/rendering/shader/ParadiseLostRenderLayers.java
diff --git a/src/main/java/net/id/paradiselost/client/rendering/shader/ParadiseLostShaders.java b/src/main/java/net/id/paradiselost/client/rendering/shader/ParadiseLostShaders.java
diff --git a/src/main/java/net/id/paradiselost/client/rendering/shader/ParadiseLostVertexFormats.java b/src/main/java/net/id/paradiselost/client/rendering/shader/ParadiseLostVertexFormats.java
diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java
@@ -320,15 +320,13 @@ private static FabricItemSettings decoration() {
     public static final BlockItem ROSE_WISTERIA_SAPLING = add("rose_wisteria_sapling", ParadiseLostBlocks.ROSE_WISTERIA_SAPLING, decoration, compostable30);
     public static final BlockItem FROST_WISTERIA_SAPLING = add("frost_wisteria_sapling", ParadiseLostBlocks.FROST_WISTERIA_SAPLING, decoration, compostable30);
     public static final BlockItem LAVENDER_WISTERIA_SAPLING = add("lavender_wisteria_sapling", ParadiseLostBlocks.LAVENDER_WISTERIA_SAPLING, decoration, compostable30);
-    public static final BlockItem BOREAL_WISTERIA_SAPLING = add("boreal_wisteria_sapling", ParadiseLostBlocks.BOREAL_WISTERIA_SAPLING, decoration, compostable30);
     // leaves
     public static final BlockItem AUREL_LEAVES = add("aurel_leaves", ParadiseLostBlocks.AUREL_LEAVES, decoration, compostable30);
     public static final BlockItem MOTHER_AUREL_LEAVES = add("mother_aurel_leaves", ParadiseLostBlocks.MOTHER_AUREL_LEAVES, decoration, compostable30);
     public static final BlockItem ORANGE_LEAVES = add("orange_leaves", ParadiseLostBlocks.ORANGE_LEAVES, decoration, compostable30);
     public static final BlockItem ROSE_WISTERIA_LEAVES = add("rose_wisteria_leaves", ParadiseLostBlocks.ROSE_WISTERIA_LEAVES, decoration, compostable30);
     public static final BlockItem FROST_WISTERIA_LEAVES = add("frost_wisteria_leaves", ParadiseLostBlocks.FROST_WISTERIA_LEAVES, decoration, compostable30);
     public static final BlockItem LAVENDER_WISTERIA_LEAVES = add("lavender_wisteria_leaves", ParadiseLostBlocks.LAVENDER_WISTERIA_LEAVES, decoration, compostable30);
-    public static final BlockItem BOREAL_WISTERIA_LEAVES = add("boreal_wisteria_leaves", ParadiseLostBlocks.BOREAL_WISTERIA_LEAVES, decoration, compostable30);
     // plants
     public static final BlockItem GRASS = add("grass_plant", ParadiseLostBlocks.GRASS, decoration, compostable30);
     public static final BlockItem GRASS_FLOWERING = add("grass_flowering", ParadiseLostBlocks.GRASS_FLOWERING, decoration, compostable30);
@@ -354,7 +352,6 @@ private static FabricItemSettings decoration() {
     public static final BlockItem ROSE_WISTERIA_HANGER = add("rose_wisteria_hanger", ParadiseLostBlocks.ROSE_WISTERIA_HANGER, decoration, compostable30);
     public static final BlockItem FROST_WISTERIA_HANGER = add("frost_wisteria_hanger", ParadiseLostBlocks.FROST_WISTERIA_HANGER, decoration, compostable30);
     public static final BlockItem LAVENDER_WISTERIA_HANGER = add("lavender_wisteria_hanger", ParadiseLostBlocks.LAVENDER_WISTERIA_HANGER, decoration, compostable30);
-    public static final BlockItem BOREAL_WISTERIA_HANGER = add("boreal_wisteria_hanger", ParadiseLostBlocks.BOREAL_WISTERIA_HANGER, decoration, compostable30);
 
     public static final BlockItem AUREL_LEAF_PILE = add("aurel_leaf_pile", ParadiseLostBlocks.AUREL_LEAF_PILE, decoration, compostable30);
     public static final BlockItem ROSE_WISTERIA_LEAF_PILE = add("rose_wisteria_leaf_pile", ParadiseLostBlocks.ROSE_WISTERIA_LEAF_PILE, decoration, compostable30);

diff --git a/src/main/java/net/id/paradiselost/util/CompatConfig.java b/src/main/java/net/id/paradiselost/util/CompatConfig.java
@@ -7,8 +7,6 @@
 public final class CompatConfig {
     private CompatConfig() {
     }
-
-    // TODO: When sodium supports custom render layers, make this check the version
-    public static final boolean SODIUM_WORKAROUND = getBoolean(locate("sodium_workaround"), isLoaded("sodium"));
+
     public static final boolean SPECTRUM_WORKAROUND = getBoolean(locate("spectrum_workaround"), isLoaded("spectrum"));
 }
diff --git a/src/main/java/net/id/paradiselost/util/RenderUtils.java b/src/main/java/net/id/paradiselost/util/RenderUtils.java
@@ -1,7 +1,6 @@
 package net.id.paradiselost.util;
 
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.id.paradiselost.client.rendering.shader.ParadiseLostRenderLayers;
 import net.minecraft.block.Block;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.fluid.Fluid;
@@ -47,14 +46,6 @@ public static void transparentRenderLayer(Fluid fluid) {
     public static void cutoutRenderLayer(Block block) {
         blockRenderLayer(block, RenderLayer.getCutout());
     }
-
-    public static void auralRenderLayer(Block block) {
-        blockRenderLayer(block, ParadiseLostRenderLayers.AURAL);
-    }
-
-    public static void auralCutoutMippedRenderLayer(Block block) {
-        blockRenderLayer(block, ParadiseLostRenderLayers.AURAL_CUTOUT_MIPPED);
-    }
 
     public static void cutoutMippedRenderLayer(Block block) {
         blockRenderLayer(block, RenderLayer.getCutoutMipped());