From aa916b6d14d62e062fec49c378e0f62b254c83ae Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 12 May 2019 00:42:09 +0800 Subject: Extra button texture Close #92 --- .../rei/gui/VillagerRecipeViewingScreen.java | 6 +++++ .../me/shedaniel/rei/gui/widget/ButtonWidget.java | 26 ++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui') diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index 99ca687d8..d57c9a53b 100644 --- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java @@ -102,6 +102,12 @@ public class VillagerRecipeViewingScreen extends Screen { selectedRecipeIndex = finalIndex; VillagerRecipeViewingScreen.this.init(); } + + @Override + protected int getTextureId(boolean boolean_1) { + enabled = selectedRecipeIndex != finalIndex; + return super.getTextureId(boolean_1); + } }); index++; } 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 9ad51e516..637107b2a 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -4,9 +4,9 @@ import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.client.ScreenHelper; import net.minecraft.client.audio.PositionedSoundInstance; import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.widget.AbstractButtonWidget; import net.minecraft.sound.SoundEvents; import net.minecraft.text.TextComponent; +import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; import java.awt.*; @@ -16,6 +16,7 @@ import java.util.Optional; public abstract class ButtonWidget extends HighlightableWidget { + public static final Identifier BUTTON_LOCATION = new Identifier("roughlyenoughitems", "textures/gui/button.png"); public String text; public boolean enabled; public boolean focused; @@ -57,25 +58,26 @@ public abstract class ButtonWidget extends HighlightableWidget { @Override public void render(int mouseX, int mouseY, float delta) { int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; - minecraft.getTextureManager().bindTexture(AbstractButtonWidget.WIDGETS_LOCATION); + minecraft.getTextureManager().bindTexture(BUTTON_LOCATION); GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); int textureOffset = this.getTextureId(isHovered(mouseX, mouseY)); GlStateManager.enableBlend(); GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); //Four Corners - this.blit(x, y, 0, 46 + textureOffset * 20, 4, 4); - this.blit(x + width - 4, y, 196, 46 + textureOffset * 20, 4, 4); - this.blit(x, y + height - 4, 0, 62 + textureOffset * 20, 4, 4); - this.blit(x + width - 4, y + height - 4, 196, 62 + textureOffset * 20, 4, 4); + blit(x, y, 0, textureOffset * 80, 4, 4); + blit(x + width - 4, y, 252, textureOffset * 80, 4, 4); + blit(x, y + height - 4, 0, textureOffset * 80 + 76, 4, 4); + blit(x + width - 4, y + height - 4, 252, textureOffset * 80 + 76, 4, 4); //Sides - this.blit(x + 4, y, 4, 46 + textureOffset * 20, width - 8, 4); - this.blit(x + 4, y + height - 4, 4, 62 + textureOffset * 20, width - 8, 4); - - for(int i = y + 4; i < y + height - 4; i += 4) { - this.blit(x, i, 0, 50 + textureOffset * 20, MathHelper.ceil(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 4)); - this.blit(x + MathHelper.ceil(width / 2f), i, 200 - MathHelper.floor(width / 2f), 50 + textureOffset * 20, MathHelper.floor(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 4)); + blit(x + 4, y, 4, textureOffset * 80, MathHelper.ceil((width - 8) / 2f), 4); + blit(x + 4, y + height - 4, 4, textureOffset * 80 + 76, MathHelper.ceil((width - 8) / 2f), 4); + blit(x + 4 + MathHelper.ceil((width - 8) / 2f), y + height - 4, 252 - MathHelper.floor((width - 8) / 2f), textureOffset * 80 + 76, MathHelper.floor((width - 8) / 2f), 4); + blit(x + 4 + MathHelper.ceil((width - 8) / 2f), y, 252 - MathHelper.floor((width - 8) / 2f), textureOffset * 80, MathHelper.floor((width - 8) / 2f), 4); + for(int i = y + 4; i < y + height - 4; i += 76) { + blit(x, i, 0, 4 + textureOffset * 80, MathHelper.ceil(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 76)); + blit(x + MathHelper.ceil(width / 2f), i, 256 - MathHelper.floor(width / 2f), 4 + textureOffset * 80, MathHelper.floor(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 76)); } int colour = 14737632; -- cgit From 7e1e39d8453b0a5b5c7c1045fc5e6bb428b840d8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 12 May 2019 01:34:33 +0800 Subject: License Heading --- src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java | 5 +++++ .../java/me/shedaniel/rei/gui/config/ItemListOrderingConfig.java | 5 +++++ .../java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/renderables/EmptyRenderer.java | 5 +++++ .../java/me/shedaniel/rei/gui/renderables/ItemStackRenderer.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/renderables/RecipeRenderer.java | 5 +++++ .../java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java | 5 +++++ .../me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/HighlightableWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java | 5 +++++ .../java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java | 5 +++++ .../java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java | 5 +++++ src/main/java/me/shedaniel/rei/gui/widget/Widget.java | 5 +++++ 31 files changed, 155 insertions(+) (limited to 'src/main/java/me/shedaniel/rei/gui') diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index b96286533..3cc1e5037 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java index 68ddc78a0..54560ed89 100644 --- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index 2bb1b4486..3d2c1f12a 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index d57c9a53b..9d04b9168 100644 --- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/config/ItemListOrderingConfig.java b/src/main/java/me/shedaniel/rei/gui/config/ItemListOrderingConfig.java index 7e447007c..2742354bb 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/ItemListOrderingConfig.java +++ b/src/main/java/me/shedaniel/rei/gui/config/ItemListOrderingConfig.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.config; import me.shedaniel.rei.client.ItemListOrdering; diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java index 07d65ff50..435ae8983 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.credits; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java index bc780b53f..f0b0eac8c 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.credits; import me.shedaniel.rei.client.ScreenHelper; diff --git a/src/main/java/me/shedaniel/rei/gui/renderables/EmptyRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderables/EmptyRenderer.java index 0c2f9bbfa..3826377f0 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderables/EmptyRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderables/EmptyRenderer.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.renderables; import me.shedaniel.rei.api.Renderer; diff --git a/src/main/java/me/shedaniel/rei/gui/renderables/ItemStackRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderables/ItemStackRenderer.java index a64196311..de18479db 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderables/ItemStackRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderables/ItemStackRenderer.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.renderables; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/renderables/RecipeRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderables/RecipeRenderer.java index 1c3a861c1..851db3053 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderables/RecipeRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderables/RecipeRenderer.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.renderables; import me.shedaniel.rei.api.Renderer; diff --git a/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java index bc76ec563..422b0e447 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.renderables; import com.google.common.collect.Lists; 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 637107b2a..bfc2f948f 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java index eb039535e..ecf645a8b 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import java.awt.*; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java index 2ffa42c9c..8a6ccdc76 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import me.shedaniel.rei.client.ScreenHelper; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java index a2731c692..767989d86 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java index a3f4308e8..02f8cfbd1 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import net.minecraft.text.TextComponent; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java index afcec07f7..76b1c2171 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import me.shedaniel.cloth.api.ClientUtils; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/HighlightableWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/HighlightableWidget.java index 82f97ab33..8d6bb3578 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/HighlightableWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/HighlightableWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import java.awt.*; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java index 3286c15c9..83457b659 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java index 7509c45df..c5bdb84c2 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import me.shedaniel.rei.api.Renderer; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java index 90d96d5a7..4f6fb54b7 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import net.minecraft.client.gui.Element; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java b/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java index 96e805d8d..f692a848f 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java index cd294dc69..b21127cb6 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java index baf2f6449..1d65feb3f 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java index 13989fe3b..9baf62c12 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java index 74c862dc9..3e9ef5e17 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import java.awt.*; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java index bbf0c6c08..d89cef8c4 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java index b3b43eff5..948c621a4 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import me.shedaniel.rei.api.RecipeDisplay; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index 3f43eb156..2ae47fca2 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java index 4a80de779..e470e16e8 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import com.google.common.base.Predicates; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java index 36afd416e..6882483f1 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java @@ -1,3 +1,8 @@ +/* + * Roughly Enough Items by Danielshe. + * Licensed under the MIT License. + */ + package me.shedaniel.rei.gui.widget; import net.minecraft.client.MinecraftClient; -- cgit From eab120d5619f972e29afc9776959f6d6096d3926 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 12 May 2019 10:36:42 +0800 Subject: More docs --- src/main/java/me/shedaniel/rei/gui/widget/Widget.java | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/main/java/me/shedaniel/rei/gui') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java index 6882483f1..d7e47da15 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java @@ -10,9 +10,20 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.AbstractParentElement; import net.minecraft.client.gui.Drawable; +/** + * The base class for a screen widget + * + * @see HighlightableWidget for a widget with bounds + */ public abstract class Widget extends AbstractParentElement implements Drawable { + /** + * The Minecraft Client instance + */ protected final MinecraftClient minecraft = MinecraftClient.getInstance(); + /** + * The font for rendering text + */ protected final TextRenderer font = minecraft.textRenderer; } -- cgit From b99108611ea89dc0eda6c433447ce398a98ad4ad Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 12 May 2019 10:55:09 +0800 Subject: Build 109 --- src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java | 3 +-- src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui') diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index 3d2c1f12a..d067d4378 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -35,9 +35,8 @@ import java.util.function.Supplier; public class RecipeViewingScreen extends Screen { - public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui" + "/recipecontainer.png"); + public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); public static final Color SUB_COLOR = new Color(159, 159, 159); - private static final Identifier CREATIVE_INVENTORY_TABS = new Identifier("textures/gui/container" + "/creative_inventory/tabs.png"); private final List widgets; private final List tabs; private final Map> categoriesMap; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java index 9baf62c12..f5442eb14 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java @@ -9,7 +9,6 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.audio.PositionedSoundInstance; import net.minecraft.client.render.GuiLighting; import net.minecraft.sound.SoundEvents; -import org.lwjgl.glfw.GLFW; public class SearchFieldWidget extends TextFieldWidget { @@ -59,7 +58,7 @@ public class SearchFieldWidget extends TextFieldWidget { @Override public boolean keyPressed(int int_1, int int_2, int int_3) { if (this.isVisible() && this.isFocused()) - if (int_1 == GLFW.GLFW_KEY_ENTER || int_1 == GLFW.GLFW_KEY_KP_ENTER) { + if (int_1 == 257 || int_1 == 335) { setFocused(false); return true; } -- cgit