diff options
Diffstat (limited to 'api/src/main/java')
7 files changed, 9 insertions, 29 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java b/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java index 94d57de3b..afe34317e 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java @@ -36,6 +36,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.Nullable; import java.util.Optional; diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java index ce06183b9..aeec0b99c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java @@ -24,6 +24,7 @@ package me.shedaniel.rei.api.client.gui; import com.google.common.base.Predicates; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; @@ -37,7 +38,6 @@ import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.CollectionUtils; import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -121,7 +121,7 @@ public class SimpleDisplayRenderer extends DisplayRenderer implements WidgetHold } xx = bounds.x + 4 + 18 * (getItemsPerLine() - 2); yy = bounds.y + getHeight() / 2 - 8; - Minecraft.getInstance().getTextureManager().bind(CHEST_GUI_TEXTURE); + RenderSystem.setShaderTexture(0, CHEST_GUI_TEXTURE); blit(matrices, xx, yy, 0, 28, 18, 18); xx += 18; yy += outputWidgets.size() * -9 + 9; diff --git a/api/src/main/java/me/shedaniel/rei/api/client/util/SpriteRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/util/SpriteRenderer.java index 5447fed4d..afd1daaf8 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/util/SpriteRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/util/SpriteRenderer.java @@ -23,11 +23,11 @@ package me.shedaniel.rei.api.client.util; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Matrix3f; import com.mojang.math.Matrix4f; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -212,7 +212,7 @@ public class SpriteRenderer { float sX = sprite.getWidth(); float sY = sprite.getHeight(); - Minecraft.getInstance().getTextureManager().bind(texture); + RenderSystem.setShaderTexture(0, texture); for (float y = y1; y < y2; y += Math.min(y2 - y, sY)) { for (float x = x1; x < x2; x += Math.min(x2 - x, sX)) { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java index d65b2b6eb..79d3fc431 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java @@ -97,11 +97,8 @@ public interface MenuInfo<T extends AbstractContainerMenu, D extends Display> ex * @param context the context of the transfer */ default void markDirty(MenuInfoContext<T, ? extends ServerPlayer, D> context) { - context.getPlayerEntity().inventory.setChanged(); + context.getPlayerEntity().getInventory().setChanged(); context.getMenu().broadcastChanges(); - - AbstractContainerMenu containerMenu = context.getPlayerEntity().containerMenu; - context.getPlayerEntity().refreshContainer(containerMenu, containerMenu.getItems()); } /** diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java index a6a3d8bed..b3a89873d 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java @@ -93,7 +93,7 @@ public interface SimplePlayerInventoryMenuInfo<T extends AbstractContainerMenu, } default Iterable<SlotAccessor> getInventorySlots(MenuInfoContext<T, ?, D> context) { - Inventory inventory = context.getPlayerEntity().inventory; + Inventory inventory = context.getPlayerEntity().getInventory(); return IntStream.range(0, inventory.items.size()) .mapToObj(index -> SlotAccessor.fromContainer(inventory, index)) .collect(Collectors.toList()); diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryIngredients.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryIngredients.java index f366da81c..5c336b8f7 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryIngredients.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryIngredients.java @@ -25,7 +25,6 @@ package me.shedaniel.rei.api.common.util; import com.google.common.collect.ImmutableList; import me.shedaniel.architectury.fluid.FluidStack; -import me.shedaniel.architectury.utils.Fraction; import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.type.EntryDefinition; @@ -58,15 +57,7 @@ public final class EntryIngredients { return EntryIngredient.of(EntryStacks.of(fluid)); } - public static EntryIngredient of(Fluid fluid, int amount) { - return EntryIngredient.of(EntryStacks.of(fluid, amount)); - } - - public static EntryIngredient of(Fluid fluid, double amount) { - return EntryIngredient.of(EntryStacks.of(fluid, amount)); - } - - public static EntryIngredient of(Fluid fluid, Fraction amount) { + public static EntryIngredient of(Fluid fluid, long amount) { return EntryIngredient.of(EntryStacks.of(fluid, amount)); } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java index c717f233e..45e41c353 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java @@ -24,7 +24,6 @@ package me.shedaniel.rei.api.common.util; import me.shedaniel.architectury.fluid.FluidStack; -import me.shedaniel.architectury.utils.Fraction; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.comparison.ComparisonContext; import me.shedaniel.rei.api.common.entry.type.EntryType; @@ -47,15 +46,7 @@ public final class EntryStacks { return of(fluid, FluidStack.bucketAmount()); } - public static EntryStack<FluidStack> of(Fluid fluid, int amount) { - return of(fluid, Fraction.ofWhole(amount)); - } - - public static EntryStack<FluidStack> of(Fluid fluid, double amount) { - return of(fluid, Fraction.from(amount)); - } - - public static EntryStack<FluidStack> of(Fluid fluid, Fraction amount) { + public static EntryStack<FluidStack> of(Fluid fluid, long amount) { return EntryStack.of(VanillaEntryTypes.FLUID, FluidStack.create(fluid, amount)); } |