diff options
Diffstat (limited to 'src/main')
7 files changed, 17 insertions, 21 deletions
diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelper.java b/src/main/java/me/shedaniel/rei/client/ClientHelper.java index 6fad5e437..fbbd4a93b 100644 --- a/src/main/java/me/shedaniel/rei/client/ClientHelper.java +++ b/src/main/java/me/shedaniel/rei/client/ClientHelper.java @@ -77,8 +77,8 @@ public class ClientHelper implements ClientLoaded, ClientModInitializer { public static Point getMouseLocation() { MinecraftClient client = MinecraftClient.getInstance(); Mouse mouse = client.mouse; - double double_1 = mouse.getX() * (double) client.window.getScaledWidth() / (double) client.window.method_4480(); - double double_2 = mouse.getY() * (double) client.window.getScaledHeight() / (double) client.window.method_4507(); + double double_1 = mouse.getX() * (double) client.window.getScaledWidth() / (double) client.window.getWidth(); + double double_2 = mouse.getY() * (double) client.window.getScaledHeight() / (double) client.window.getHeight(); return new Point((int) double_1, (int) double_2); } diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java index fcdb2a58b..7d2cfb4ab 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -76,8 +76,8 @@ public abstract class ButtonWidget extends Drawable implements IWidget { this.hovered = bounds.contains(mouseX, mouseY); int textureOffset = this.getTextureId(this.hovered); GlStateManager.enableBlend(); - GlStateManager.blendFuncSeparate(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SrcBlendFactor.ONE, GlStateManager.DstBlendFactor.ZERO); - GlStateManager.blendFunc(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA); + GlStateManager.blendFuncSeparate(GlStateManager.class_1033.SRC_ALPHA, GlStateManager.class_1027.ONE_MINUS_SRC_ALPHA, GlStateManager.class_1033.ONE, GlStateManager.class_1027.ZERO); + GlStateManager.blendFunc(GlStateManager.class_1033.SRC_ALPHA, GlStateManager.class_1027.ONE_MINUS_SRC_ALPHA); //Four Corners this.drawTexturedRect(this.x, this.y, 0, 46 + textureOffset * 20, 4, 4); this.drawTexturedRect(this.x + this.width - 4, this.y, 196, 46 + textureOffset * 20, 4, 4); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java index c5f5262aa..bb6b03696 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java @@ -5,8 +5,7 @@ import me.shedaniel.rei.api.IRecipeDisplay; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.smelting.BlastingRecipe; -import net.minecraft.recipe.smelting.SmokingRecipe; +import net.minecraft.recipe.cooking.BlastingRecipe; import net.minecraft.util.Identifier; import java.util.Arrays; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index e821d06ef..280692ea1 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -1,7 +1,6 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; -import me.shedaniel.rei.api.IRecipeDisplay; import me.shedaniel.rei.api.IRecipePlugin; import me.shedaniel.rei.api.SpeedCraftFunctional; import me.shedaniel.rei.client.RecipeHelper; @@ -14,14 +13,13 @@ import net.minecraft.client.gui.container.FurnaceGui; import net.minecraft.client.gui.container.SmokerGui; import net.minecraft.client.gui.ingame.PlayerInventoryGui; import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.cooking.BlastingRecipe; +import net.minecraft.recipe.cooking.SmeltingRecipe; +import net.minecraft.recipe.cooking.SmokingRecipe; import net.minecraft.recipe.crafting.ShapedRecipe; import net.minecraft.recipe.crafting.ShapelessRecipe; -import net.minecraft.recipe.smelting.BlastingRecipe; -import net.minecraft.recipe.smelting.SmeltingRecipe; -import net.minecraft.recipe.smelting.SmokingRecipe; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.List; public class DefaultPlugin implements IRecipePlugin { @@ -93,7 +91,7 @@ public class DefaultPlugin implements IRecipePlugin { public Class[] getFunctioningFor() { return new Class[]{FurnaceGui.class}; } - + @Override public boolean performAutoCraft(Gui gui, DefaultSmeltingDisplay recipe) { if (gui instanceof FurnaceGui) @@ -102,7 +100,7 @@ public class DefaultPlugin implements IRecipePlugin { MinecraftClient.getInstance().interactionManager.clickRecipe(MinecraftClient.getInstance().player.container.syncId, recipe.getRecipe(), Gui.isShiftPressed()); return true; } - + @Override public boolean acceptRecipe(Gui gui, DefaultSmeltingDisplay recipe) { return gui instanceof FurnaceGui; @@ -113,7 +111,7 @@ public class DefaultPlugin implements IRecipePlugin { public Class[] getFunctioningFor() { return new Class[]{SmokerGui.class}; } - + @Override public boolean performAutoCraft(Gui gui, DefaultSmokingDisplay recipe) { if (gui instanceof SmokerGui) @@ -122,7 +120,7 @@ public class DefaultPlugin implements IRecipePlugin { MinecraftClient.getInstance().interactionManager.clickRecipe(MinecraftClient.getInstance().player.container.syncId, recipe.getRecipe(), Gui.isShiftPressed()); return true; } - + @Override public boolean acceptRecipe(Gui gui, DefaultSmokingDisplay recipe) { return gui instanceof SmokerGui; @@ -133,7 +131,7 @@ public class DefaultPlugin implements IRecipePlugin { public Class[] getFunctioningFor() { return new Class[]{BlastFurnaceGui.class}; } - + @Override public boolean performAutoCraft(Gui gui, DefaultBlastingDisplay recipe) { if (gui instanceof BlastFurnaceGui) @@ -142,7 +140,7 @@ public class DefaultPlugin implements IRecipePlugin { MinecraftClient.getInstance().interactionManager.clickRecipe(MinecraftClient.getInstance().player.container.syncId, recipe.getRecipe(), Gui.isShiftPressed()); return true; } - + @Override public boolean acceptRecipe(Gui gui, DefaultBlastingDisplay recipe) { return gui instanceof BlastFurnaceGui; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java index 5561daed3..e132535aa 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java @@ -5,7 +5,7 @@ import me.shedaniel.rei.api.IRecipeDisplay; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.smelting.SmeltingRecipe; +import net.minecraft.recipe.cooking.SmeltingRecipe; import net.minecraft.util.Identifier; import java.util.Arrays; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java index 0961cb0ad..257454f54 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java @@ -5,8 +5,7 @@ import me.shedaniel.rei.api.IRecipeDisplay; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.smelting.SmeltingRecipe; -import net.minecraft.recipe.smelting.SmokingRecipe; +import net.minecraft.recipe.cooking.SmokingRecipe; import net.minecraft.util.Identifier; import java.util.Arrays; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 04e08b9ee..4d2106474 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "id": "roughlyenoughitems", "name": "RoughlyEnoughItems", "description": "To allow players to view items and recipes.", - "version": "2.0.0.38", + "version": "2.0.0.39", "side": "client", "authors": [ "Danielshe" |