diff options
| author | Unknown <shekwancheung0528@gmail.com> | 2019-08-18 00:27:57 +0800 |
|---|---|---|
| committer | Unknown <shekwancheung0528@gmail.com> | 2019-08-18 00:27:57 +0800 |
| commit | 06dd7b84849ab01417e6449b0adbb1c83e8c38e0 (patch) | |
| tree | 966c4beb26e41d3c59bc45174411b7c0f968c64a /src/main/java/me/shedaniel/rei/plugin | |
| parent | 0958de019acaf28cf3324a4e2dc4715ad612353e (diff) | |
| download | RoughlyEnoughItems-06dd7b84849ab01417e6449b0adbb1c83e8c38e0.tar.gz RoughlyEnoughItems-06dd7b84849ab01417e6449b0adbb1c83e8c38e0.tar.bz2 RoughlyEnoughItems-06dd7b84849ab01417e6449b0adbb1c83e8c38e0.zip | |
I guess this is quite good
Diffstat (limited to 'src/main/java/me/shedaniel/rei/plugin')
12 files changed, 71 insertions, 14 deletions
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java index 2e3d87325..6fc5d3a88 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java @@ -24,7 +24,7 @@ public class DefaultAutoCraftingPlugin implements REIPluginV0 { @Override public SemanticVersion getMinimumVersion() throws VersionParsingException { - return SemanticVersion.parse("2.10"); + return SemanticVersion.parse("2.11"); } @Override diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index 7e2c1a983..e0e4438c7 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -90,7 +90,7 @@ public class DefaultPlugin implements REIPluginV0 { @Override public SemanticVersion getMinimumVersion() throws VersionParsingException { - return SemanticVersion.parse("2.10"); + return SemanticVersion.parse("2.11"); } @Override diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultServerContainerPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultServerContainerPlugin.java index d192cf39e..5bde30c99 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultServerContainerPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultServerContainerPlugin.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.plugin; import me.shedaniel.rei.plugin.containers.CraftingContainerInfoWrapper; 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 c12d7e809..dc779d42a 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java @@ -56,7 +56,6 @@ public class DefaultCategoryHandler implements AutoTransferHandler { if (containerScreen instanceof RecipeBookProvider) ((RecipeBookGuiHooks) ((RecipeBookProvider) containerScreen).getRecipeBookGui()).rei_getGhostSlots().reset(); PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer()); - // buf.writeUuid(RoughlyEnoughItemsNetwork.CRAFTING_TABLE_MOVE); buf.writeIdentifier(recipe.getRecipeCategory()); buf.writeBoolean(Screen.hasShiftDown()); diff --git a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java index a5a328cde..3c228c468 100644 --- a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java @@ -6,8 +6,9 @@ package me.shedaniel.rei.plugin.blasting; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.RecipeCategory; +import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.rei.api.Renderer; +import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.renderers.RecipeRenderer; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.SlotWidget; @@ -15,6 +16,7 @@ import me.shedaniel.rei.gui.widget.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.GuiLighting; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; @@ -29,7 +31,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultBlastingCategory implements RecipeCategory<DefaultBlastingDisplay> { +public class DefaultBlastingCategory implements TransferRecipeCategory<DefaultBlastingDisplay> { @Override public Identifier getIdentifier() { @@ -81,4 +83,14 @@ public class DefaultBlastingCategory implements RecipeCategory<DefaultBlastingDi return widgets; } + @Override + public void renderRedSlots(List<Widget> widgets, Rectangle bounds, DefaultBlastingDisplay display, IntList redSlots) { + Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + GlStateManager.translatef(0, 0, 400); + if (redSlots.contains(0)) { + DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 0x30ff0000); + } + GlStateManager.translatef(0, 0, -400); + } + } diff --git a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java index d8437887e..9958af02f 100644 --- a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java @@ -5,7 +5,6 @@ package me.shedaniel.rei.plugin.blasting; -import me.shedaniel.rei.api.RecipeDisplay; import me.shedaniel.rei.api.TransferRecipeDisplay; import me.shedaniel.rei.plugin.DefaultPlugin; import me.shedaniel.rei.server.ContainerInfo; diff --git a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java index 67a891c92..2860989a1 100644 --- a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java @@ -8,10 +8,10 @@ package me.shedaniel.rei.plugin.campfire; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; -import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java b/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java index 19bd70b38..78201a3bc 100644 --- a/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java +++ b/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.plugin.containers; import me.shedaniel.rei.server.ContainerInfo; diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java index 29f9753f1..1c69c65c8 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java @@ -7,14 +7,16 @@ package me.shedaniel.rei.plugin.crafting; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.RecipeCategory; +import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.rei.api.Renderer; +import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.GuiLighting; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; @@ -26,7 +28,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultCraftingCategory implements RecipeCategory<DefaultCraftingDisplay> { +public class DefaultCraftingCategory implements TransferRecipeCategory<DefaultCraftingDisplay> { public static int getSlotWithSize(DefaultCraftingDisplay recipeDisplay, int num) { if (recipeDisplay.getWidth() == 1) { @@ -94,4 +96,16 @@ public class DefaultCraftingCategory implements RecipeCategory<DefaultCraftingDi return widgets; } + @Override + public void renderRedSlots(List<Widget> widgets, Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) { + Point startPoint = new Point((int) bounds.getCenterX() - 58, (int) bounds.getCenterY() - 27); + GlStateManager.translatef(0, 0, 400); + for (Integer slot : redSlots) { + int i = getSlotWithSize(display, slot); + int x = i % 3; + int y = (i - x) / 3; + DrawableHelper.fill(startPoint.x + 1 + x * 18, startPoint.y + 1 + y * 18, startPoint.x + 1 + x * 18 + 16, startPoint.y + 1 + y * 18 + 16, 0x30ff0000); + } + GlStateManager.translatef(0, 0, -400); + } } diff --git a/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java b/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java index faae202d7..9f2c083f3 100644 --- a/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java @@ -6,8 +6,9 @@ package me.shedaniel.rei.plugin.smelting; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.RecipeCategory; +import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.rei.api.Renderer; +import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.renderers.RecipeRenderer; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.SlotWidget; @@ -15,6 +16,7 @@ import me.shedaniel.rei.gui.widget.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.GuiLighting; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; @@ -29,7 +31,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultSmeltingCategory implements RecipeCategory<DefaultSmeltingDisplay> { +public class DefaultSmeltingCategory implements TransferRecipeCategory<DefaultSmeltingDisplay> { @Override public Identifier getIdentifier() { @@ -80,4 +82,14 @@ public class DefaultSmeltingCategory implements RecipeCategory<DefaultSmeltingDi return widgets; } + @Override + public void renderRedSlots(List<Widget> widgets, Rectangle bounds, DefaultSmeltingDisplay display, IntList redSlots) { + Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + GlStateManager.translatef(0, 0, 400); + if (redSlots.contains(0)) { + DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 0x30ff0000); + } + GlStateManager.translatef(0, 0, -400); + } + } diff --git a/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java b/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java index b171e1669..62230f493 100644 --- a/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java @@ -6,8 +6,9 @@ package me.shedaniel.rei.plugin.smoking; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.RecipeCategory; +import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.rei.api.Renderer; +import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.renderers.RecipeRenderer; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.SlotWidget; @@ -15,6 +16,7 @@ import me.shedaniel.rei.gui.widget.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.GuiLighting; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; @@ -29,7 +31,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultSmokingCategory implements RecipeCategory<DefaultSmokingDisplay> { +public class DefaultSmokingCategory implements TransferRecipeCategory<DefaultSmokingDisplay> { @Override public Identifier getIdentifier() { @@ -80,4 +82,14 @@ public class DefaultSmokingCategory implements RecipeCategory<DefaultSmokingDisp return widgets; } + @Override + public void renderRedSlots(List<Widget> widgets, Rectangle bounds, DefaultSmokingDisplay display, IntList redSlots) { + Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + GlStateManager.translatef(0, 0, 400); + if (redSlots.contains(0)) { + DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 0x30ff0000); + } + GlStateManager.translatef(0, 0, -400); + } + } diff --git a/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java index 0c58b5baa..55d6a621d 100644 --- a/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java @@ -5,7 +5,6 @@ package me.shedaniel.rei.plugin.smoking; -import me.shedaniel.rei.api.RecipeDisplay; import me.shedaniel.rei.api.TransferRecipeDisplay; import me.shedaniel.rei.plugin.DefaultPlugin; import me.shedaniel.rei.server.ContainerInfo; |
