Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-16 13:03:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.20.4' into 1.20.4

Browse source
This commit is contained in:
Flanks255 2024-03-06 18:45:01 -06:00
commit fc101a90df
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java
View file

@ -20,16 +20,17 @@ public class CommonConfig {
} }
public static class ItemSettings { public static class ItemSettings {
public static ModConfigSpec.ConfigValue<List<String>> DRILL_EXTRA_MINING_WHITELIST; public static ModConfigSpec.ConfigValue<List<? extends String>> DRILL_EXTRA_MINING_WHITELIST;
public static void build() { public static void build() {
BUILDER.comment("Item settings").push("itemsSettings"); BUILDER.comment("Item settings").push("itemsSettings");
// TODO: Tags!
DRILL_EXTRA_MINING_WHITELIST = BUILDER 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.") .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<String>() {{ .defineList("Drill Extra Whitelist", new ArrayList<>() {{
add("TConstruct:GravelOre"); add("TConstruct:GravelOre");
}}); }}, (o) -> o instanceof String);
BUILDER.pop(); 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?") 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? .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); 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", obj -> obj instanceof String); RELAYCONFIGURATOR = BUILDER.comment("define the item used to configure Direction in laser relays").define("relayConfigurator", "minecraft:compass");
BUILDER.pop(); BUILDER.pop();
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java
View file

@ -38,7 +38,7 @@ public class GuiDrill extends AAScreen<ContainerDrill> {
@Override @Override
public void renderLabels(@Nonnull GuiGraphics guiGraphics, int x, int y) { 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 @Override

2
src/main/resources/META-INF/mods.toml
View file

@ -10,7 +10,7 @@ displayName="Actually Additions"
credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp; Porters: Flanks, MrBysco, ErrorMikey; 1.20+ Textures: Ridanisaurus" credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp; Porters: Flanks, MrBysco, ErrorMikey; 1.20+ Textures: Ridanisaurus"
authors="Ellpeck" authors="Ellpeck"
description=''' 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]] [[dependencies.actuallyadditions]]