Backport to 1.21.8

Author: OpenBagTwo

gradle.properties

@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 # Fabric Properties
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.1
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
 loader_version=0.17.2
 # Mod Properties
 mod_version=handled.by.jgitver
 maven_group=io.github.openbagtwo.lighterend
 archives_base_name=lighterend
 # Dependencies
-fabric_version=0.135.0+1.21.10
+fabric_version=0.134.0+1.21.8
 # Optional
-modmenu_version=16.0.0-rc.1
-jade_version=20.0.5+fabric
-terrablender_version=1.21.10-21.10.0.0
+modmenu_version=15.0.0
+jade_version=19.3.2+fabric
+terrablender_version=1.21.8-6.0.0.3

src/client/java/io/github/openbagtwo/lighterend/LighterEndClient.java

@@ -46,12 +46,6 @@ public void onInitializeClient() {
               Text.translatable("resourcepacks.lighterend.wing_trims.title"),
               ResourcePackActivationType.DEFAULT_ENABLED
           );
-          ResourceManagerHelper.registerBuiltinResourcePack(
-              LighterEnd.of("visibly_waxed"),
-              container,
-              Text.translatable("resourcepacks.lighterend.visibly_waxed.title"),
-              ResourcePackActivationType.NORMAL
-          );
         }
     );
 

src/client/java/io/github/openbagtwo/lighterend/blocks/BlockEntityRenderer.java

@@ -7,12 +7,12 @@
 import net.minecraft.client.render.TexturedRenderLayers;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
 import net.minecraft.client.render.block.entity.HangingSignBlockEntityRenderer;
-import net.minecraft.client.render.block.entity.ShelfBlockEntityRenderer;
 import net.minecraft.client.render.block.entity.SignBlockEntityRenderer;
 
 public class BlockEntityRenderer {
 
   public static void initialize() {
+
     BlockEntityRendererFactories.register(
         LighterEndBlockEntities.SIGN,
         SignBlockEntityRenderer::new
@@ -21,10 +21,6 @@ public static void initialize() {
         LighterEndBlockEntities.HANGING_SIGN,
         HangingSignBlockEntityRenderer::new
     );
-    BlockEntityRendererFactories.register(
-        LighterEndBlockEntities.SHELF,
-        ShelfBlockEntityRenderer::new
-    );
     BlockEntityRendererFactories.register(
         LighterEndBlockEntities.PEDESTAL,
         PedestalRenderer::new

src/client/java/io/github/openbagtwo/lighterend/blocks/BlockLayerRenderer.java

@@ -2,7 +2,6 @@
 
 import io.github.openbagtwo.lighterend.registries.LighterEndBlocks;
 import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
-import net.minecraft.block.Block;
 import net.minecraft.client.render.BlockRenderLayer;
 
 public class BlockLayerRenderer {
@@ -66,9 +65,6 @@ public static void initialize() {
         LighterEndBlocks.DRAGON_SAPLING,
         LighterEndBlocks.POTTED_DRAGON_SAPLING
     );
-    for (Block chandelier : LighterEndBlocks.COPPER_CHANDELIERS.getAll()) {
-      BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT, chandelier);
-    }
 
     BlockRenderLayerMap.putBlocks(
         BlockRenderLayer.CUTOUT_MIPPED,

src/client/java/io/github/openbagtwo/lighterend/blocks/PedestalRenderer.java

@@ -1,74 +1,54 @@
 package io.github.openbagtwo.lighterend.blocks;
 
-import io.github.openbagtwo.lighterend.blocks.PedestalRenderer.RenderState;
 import io.github.openbagtwo.lighterend.blocks.entities.PedestalDisplay;
-import net.minecraft.client.item.ItemModelManager;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.LightmapTextureManager;
 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.block.entity.state.BlockEntityRenderState;
-import net.minecraft.client.render.command.ModelCommandRenderer;
-import net.minecraft.client.render.command.OrderedRenderCommandQueue;
-import net.minecraft.client.render.item.ItemRenderState;
-import net.minecraft.client.render.state.CameraRenderState;
+import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemDisplayContext;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RotationAxis;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.LightType;
 import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
 
-public class PedestalRenderer implements BlockEntityRenderer<PedestalDisplay, RenderState> {
-
-  private final ItemModelManager itemModelManager;
+public class PedestalRenderer implements BlockEntityRenderer<PedestalDisplay> {
 
   public PedestalRenderer(BlockEntityRendererFactory.Context context) {
-    itemModelManager = context.itemModelManager();
-  }
-
-  @Override
-  public RenderState createRenderState() {
-    return new RenderState();
-  }
-
-  @Override
-  public void updateRenderState(
-      PedestalDisplay blockEntity,
-      RenderState state,
-      float tickProgress,
-      Vec3d cameraPos,
-      @Nullable ModelCommandRenderer.CrumblingOverlayCommand crumblingOverlay) {
-    BlockEntityRenderer.super.updateRenderState(
-        blockEntity,
-        state,
-        tickProgress,
-        cameraPos,
-        crumblingOverlay
-    );
-
-    state.lightPosition = blockEntity.getPos();
-    state.blockEntityWorld = blockEntity.getWorld();
-    state.rotation = blockEntity.getRenderingRotation();
-
-    itemModelManager.clearAndUpdate(state.itemRenderState,
-        blockEntity.getStack(0), ItemDisplayContext.FIXED, blockEntity.getWorld(), null, 0);
   }
 
   @Override
   public void render(
-      RenderState state, MatrixStack matrices,
-      OrderedRenderCommandQueue queue, CameraRenderState cameraState) {
+      PedestalDisplay entity,
+      float tickDelta,
+      MatrixStack matrices,
+      VertexConsumerProvider vertexConsumers,
+      int light,
+      int overlay,
+      Vec3d cameraPos
+  ) {
+    ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
+    ItemStack stack = entity.getStack(0);
     matrices.push();
 
     matrices.translate(0.5f, 1.4f, 0.5f);
-    matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(state.rotation));
-
-    state.itemRenderState.render(matrices, queue, getLightLevel(state.blockEntityWorld, state.pos),
-        OverlayTexture.DEFAULT_UV, 0);
-
+    matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(entity.getRenderingRotation()));
+
+    itemRenderer.renderItem(
+        stack,
+        ItemDisplayContext.GUI,
+        getLightLevel(entity.getWorld(), entity.getPos()),
+        OverlayTexture.DEFAULT_UV,
+        matrices,
+        vertexConsumers,
+        entity.getWorld(),
+        1
+    );
     matrices.pop();
   }
 
@@ -77,13 +57,4 @@ private int getLightLevel(World world, BlockPos pos) {
     int sLight = world.getLightLevel(LightType.SKY, pos);
     return LightmapTextureManager.pack(bLight, sLight);
   }
-
-  public static class RenderState extends BlockEntityRenderState {
-
-    public BlockPos lightPosition;
-    public World blockEntityWorld;
-    public float rotation;
-
-    final ItemRenderState itemRenderState = new ItemRenderState();
-  }
 }

src/client/java/io/github/openbagtwo/lighterend/config/ConfigScreen.java

@@ -122,18 +122,6 @@ protected void addOptions() {
               }
           )
       );
-      this.body.addSingleOptionEntry(
-          SimpleOption.ofBoolean(
-              "End World Spawn",
-              SimpleOption.constantTooltip(Text.of(
-                  "New worlds will have their spawn points in The End."
-                      + "\n\nHighly experimental.\nEnable at your own risk."
-              )),
-              LighterEnd.CONFIG.endSpawn, (value) -> {
-                LighterEnd.CONFIG.endSpawn = value;
-              }
-          )
-      );
     }
   }
 

src/client/java/io/github/openbagtwo/lighterend/datagen/BiomeTagProvider.java

@@ -71,12 +71,5 @@ protected void configure(WrapperLookup lookup) {
         LighterEndBiomes.SULPHUR_SPRINGS,
         LighterEndBiomes.SHADOW_FOREST
     );
-
-    builder(LighterEndTags.INVALID_SPAWN_BIOMES).add(
-        BiomeKeys.THE_VOID,
-        BiomeKeys.END_BARRENS,
-        BiomeKeys.SMALL_END_ISLANDS,
-        LighterEndBiomes.STARFIELD
-    );
   }
 }

src/client/java/io/github/openbagtwo/lighterend/datagen/BlockLootTableProvider.java

@@ -25,7 +25,6 @@
 import net.minecraft.loot.condition.BlockStatePropertyLootCondition;
 import net.minecraft.loot.condition.InvertedLootCondition;
 import net.minecraft.loot.condition.LootCondition;
-import net.minecraft.loot.context.LootContextParameters;
 import net.minecraft.loot.entry.ItemEntry;
 import net.minecraft.loot.function.ApplyBonusLootFunction;
 import net.minecraft.loot.function.CopyComponentsLootFunction;
@@ -148,9 +147,6 @@ public void generate() {
 
     addDrop(LighterEndBlocks.GOLD_CHANDELIER);
     addDrop(LighterEndBlocks.IRON_CHANDELIER);
-    for (Block chandelier : LighterEndBlocks.COPPER_CHANDELIERS.getAll()) {
-      addDrop(chandelier);
-    }
 
     addDrop(LighterEndBlocks.EMERALD_ICE);
     addDrop(LighterEndBlocks.FERROUS_ICE);
@@ -234,11 +230,11 @@ private LootTable.Builder mothNestDrops() {
                 .rolls(ConstantLootNumberProvider.create(1.0F))
                 .with(
                     ItemEntry.builder(LighterEndItems.SILK_MOTH_NEST)
-                        .apply(
-                            CopyComponentsLootFunction.blockEntity(
-                                    LootContextParameters.BLOCK_ENTITY)
-                                .include(LighterEndData.MOTHS)
-                        ).apply(CopyStateLootFunction.builder(LighterEndBlocks.SILK_MOTH_NEST)
+                        .apply(CopyComponentsLootFunction.builder(
+                                CopyComponentsLootFunction.Source.BLOCK_ENTITY)
+                            .include(LighterEndData.MOTHS
+                            ))
+                        .apply(CopyStateLootFunction.builder(LighterEndBlocks.SILK_MOTH_NEST)
                             .addProperty(SilkMothNest.FULLNESS))
                 )
         );

src/client/java/io/github/openbagtwo/lighterend/datagen/BlockTagProvider.java

@@ -81,7 +81,6 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
       valueLookupBuilder(BlockTags.CEILING_HANGING_SIGNS).add(wood.hangingSign);
       valueLookupBuilder(BlockTags.WALL_HANGING_SIGNS).add(wood.wallHangingSign);
       valueLookupBuilder(BlockTags.CLIMBABLE).add(wood.ladder);
-      valueLookupBuilder(BlockTags.WOODEN_SHELVES).add(wood.shelf);
     }
 
     valueLookupBuilder(BlockTags.PICKAXE_MINEABLE)
@@ -106,9 +105,6 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
             LighterEndBlocks.BRIMSTONE,
             LighterEndBlocks.HYDROTHERMAL_VENT
         );
-    for (Block chandelier : LighterEndBlocks.COPPER_CHANDELIERS.getAll()) {
-      valueLookupBuilder(BlockTags.PICKAXE_MINEABLE).add(chandelier);
-    }
 
     valueLookupBuilder(BlockTags.NEEDS_STONE_TOOL)
         .add(LighterEndBlocks.ENDER_BLOCK)