From 1f6fc41eaebc3c565bef12606ff98a076fc32e89 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 19 Mar 2020 04:30:52 +0800 Subject: 20w12a Signed-off-by: shedaniel --- src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java | 2 +- .../me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java | 5 ++--- .../java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java | 4 ++-- .../me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java | 3 +-- .../rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/plugin') diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index e9192ee5c..703e8dabc 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -166,7 +166,7 @@ public class DefaultPlugin implements REIPluginV0 { @Override public void render(Rectangle bounds, int mouseX, int mouseY, float delta) { MinecraftClient.getInstance().getTextureManager().bindTexture(id); - innerBlit(bounds.x, bounds.getMaxX(), bounds.y, bounds.getMaxY(), getZOffset(), 0, 1, 0, 1); + drawTexturedQuad(bounds.x, bounds.getMaxX(), bounds.y, bounds.getMaxY(), getZOffset(), 0, 1, 0, 1); } @Override diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java index 59b4da5c3..3ad14f1ef 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java @@ -40,10 +40,9 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandler; -import net.minecraft.util.DefaultedList; -import net.minecraft.util.PacketByteBuf; - +import net.minecraft.util.collection.DefaultedList; import java.util.List; public class DefaultCategoryHandler implements AutoTransferHandler { diff --git a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java index c758886e0..2c5590822 100644 --- a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java @@ -64,9 +64,9 @@ public class DefaultBrewingCategory implements RecipeCategory { MinecraftClient.getInstance().getTextureManager().bindTexture(DefaultPlugin.getDisplayTexture()); - helper.blit(startPoint.x, startPoint.y, 0, 108, 103, 59); + helper.drawTexture(startPoint.x, startPoint.y, 0, 108, 103, 59); int width = MathHelper.ceil(System.currentTimeMillis() / 250d % 18d); - helper.blit(startPoint.x + 44, startPoint.y + 28, 103, 163, width, 4); + helper.drawTexture(startPoint.x + 44, startPoint.y + 28, 103, 163, width, 4); })); widgets.add(Widgets.createSlot(new Point(startPoint.x + 1, startPoint.y + 1)).entry(EntryStack.create(Items.BLAZE_POWDER)).disableBackground().markInput()); widgets.add(Widgets.createSlot(new Point(startPoint.x + 40, startPoint.y + 1)).entries(display.getInputEntries().get(0)).disableBackground().markInput()); diff --git a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java index e522ffaf8..e905d5534 100644 --- a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java @@ -30,9 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.AbstractCookingRecipe; import net.minecraft.recipe.CampfireCookingRecipe; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; - +import net.minecraft.util.collection.DefaultedList; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java index 74a25a528..91df5433e 100644 --- a/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java @@ -30,9 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.CuttingRecipe; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.StonecuttingRecipe; -import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; - +import net.minecraft.util.collection.DefaultedList; import java.util.ArrayList; import java.util.Collections; import java.util.List; -- cgit