aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorDaniel She <shekwancheung0528@gmail.com>2019-05-12 10:55:21 +0800
committerDaniel She <shekwancheung0528@gmail.com>2019-05-12 10:55:21 +0800
commitf51e5af85e26f588cbe2eba2eef728e783201bc8 (patch)
treee490afcfe8974af8a6c65954667bf822505224d4 /src/main
parent64c240a5a5eb6b4312b86e24ddbaaa70ada49359 (diff)
parentb99108611ea89dc0eda6c433447ce398a98ad4ad (diff)
downloadRoughlyEnoughItems-f51e5af85e26f588cbe2eba2eef728e783201bc8.tar.gz
RoughlyEnoughItems-f51e5af85e26f588cbe2eba2eef728e783201bc8.tar.bz2
RoughlyEnoughItems-f51e5af85e26f588cbe2eba2eef728e783201bc8.zip
Merge branch '1.14-dev' into 1.14
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java14
-rw-r--r--src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java5
-rw-r--r--src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java5
-rw-r--r--src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java16
-rw-r--r--src/main/java/me/shedaniel/rei/api/ClientHelper.java85
-rw-r--r--src/main/java/me/shedaniel/rei/api/ConfigManager.java39
-rw-r--r--src/main/java/me/shedaniel/rei/api/DisplayHelper.java91
-rw-r--r--src/main/java/me/shedaniel/rei/api/DisplaySettings.java27
-rw-r--r--src/main/java/me/shedaniel/rei/api/DisplayVisibility.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/DisplayVisibilityHandler.java21
-rw-r--r--src/main/java/me/shedaniel/rei/api/ItemCheatingMode.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/ItemRegistry.java28
-rw-r--r--src/main/java/me/shedaniel/rei/api/PluginDisabler.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/PluginFunction.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/REIPlugin.java10
-rw-r--r--src/main/java/me/shedaniel/rei/api/REIPluginEntry.java54
-rw-r--r--src/main/java/me/shedaniel/rei/api/RecipeCategory.java81
-rw-r--r--src/main/java/me/shedaniel/rei/api/RecipeDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/RecipeHelper.java28
-rw-r--r--src/main/java/me/shedaniel/rei/api/RelativePoint.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/Renderable.java8
-rw-r--r--src/main/java/me/shedaniel/rei/api/Renderer.java5
-rw-r--r--src/main/java/me/shedaniel/rei/api/SpeedCraftFunctional.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/BaseBoundsHandlerImpl.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java14
-rw-r--r--src/main/java/me/shedaniel/rei/client/ConfigManagerImpl.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/ConfigObject.java8
-rw-r--r--src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java7
-rw-r--r--src/main/java/me/shedaniel/rei/client/ItemListOrdering.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/ItemRegistryImpl.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/PluginDisablerImpl.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java11
-rw-r--r--src/main/java/me/shedaniel/rei/client/RecipeScreenType.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/ScreenHelper.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/SearchArgument.java5
-rw-r--r--src/main/java/me/shedaniel/rei/client/Weather.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java8
-rw-r--r--src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java11
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/ItemListOrderingConfig.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/renderables/EmptyRenderer.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/renderables/ItemStackRenderer.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/renderables/RecipeRenderer.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java31
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/HighlightableWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java8
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java5
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/Widget.java16
-rw-r--r--src/main/java/me/shedaniel/rei/listeners/ContainerScreenHooks.java5
-rw-r--r--src/main/java/me/shedaniel/rei/listeners/CreativePlayerInventoryScreenHooks.java5
-rw-r--r--src/main/java/me/shedaniel/rei/listeners/RecipeBookGuiHooks.java5
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/BrewingRecipe.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultBrewingDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultCampfireDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultCraftingDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultCustomDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultShapedDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultShapelessDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java5
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingDisplay.java5
-rw-r--r--src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java5
-rw-r--r--src/main/resources/assets/roughlyenoughitems/textures/gui/button.pngbin0 -> 14358 bytes
94 files changed, 939 insertions, 32 deletions
diff --git a/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java b/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java
index 36d56329d..fb1334989 100644
--- a/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java
+++ b/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java
@@ -11,10 +11,21 @@ import org.lwjgl.opengl.GL11;
* @author Zeitheron
*/
public class Scissors {
+ /**
+ * Starts the scissor test
+ */
public static void begin() {
GL11.glEnable(GL11.GL_SCISSOR_TEST);
}
+ /**
+ * Setup the scissor bounds
+ *
+ * @param x the top left x coordinates
+ * @param y the top left y coordinates
+ * @param width the width of the bounds
+ * @param height the height of the bounds
+ */
public static void scissor(int x, int y, int width, int height) {
Window window = MinecraftClient.getInstance().window;
@@ -32,6 +43,9 @@ public class Scissors {
GL11.glScissor(x, sh - height - y, width, height);
}
+ /**
+ * Stops the scissor test
+ */
public static void end() {
GL11.glDisable(GL11.GL_SCISSOR_TEST);
}
diff --git a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java b/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
index 557336173..3d329531c 100644
--- a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
+++ b/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
@@ -1,3 +1,8 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
package me.shedaniel.rei;
import io.github.prospector.modmenu.api.ModMenuApi;
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 2904be0ca..f96ccd42a 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -1,3 +1,8 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
package me.shedaniel.rei;
import com.google.common.collect.Lists;
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
index 0687b1f50..63b7765e2 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -1,3 +1,8 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
package me.shedaniel.rei;
import me.shedaniel.rei.gui.widget.ItemListOverlay;
diff --git a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java b/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java
index 83cf9163c..f363dccac 100644
--- a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java
+++ b/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java
@@ -1,3 +1,8 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
package me.shedaniel.rei.api;
import net.minecraft.client.gui.Screen;
diff --git a/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java b/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java
index 07125643c..01cdff416 100644
--- a/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java
+++ b/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java
@@ -1,11 +1,27 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
package me.shedaniel.rei.api;
import java.awt.*;
public interface ButtonAreaSupplier {
+ /**
+ * Declares the button bounds
+ *
+ * @param bounds the bounds of the recipe display
+ * @return the bounds of the button
+ */
Rectangle get(Rectangle bounds);
+ /**
+ * Declares the button text
+ *
+ * @return the text of the button
+ */
default String getButtonText() {
return "+";
}
diff --git a/src/main/java/me/shedaniel/rei/api/ClientHelper.java b/src/main/java/me/shedaniel/rei/api/ClientHelper.java
index d4648bbaa..e0fbfbed3 100644
--- a/src/main/java/me/shedaniel/rei/api/ClientHelper.java
+++ b/src/main/java/me/shedaniel/rei/api/ClientHelper.java
@@ -1,7 +1,11 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
package me.shedaniel.rei.api;
import me.shedaniel.rei.client.ClientHelperImpl;
-import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -10,35 +14,107 @@ import net.minecraft.util.Identifier;
import java.util.Li