diff options
| -rwxr-xr-x | build.gradle | 14 | ||||
| -rw-r--r-- | gradle.properties | 17 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java | 15 | ||||
| -rwxr-xr-x | src/main/resources/fabric.mod.json | 6 |
4 files changed, 35 insertions, 17 deletions
diff --git a/build.gradle b/build.gradle index b4fc7c2b5..66ca0e783 100755 --- a/build.gradle +++ b/build.gradle @@ -50,11 +50,21 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_version}" modCompile "net.fabricmc:fabric-loader:${project.fabricloader_version}" - modCompile "net.fabricmc:fabric:${project.fabric_version}" +// modCompile "net.fabricmc:fabric:${project.fabric_version}" + modCompile "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}" + modCompile "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}" + modCompile "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}" + modCompile "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}" + modCompile "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}" modCompile "cloth:ClothEvents:${cloth_events_version}" modCompile "cloth-config:ClothConfig:${cloth_config_version}" if (includeDep) { - include "net.fabricmc:fabric:${project.fabric_version}" +// include "net.fabricmc:fabric:${project.fabric_version}" + include "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}" + include "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}" + include "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}" + include "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}" + include "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}" include "cloth:ClothEvents:${cloth_events_version}" include "cloth-config:ClothConfig:${cloth_config_version}" } diff --git a/gradle.properties b/gradle.properties index 4b996dfec..4e397c1a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,14 @@ -mod_version=2.7.11+build.97 -minecraft_version=1.14 Pre-Release 4 -yarn_version=1.14 Pre-Release 4+build.2 -fabric_version=0.2.7+build.123 -fabricloader_version=0.4.1+build.126 +mod_version=2.8.0+build.98 +minecraft_version=1.14 +yarn_version=1.14+build.5 +fabricloader_version=0.4.6+build.141 jankson_version=1.1.0 cloth_events_version=0.3.1.23 -cloth_config_version=0.1.3.7 +cloth_config_version=0.2.1.14 modmenu_version=1.4.0-71 + +fabric_keybindings=0.1.0 +fabric_lib=0.1.0 +fabric_networking=0.1.0 +fabric_events_lifecycle=0.1.0 +fabric_resource_loader=0.1.0 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 3145b2d44..07d65ff50 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java @@ -1,30 +1,29 @@ package me.shedaniel.rei.gui.credits; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.menu.AlwaysSelectedItemListWidget; +import net.minecraft.client.gui.menu.AlwaysSelectedEntryListWidget; import net.minecraft.text.TextComponent; -public class CreditsEntryListWidget extends AlwaysSelectedItemListWidget<CreditsEntryListWidget.CreditsItem> { +public class CreditsEntryListWidget extends AlwaysSelectedEntryListWidget<CreditsEntryListWidget.CreditsItem> { public CreditsEntryListWidget(MinecraftClient client, int width, int height, int startY, int endY, int entryHeight) { super(client, width, height, startY, endY, entryHeight); - visible = false; // showSelection } public void creditsClearEntries() { - clearItems(); + clearEntries(); } - private CreditsItem getEntry(int int_1) { + private CreditsItem rei_getEntry(int int_1) { return this.children().get(int_1); } public void creditsAddEntry(CreditsItem entry) { - addItem(entry); + addEntry(entry); } @Override - public int getItemWidth() { + public int getRowWidth() { return width - 80; } @@ -33,7 +32,7 @@ public class CreditsEntryListWidget extends AlwaysSelectedItemListWidget<Credits return width - 40; } - public static class CreditsItem extends AlwaysSelectedItemListWidget.Item<CreditsItem> { + public static class CreditsItem extends AlwaysSelectedEntryListWidget.Entry<CreditsItem> { private String text; public CreditsItem(TextComponent textComponent) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2513c7fdf..b06c9398e 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -33,10 +33,14 @@ }, "requires": { "fabricloader": ">=0.4.0", - "fabric": "^0.2.6", + "fabric-keybindings": ">=0.1.0", + "fabric-lib": ">=0.1.0", + "fabric-networking": ">=0.1.0", + "fabric-events-lifecycle": ">=0.1.0", "cloth": "*" }, "recommends": { + "fabric-resource-loader": ">=0.1.0", "cloth-config": ">=0.1.0" }, "mixins": [ |