aboutsummaryrefslogtreecommitdiff
path: root/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-08-27 19:36:00 +0800
committershedaniel <daniel@shedaniel.me>2020-08-27 19:36:50 +0800
commit6104964f60bac00a4ac1359bd244d361e50786bd (patch)
tree04bf0350e7305633436bb133e8647f0cecce0bf5 /RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java
parent935417891d62500610fb05ce75dc8d63219c39d2 (diff)
downloadRoughlyEnoughItems-6104964f60bac00a4ac1359bd244d361e50786bd.tar.gz
RoughlyEnoughItems-6104964f60bac00a4ac1359bd244d361e50786bd.tar.bz2
RoughlyEnoughItems-6104964f60bac00a4ac1359bd244d361e50786bd.zip
Migrate from yarn to mojmap
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java')
-rw-r--r--RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java
index 03eb14d5e..82c1a296e 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SimpleFluidRenderer.java
@@ -25,10 +25,10 @@ package me.shedaniel.rei.impl;
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler;
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.fluid.Fluid;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.material.Fluid;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
@@ -47,16 +47,16 @@ public final class SimpleFluidRenderer {
}
public interface FluidRenderingData {
- Sprite getSprite();
+ TextureAtlasSprite getSprite();
int getColor();
}
public static final class FluidRenderingDataImpl implements FluidRenderingData {
- private final Sprite sprite;
+ private final TextureAtlasSprite sprite;
private final int color;
- public FluidRenderingDataImpl(Sprite sprite, int color) {
+ public FluidRenderingDataImpl(TextureAtlasSprite sprite, int color) {
this.sprite = sprite;
this.color = color;
}
@@ -65,15 +65,15 @@ public final class SimpleFluidRenderer {
FluidRenderHandler fluidRenderHandler = FluidRenderHandlerRegistry.INSTANCE.get(fluid);
if (fluidRenderHandler == null)
return null;
- Sprite[] sprites = fluidRenderHandler.getFluidSprites(MinecraftClient.getInstance().world, MinecraftClient.getInstance().world == null ? null : BlockPos.ORIGIN, fluid.getDefaultState());
+ TextureAtlasSprite[] sprites = fluidRenderHandler.getFluidSprites(Minecraft.getInstance().level, Minecraft.getInstance().level == null ? null : BlockPos.ZERO, fluid.defaultFluidState());
int color = -1;
- if (MinecraftClient.getInstance().world != null)
- color = fluidRenderHandler.getFluidColor(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState());
+ if (Minecraft.getInstance().level != null)
+ color = fluidRenderHandler.getFluidColor(Minecraft.getInstance().level, BlockPos.ZERO, fluid.defaultFluidState());
return new FluidRenderingDataImpl(sprites[0], color);
}
@Override
- public Sprite getSprite() {
+ public TextureAtlasSprite getSprite() {
return sprite;
}