Skip to content

Commit

Permalink
This does not appear to be necessary anymore
Browse files Browse the repository at this point in the history
Saves us a headache in the 1.20.4 port
  • Loading branch information
artemisSystem committed Aug 28, 2024
1 parent c404419 commit bfb0ef3
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 50 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package vazkii.botania.fabric.client;

import com.mojang.blaze3d.vertex.BufferBuilder;

import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
Expand All @@ -17,7 +15,6 @@
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.client.particle.ParticleProvider;
import net.minecraft.client.particle.SpriteSet;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
Expand All @@ -38,7 +35,6 @@
import vazkii.botania.client.core.handler.KonamiHandler;
import vazkii.botania.client.core.handler.MiscellaneousModels;
import vazkii.botania.client.core.helper.CoreShaders;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.fx.BotaniaParticles;
import vazkii.botania.client.gui.HUDHandler;
Expand All @@ -59,13 +55,11 @@
import vazkii.botania.common.item.equipment.armor.manasteel.ManasteelArmorItem;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.fabric.network.FabricPacketHandler;
import vazkii.botania.mixin.client.RenderBuffersAccessor;
import vazkii.botania.xplat.XplatAbstractions;
import vazkii.patchouli.api.BookDrawScreenCallback;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.SortedMap;
import java.util.function.Function;

public class FabricClientInitializer implements ClientModInitializer {
Expand Down Expand Up @@ -161,10 +155,6 @@ private static void registerArmors() {
private void loadComplete(Minecraft mc) {
ColorHandler.submitBlocks(ColorProviderRegistry.BLOCK::register);
ColorHandler.submitItems(ColorProviderRegistry.ITEM::register);

// Needed to prevent mana pools on carts from X-raying through the cart
SortedMap<RenderType, BufferBuilder> layers = ((RenderBuffersAccessor) mc.renderBuffers()).getEntityBuilders();
layers.put(RenderHelper.MANA_POOL_WATER, new BufferBuilder(RenderHelper.MANA_POOL_WATER.bufferSize()));
}

private void initAuxiliaryRender(EntityType<? extends LivingEntity> type, LivingEntityRenderer<?, ?> renderer,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package vazkii.botania.forge.client;

import com.google.common.base.Suppliers;
import com.mojang.blaze3d.vertex.BufferBuilder;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.client.particle.ParticleProvider;
import net.minecraft.client.particle.SpriteSet;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.ShaderInstance;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.client.renderer.item.ItemProperties;
Expand All @@ -30,7 +28,6 @@
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;

import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.BotaniaForgeClientCapabilities;
Expand All @@ -39,7 +36,6 @@
import vazkii.botania.client.BotaniaItemProperties;
import vazkii.botania.client.core.handler.*;
import vazkii.botania.client.core.helper.CoreShaders;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.fx.BotaniaParticles;
import vazkii.botania.client.gui.HUDHandler;
Expand All @@ -59,7 +55,6 @@
import vazkii.botania.common.item.BotaniaItems;
import vazkii.botania.common.item.equipment.bauble.RingOfDexterousMotionItem;
import vazkii.botania.forge.CapabilityUtil;
import vazkii.botania.mixin.client.RenderBuffersAccessor;
import vazkii.botania.xplat.ClientXplatAbstractions;
import vazkii.botania.xplat.XplatAbstractions;
import vazkii.patchouli.api.BookDrawScreenEvent;
Expand All @@ -69,7 +64,6 @@
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.SortedMap;
import java.util.function.Function;
import java.util.function.Supplier;

Expand Down Expand Up @@ -215,14 +209,6 @@ private static void attachEntityCapabilities(AttachCapabilitiesEvent<Entity> e)
}
}

@SubscribeEvent
public static void loadComplete(FMLLoadCompleteEvent evt) {
// Needed to prevent mana pools on carts from X-raying through the cart
SortedMap<RenderType, BufferBuilder> layers = ((RenderBuffersAccessor) Minecraft.getInstance()
.renderBuffers()).getEntityBuilders();
layers.put(RenderHelper.MANA_POOL_WATER, new BufferBuilder(RenderHelper.MANA_POOL_WATER.bufferSize()));
}

@SubscribeEvent
public static void registerModelLoader(ModelEvent.RegisterGeometryLoaders evt) {
evt.register(ClientXplatAbstractions.FLOATING_FLOWER_MODEL_LOADER_ID.getPath(),
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion Xplat/src/main/resources/botania_xplat.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"client.RecipeBookComponentAccessor",
"client.RecipeBookComponentMixin",
"client.RecipeBookPageAccessor",
"client.RenderBuffersAccessor",
"client.RenderTypeAccessor",
"client.SkullBlockRendererMixin",
"client.SoundEngineMixin",
Expand Down

0 comments on commit bfb0ef3

Please sign in to comment.