From 6da50dfa6012a21e485cc7f6bad1f92691dbbaf9 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Thu, 7 Mar 2024 01:39:34 +0100 Subject: [PATCH 1/2] Fix drill gui title --- .../ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java index 91148a935..829e22f96 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java @@ -38,7 +38,7 @@ public class GuiDrill extends AAScreen { @Override public void renderLabels(@Nonnull GuiGraphics guiGraphics, int x, int y) { - AssetUtil.displayNameString(guiGraphics, this.font, this.imageWidth, -10, I18n.get("container." + ActuallyAdditions.MODID + ".drill.name")); + AssetUtil.displayNameString(guiGraphics, this.font, this.imageWidth, -10, I18n.get("container." + ActuallyAdditions.MODID + ".drill")); } @Override From e22b1615a75b7e55c4206bf2d1b7540a1eba09fe Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Thu, 7 Mar 2024 00:40:01 +0000 Subject: [PATCH 2/2] fix: incorrect config spam --- .../actuallyadditions/mod/config/CommonConfig.java | 11 ++++++----- src/main/resources/META-INF/mods.toml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java index eb7a1843e..8de47c2b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java @@ -20,16 +20,17 @@ public class CommonConfig { } public static class ItemSettings { - public static ModConfigSpec.ConfigValue> DRILL_EXTRA_MINING_WHITELIST; + public static ModConfigSpec.ConfigValue> DRILL_EXTRA_MINING_WHITELIST; public static void build() { BUILDER.comment("Item settings").push("itemsSettings"); + // TODO: Tags! DRILL_EXTRA_MINING_WHITELIST = BUILDER .comment("By default, the Drill can mine certain blocks. If there is one that it can't mine, but should be able to, put its REGISTRY NAME here. These are the actual registered Item Names, the ones you use, for example, when using the /give Command.") - .define("Drill Extra Whitelist", new ArrayList() {{ + .defineList("Drill Extra Whitelist", new ArrayList<>() {{ add("TConstruct:GravelOre"); - }}); + }}, (o) -> o instanceof String); BUILDER.pop(); } @@ -141,8 +142,8 @@ public class CommonConfig { MOST_BLAND_PERSON_EVER = BUILDER.comment("If you want to be really boring and lame, you can turn on this setting to disable colored names on Actually Additions items. Because why would you want things to look pretty anyways, right?") .define("noColoredItemNames", false); //TODO is this still needed? - REDSTONECONFIGURATOR = BUILDER.comment("define the item used to configure Redstone Mode").define("redstoneConfigurator", "minecraft:redstone_torch", obj -> obj instanceof String); - RELAYCONFIGURATOR = BUILDER.comment("define the item used to configure Direction in laser relays").define("relayConfigurator", "minecraft:compass", obj -> obj instanceof String); + REDSTONECONFIGURATOR = BUILDER.comment("define the item used to configure Redstone Mode").define("redstoneConfigurator", "minecraft:redstone_torch"); + RELAYCONFIGURATOR = BUILDER.comment("define the item used to configure Direction in laser relays").define("relayConfigurator", "minecraft:compass"); BUILDER.pop(); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index cc87344c2..cb99a62dc 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -10,7 +10,7 @@ displayName="Actually Additions" credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp; Porters: Flanks, MrBysco, ErrorMikey; 1.20+ Textures: Ridanisaurus" authors="Ellpeck" description=''' -Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more! +Do you want Automation? Wireless Transport? Better Machines? A cup o\' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more! ''' [[dependencies.actuallyadditions]]