diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-10-28 19:21:36 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-10-28 19:29:36 +0800 |
| commit | 66bd26b6ab2172a834d06e9f70d09a659faa8ebd (patch) | |
| tree | b71b97d9ed4d11626fffd944121b3f23c66ece6b /runtime/src/main/java/me/shedaniel/rei/plugin | |
| parent | 4429f3b5e3afd9c729da9d8e42ea153bed870522 (diff) | |
| download | RoughlyEnoughItems-66bd26b6ab2172a834d06e9f70d09a659faa8ebd.tar.gz RoughlyEnoughItems-66bd26b6ab2172a834d06e9f70d09a659faa8ebd.tar.bz2 RoughlyEnoughItems-66bd26b6ab2172a834d06e9f70d09a659faa8ebd.zip | |
Update to 22w43a
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java | 3 | ||||
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java index 928ee7a74..0d0b64ca9 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java @@ -45,7 +45,6 @@ import me.shedaniel.rei.api.common.entry.comparison.FluidComparatorRegistry; import me.shedaniel.rei.api.common.entry.type.EntryDefinition; import me.shedaniel.rei.api.common.entry.type.EntryType; import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; -import me.shedaniel.rei.impl.VersionAdapter; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; @@ -257,7 +256,7 @@ public class FluidEntryDefinition implements EntryDefinition<FluidStack>, EntryS .alpha(0xff) .normal(matrices.last().normal(), 0, 0, 0) .position(matrices.last().pose(), bounds.x, bounds.getMaxY() - bounds.height * Mth.clamp(entry.get(EntryStack.Settings.FLUID_RENDER_RATIO), 0, 1), bounds.getMaxX(), bounds.getMaxY(), entry.getZ()) - .next(VersionAdapter.INSTANCE.spriteAtlasLocation(s)); + .next(s.atlasLocation()); } @Override diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java index c53648ce7..3ea8f26e9 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java @@ -263,7 +263,7 @@ public class ItemEntryDefinition implements EntryDefinition<ItemStack>, EntrySer matrices.scale(bounds.getWidth(), (bounds.getWidth() + bounds.getHeight()) / -2f, 1.0F); PoseStack modelViewStack = RenderSystem.getModelViewStack(); modelViewStack.pushPose(); - modelViewStack.last().pose().load(matrices.last().pose()); + modelViewStack.last().pose().set(matrices.last().pose()); RenderSystem.applyModelViewMatrix(); MultiBufferSource.BufferSource immediate = Minecraft.getInstance().renderBuffers().bufferSource(); Minecraft.getInstance().getItemRenderer().render(value, ItemTransforms.TransformType.GUI, false, new PoseStack(), immediate, |