From 69d386214f5d3471a3ef1e5533037cdc32648c57 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sun, 28 Feb 2021 02:07:47 +0800
Subject: Port to Architectury Multiloader

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../me/shedaniel/rei/api/gui/widgets/Tooltip.java   |   4 ++--
 api/src/main/resources/fabric.mod.json              |  20 --------------------
 api/src/main/resources/icon.png                     | Bin 27270 -> 0 bytes
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 api/src/main/resources/fabric.mod.json
 delete mode 100644 api/src/main/resources/icon.png

(limited to 'api/src')

diff --git a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Tooltip.java b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Tooltip.java
index 075e57580..972df5a43 100644
--- a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Tooltip.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Tooltip.java
@@ -23,8 +23,8 @@
 
 package me.shedaniel.rei.api.gui.widgets;
 
+import me.shedaniel.architectury.utils.EnvExecutor;
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Executor;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.impl.Internals;
 import net.fabricmc.api.EnvType;
@@ -64,6 +64,6 @@ public interface Tooltip {
     List<Component> getText();
     
     default void queue() {
-        Executor.runIfEnv(EnvType.CLIENT, () -> () -> REIHelper.getInstance().queueTooltip(this));
+        EnvExecutor.runInEnv(EnvType.CLIENT, () -> () -> REIHelper.getInstance().queueTooltip(this));
     }
 }
diff --git a/api/src/main/resources/fabric.mod.json b/api/src/main/resources/fabric.mod.json
deleted file mode 100644
index 29784abf1..000000000
--- a/api/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "roughlyenoughitems-api",
-  "name": "REI (API)",
-  "description": "The api facing part of Roughly Enough Items.",
-  "version": "${version}",
-  "authors": [
-    "shedaniel"
-  ],
-  "contact": {
-    "homepage": "https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items",
-    "sources": "https://github.com/shedaniel/RoughlyEnoughItems",
-    "issues": "https://github.com/shedaniel/RoughlyEnoughItems/issues"
-  },
-  "license": "MIT",
-  "icon": "icon.png",
-  "custom": {
-    "modmenu:parent": "roughlyenoughitems"
-  }
-}
diff --git a/api/src/main/resources/icon.png b/api/src/main/resources/icon.png
deleted file mode 100644
index b7a48aef0..000000000
Binary files a/api/src/main/resources/icon.png and /dev/null differ
-- 
cgit