Skip to content

Commit 0beac2c

Browse files
committed
almost compiling
1 parent b3a3a22 commit 0beac2c

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

src/main/java/com/simibubi/create/AllItems.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
import net.minecraft.world.item.Item;
9292
import net.minecraft.world.item.Rarity;
9393

94-
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
9594
import net.fabricmc.fabric.api.registry.FuelRegistry;
9695

9796
import io.github.fabricators_of_create.porting_lib.tags.Tags;
@@ -261,12 +260,6 @@ public class AllItems {
261260

262261
public static final ItemEntry<GogglesItem> GOGGLES = REGISTRATE.item("goggles", GogglesItem::new)
263262
.properties(p -> p.stacksTo(1))
264-
.properties(p -> {
265-
if (p instanceof FabricItemSettings fp) {
266-
fp.equipmentSlot(GogglesItem::getEquipmentSlot);
267-
}
268-
return p;
269-
})
270263
.onRegister(CreateRegistrate.itemModel(() -> GogglesModel::new))
271264
.lang("Engineer's Goggles")
272265
.register();

src/main/java/com/simibubi/create/content/fluids/pipes/GlassPipeVisual.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
import dev.engine_room.flywheel.lib.visual.util.SmartRecycler;
2222
import net.createmod.catnip.animation.LerpedFloat;
2323
import net.createmod.catnip.data.Iterate;
24-
import net.minecraft.client.Minecraft;
2524
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
2625
import net.minecraft.core.Direction;
2726
import net.minecraft.util.Mth;
28-
import net.minecraft.world.inventory.InventoryMenu;
29-
import net.minecraft.world.level.material.Fluid;
27+
28+
import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
29+
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
30+
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes;
3031

3132
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
32-
import io.github.fabricators_of_create.porting_lib.fluids.FluidType;
3333

3434
public class GlassPipeVisual extends AbstractBlockEntityVisual<StraightPipeBlockEntity> implements SimpleDynamicVisual {
3535

@@ -90,16 +90,19 @@ public void beginFrame(Context ctx) {
9090
}
9191
}
9292

93-
Fluid fluid = fluidStack.getFluid();
94-
IClientFluidTypeExtensions clientFluid = IClientFluidTypeExtensions.of(fluid);
95-
FluidType fluidAttributes = fluid.getFluidType();
96-
var atlas = Minecraft.getInstance()
97-
.getTextureAtlas(InventoryMenu.BLOCK_ATLAS);
98-
TextureAtlasSprite flowTexture = atlas.apply(clientFluid.getFlowingTexture(fluidStack));
93+
FluidVariant variant = fluidStack.getType();
94+
@Nullable TextureAtlasSprite[] sprites = FluidVariantRendering.getSprites(variant);
95+
if (sprites == null) {
96+
stream.discardExtra();
97+
surface.discardExtra();
98+
return;
99+
}
100+
101+
TextureAtlasSprite flowTexture = sprites[1];
99102

100-
int color = clientFluid.getTintColor(fluidStack);
103+
int color = FluidVariantRendering.getColor(fluidStack.getType());
101104
int blockLightIn = (light >> 4) & 0xF;
102-
int luminosity = Math.max(blockLightIn, fluidAttributes.getLightLevel(fluidStack));
105+
int luminosity = Math.max(blockLightIn, FluidVariantAttributes.getLuminance(variant));
103106
int light = (this.light & 0xF00000) | luminosity << 4;
104107

105108
if (inbound)
@@ -127,7 +130,7 @@ public void beginFrame(Context ctx) {
127130
fluidInstance.setChanged();
128131

129132
if (progress != 1) {
130-
TextureAtlasSprite stillTexture = atlas.apply(clientFluid.getStillTexture(fluidStack));
133+
TextureAtlasSprite stillTexture = sprites[1];
131134
surface.get(stillTexture)
132135
.setIdentityTransform()
133136
.translate(getVisualPosition())

src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.fabricmc.api.EnvType;
1313
import net.fabricmc.api.Environment;
1414

15-
public class DisplayLinkBlockItem extends ClickToLinkBlockItem /* FIXME - Used to implement BlockUseBypassingItem, check if still neeed */ {
15+
public class DisplayLinkBlockItem extends ClickToLinkBlockItem {
1616

1717
public DisplayLinkBlockItem(Block pBlock, Properties pProperties) {
1818
super(pBlock, pProperties);

0 commit comments

Comments
 (0)