From cf0349b102daa56f7136637fe9f9c7ad9940232f Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Sat, 1 Jun 2024 13:22:02 -0500 Subject: [PATCH] Just lang things --- .../data/CoffeeIngredientGenerator.java | 4 +-- .../mod/blocks/BlockAtomicReconstructor.java | 2 +- .../mod/blocks/BlockGiantChest.java | 4 +-- .../mod/blocks/BlockLaserRelay.java | 2 +- .../blocks/BlockLavaFactoryController.java | 4 +-- .../mod/blocks/BlockPhantom.java | 2 +- .../mod/blocks/base/BlockContainerBase.java | 2 +- .../mod/booklet/button/BookmarkButton.java | 10 +++---- .../mod/booklet/button/TrialsButton.java | 2 +- .../mod/booklet/chapter/BookletChapter.java | 2 +- .../booklet/chapter/BookletChapterTrials.java | 2 +- .../mod/booklet/entry/BookletEntry.java | 2 +- .../mod/booklet/gui/GuiBooklet.java | 4 +-- .../mod/booklet/gui/GuiMainPage.java | 14 +++++----- .../mod/booklet/gui/GuiPage.java | 2 +- .../mod/booklet/page/BookletPage.java | 2 +- .../mod/booklet/page/ItemDisplay.java | 2 +- .../mod/booklet/page/PageCrafting.java | 10 +++---- .../mod/booklet/page/PageCrusherRecipe.java | 2 +- .../mod/booklet/page/PageEmpowerer.java | 2 +- .../mod/booklet/page/PageFurnace.java | 2 +- .../mod/booklet/page/PageLinkButton.java | 2 +- .../mod/booklet/page/PageReconstructor.java | 2 +- .../mod/booklet/page/PageTrials.java | 6 ++-- .../mod/event/ClientEvents.java | 28 +++++++++---------- .../mod/inventory/gui/GuiFeeder.java | 8 +++--- .../gui/GuiLaserRelayItemWhitelist.java | 8 +++--- .../mod/inventory/gui/GuiSmileyCloud.java | 4 +-- .../mod/items/DrillItem.java | 2 +- .../mod/items/ItemBooklet.java | 14 +++++----- .../mod/items/ItemCoffee.java | 4 +-- .../mod/items/ItemFilter.java | 2 +- .../mod/items/ItemLaserWrench.java | 10 +++---- .../mod/items/ItemPhantomConnector.java | 8 +++--- .../mod/items/ItemPlayerProbe.java | 8 +++--- .../mod/items/ItemSpawnerChanger.java | 2 +- .../mod/items/base/ItemEnergy.java | 16 ++--------- .../mod/jei/RecipeWrapperWithButton.java | 2 +- .../mod/jei/booklet/BookletRecipeWrapper.java | 4 +-- .../mod/jei/coffee/CoffeeMachineCategory.java | 4 +-- .../mod/tile/TileEntityBase.java | 2 +- .../mod/tile/TileEntityLaserRelayEnergy.java | 10 +++---- .../mod/tile/TileEntityLaserRelayFluids.java | 4 +-- .../mod/tile/TileEntityLaserRelayItem.java | 4 +-- .../mod/update/UpdateChecker.java | 8 +++--- .../assets/actuallyadditions/lang/en_us.json | 2 +- 46 files changed, 116 insertions(+), 126 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/CoffeeIngredientGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/CoffeeIngredientGenerator.java index 2d18fcabb..6c20b4dbe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/CoffeeIngredientGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/CoffeeIngredientGenerator.java @@ -32,13 +32,13 @@ public class CoffeeIngredientGenerator extends RecipeProvider { @Override protected void buildRecipes(@Nonnull RecipeOutput recipeOutput) { - buildIngredient(recipeOutput, Items.MILK_BUCKET, 0, "jei." + ActuallyAdditions.MODID + ".coffee.extra.milk"); + buildIngredient(recipeOutput, Items.MILK_BUCKET, 0, "jei.actuallyadditions.coffee.extra.milk"); //Pam's puts milk in a tag, so we'll use that TagKey milkTag = ItemTags.create(new ResourceLocation("forge", "milk")); RecipeOutput tagOutput = recipeOutput.withConditions(new NotCondition(new TagEmptyCondition(milkTag.location()))); buildIngredient(tagOutput, new ResourceLocation(ActuallyAdditions.MODID, "coffee_ingredient/milk_tagged"), - Ingredient.of(milkTag), 0, "jei." + ActuallyAdditions.MODID + ".coffee.extra.milk"); + Ingredient.of(milkTag), 0, "jei.actuallyadditions.coffee.extra.milk"); buildIngredient(recipeOutput, Items.SUGAR, 4, new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 30, 0)); buildIngredient(recipeOutput, Items.MAGMA_CREAM, 2, new MobEffectInstance(MobEffects.FIRE_RESISTANCE, 20, 0)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index 1da643f16..e769ed31b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -184,7 +184,7 @@ public class BlockAtomicReconstructor extends FullyDirectionalBlock.Container im energy = BET.getInt("Energy"); } NumberFormat format = NumberFormat.getInstance(); - pTooltip.add(Component.translatable("misc.actuallyadditions.power_single", format.format(energy))); + pTooltip.add(Component.translatable("misc.actuallyadditions.power_single", format.format(energy)).withStyle(ChatFormatting.GRAY)); if (BET.contains("IsPulseMode")) { pTooltip.add(Component.translatable("info.actuallyadditions.redstoneMode").append(": ") diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index 46dc0dac9..6d99719c2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -175,9 +175,9 @@ // ? ((BlockGiantChest) this.block).type // : -1; // if (type == 2) { -// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container." + ActuallyAdditions.MODID + ".giantChestLarge.desc")); +// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container.actuallyadditions.giantChestLarge.desc")); // } else if (type == 0) { -// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container." + ActuallyAdditions.MODID + ".giantChest.desc")); +// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container.actuallyadditions.giantChest.desc")); // } // } // diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 2418fe962..e55b291e9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -221,7 +221,7 @@ public class BlockLaserRelay extends FullyDirectionalBlock.Container implements if (compass) { expl = relay.getCompassDisplayString(); } else { - expl = Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.mode.noCompasss", Component.translatable(CommonConfig.Other.relayConfigureItem.getDescriptionId()).getString()).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC); + expl = Component.translatable("info.actuallyadditions.laserRelay.mode.noCompasss", Component.translatable(CommonConfig.Other.relayConfigureItem.getDescriptionId()).getString()).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC); } guiGraphics.drawString(minecraft.font, expl, (int) (resolution.getGuiScaledWidth() / 2f + 5), (int) (resolution.getGuiScaledHeight() / 2f + 15), 0xFFFFFF); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index dda9ac880..1c5b74112 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -65,9 +65,9 @@ public class BlockLavaFactoryController extends DirectionalBlock.Container imple if (factory != null) { int state = factory.isMultiblock(); if (state == TileEntityLavaFactoryController.NOT_MULTI) { - guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip." + ActuallyAdditions.MODID + ".factory.notPart.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF); + guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip.actuallyadditions.factory.notPart.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF); } else if (state == TileEntityLavaFactoryController.HAS_AIR || state == TileEntityLavaFactoryController.HAS_LAVA) { - guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip." + ActuallyAdditions.MODID + ".factory.working.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF); + guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip.actuallyadditions.factory.working.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index 341d08ed8..a8ada296b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -148,7 +148,7 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay { BlockEntity tile = minecraft.level.getBlockEntity(pos); if (tile != null) { if (tile instanceof IPhantomTile phantom) { - guiGraphics.drawString(minecraft.font, Component.translatable("tooltip." + ActuallyAdditions.MODID + ".blockPhantomRange.desc").append(": " + phantom.getRange()).withStyle(ChatFormatting.GOLD), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 - 40, ChatFormatting.WHITE.getColor()); + guiGraphics.drawString(minecraft.font, Component.translatable("tooltip.actuallyadditions.blockPhantomRange.desc").append(": " + phantom.getRange()).withStyle(ChatFormatting.GOLD), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 - 40, ChatFormatting.WHITE.getColor()); if (phantom.hasBoundPosition()) { int distance = Mth.ceil(new Vec3(pos.getX(), pos.getY(), pos.getZ()).distanceTo(new Vec3(phantom.getBoundPosition().getX(), phantom.getBoundPosition().getY(), phantom.getBoundPosition().getZ()))); BlockState state = minecraft.level.getBlockState(phantom.getBoundPosition()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index dc43efac4..798af8aeb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -187,7 +187,7 @@ public abstract class BlockContainerBase extends Block implements EntityBlock { if (!player.isCreative()) { BlockEntity tile = world.getBlockEntity(pos); if (tile instanceof TileEntityBase && ((TileEntityBase) tile).stopFromDropping) { - player.displayClientMessage(Component.translatable("info." + ActuallyAdditions.MODID + ".machineBroke").withStyle(ChatFormatting.RED), false); + player.displayClientMessage(Component.translatable("info.actuallyadditions.machineBroke").withStyle(ChatFormatting.RED), false); } } return theState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java index 168be4d9a..66d0f9153 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java @@ -100,15 +100,15 @@ // IBookletChapter chapter = this.assignedPage.getChapter(); // // list.add(TextFormatting.GOLD + chapter.getLocalizedName() + ", Page " + (chapter.getPageIndex(this.assignedPage) + 1)); -// list.add(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.bookmark.openDesc")); -// list.add(TextFormatting.ITALIC + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.bookmark.removeDesc")); +// list.add(StringUtil.localize("booklet.actuallyadditions.bookmarkButton.bookmark.openDesc")); +// list.add(TextFormatting.ITALIC + StringUtil.localize("booklet.actuallyadditions.bookmarkButton.bookmark.removeDesc")); // } else { -// list.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.noBookmark.name")); +// list.add(TextFormatting.GOLD + StringUtil.localize("booklet.actuallyadditions.bookmarkButton.noBookmark.name")); // // if (this.booklet instanceof GuiPage) { -// list.add(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.noBookmark.pageDesc")); +// list.add(StringUtil.localize("booklet.actuallyadditions.bookmarkButton.noBookmark.pageDesc")); // } else { -// list.add(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.noBookmark.notPageDesc")); +// list.add(StringUtil.localize("booklet.actuallyadditions.bookmarkButton.noBookmark.notPageDesc")); // } // } // diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java index cd8092de8..28befe5d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java @@ -34,7 +34,7 @@ // // if (this.visible) { // if (this.isHovered || this.isTrials) { -// this.drawCenteredString(minecraft.font, StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trialsButton.name"), this.x + (this.width - 8) / 2, this.y + (this.height - 8) / 2, 14737632); +// this.drawCenteredString(minecraft.font, StringUtil.localize("booklet.actuallyadditions.trialsButton.name"), this.x + (this.width - 8) / 2, this.y + (this.height - 8) / 2, 14737632); // } // } // } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java index 419ebe3a7..4626eaec2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java @@ -59,7 +59,7 @@ // @Override // @OnlyIn(Dist.CLIENT) // public String getLocalizedName() { -// return StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".chapter." + this.getIdentifier() + ".name"); +// return StringUtil.localize("booklet.actuallyadditions.chapter." + this.getIdentifier() + ".name"); // } // // @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java index 6054127b2..6c11a8e8e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java @@ -31,7 +31,7 @@ // @Override // @OnlyIn(Dist.CLIENT) // public String getLocalizedName() { -// return StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trials." + this.getIdentifier() + ".name"); +// return StringUtil.localize("booklet.actuallyadditions.trials." + this.getIdentifier() + ".name"); // } // // @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java index cbaee4aef..8f8f7b656 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java @@ -98,7 +98,7 @@ // @Override // @OnlyIn(Dist.CLIENT) // public String getLocalizedName() { -// return StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".indexEntry." + this.getIdentifier() + ".name"); +// return StringUtil.localize("booklet.actuallyadditions.indexEntry." + this.getIdentifier() + ".name"); // } // // @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java index 107f42543..db44cdcc0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java @@ -76,7 +76,7 @@ // int conf = config.getValue(); // if (conf <= 0) { // try { -// return Float.parseFloat(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".fontSize." + lang)); +// return Float.parseFloat(StringUtil.localize("booklet.actuallyadditions.fontSize." + lang)); // } catch (Exception e) { // return defaultValue; // } @@ -185,7 +185,7 @@ // // this.font.setUnicodeFlag(true); // // if (!this.searchField.isFocused() && (this.searchField.getValue() == null || this.searchField.getValue().isEmpty())) { -// this.font.draw(matrices, TextFormatting.ITALIC + StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.searchField"), this.guiLeft + this.xSize + 2, this.guiTop + this.ySize - 40 + 2, 0xFFFFFF); +// this.font.draw(matrices, TextFormatting.ITALIC + StringUtil.localize("info.actuallyadditions.booklet.searchField"), this.guiLeft + this.xSize + 2, this.guiTop + this.ySize - 40 + 2, 0xFFFFFF); // } // // this.searchField.render(matrices, mouseX, mouseY, partialTicks); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java index 5f4faea7f..5669b7694 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java @@ -75,7 +75,7 @@ // if (this.getMinecraft().level.random.nextFloat() <= 0.1) { // flavor = MathHelper.nextInt(this.getMinecraft().level.random, 2, 7); // } -// this.bookletName = "info." + ActuallyAdditions.MODID + ".booklet.manualName.1." + flavor; +// this.bookletName = "info.actuallyadditions.booklet.manualName.1." + flavor; // // String usedQuote = QUOTES[this.getMinecraft().level.random.nextInt(QUOTES.length)]; // String[] quoteSplit = usedQuote.split("@"); @@ -127,20 +127,20 @@ // if (Util.isDevVersion()) { // this.bookletEdition = "Dev's Edition"; // } else { -// this.bookletEdition = StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.edition") + " " + Util.getMajorModVersion(); +// this.bookletEdition = StringUtil.localize("info.actuallyadditions.booklet.edition") + " " + Util.getMajorModVersion(); // } // } // // List configText = new ArrayList<>(); -// configText.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".configButton.name")); -// //configText.addAll(this.font.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet." + ActuallyAdditions.MODID + ".configButton.desc", ActuallyAdditions.NAME).replaceAll("\\\\n", "\n"), 200)); //TODO wut +// configText.add(TextFormatting.GOLD + StringUtil.localize("booklet.actuallyadditions.configButton.name")); +// //configText.addAll(this.font.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet.actuallyadditions.configButton.desc", ActuallyAdditions.NAME).replaceAll("\\\\n", "\n"), 200)); //TODO wut // this.configButton = new TexturedButton(RES_LOC_GADGETS, this.guiLeft + 16, this.guiTop + this.ySize - 30, 188, 14, 16, 16, configText, btn -> { // }); // this.addButton(this.configButton); // // List achievementText = new ArrayList<>(); -// achievementText.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".achievementButton.name")); -// //achievementText.addAll(this.font.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet." + ActuallyAdditions.MODID + ".achievementButton.desc", ActuallyAdditions.NAME), 200)); //TODO wut +// achievementText.add(TextFormatting.GOLD + StringUtil.localize("booklet.actuallyadditions.achievementButton.name")); +// //achievementText.addAll(this.font.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet.actuallyadditions.achievementButton.desc", ActuallyAdditions.NAME), 200)); //TODO wut // //this.achievementButton = new TexturedButton(RES_LOC_GADGETS, -389, this.guiLeft+36, this.guiTop+this.ySize-30, 204, 14, 16, 16, achievementText); // //this.addButton(this.achievementButton); // @@ -213,7 +213,7 @@ // // String strg = TextFormatting.DARK_GREEN + StringUtil.localize(this.bookletName); // this.font.draw(stack, strg, this.guiLeft + 72 - this.font.width(strg) / 2 - 3, this.guiTop + 19, 0); -// strg = TextFormatting.DARK_GREEN + StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.manualName.2"); +// strg = TextFormatting.DARK_GREEN + StringUtil.localize("info.actuallyadditions.booklet.manualName.2"); // this.font.draw(stack, strg, this.guiLeft + 72 - this.font.width(strg) / 2 - 3, this.guiTop + 19 + this.font.lineHeight, 0); // // strg = TextFormatting.GOLD + TextFormatting.ITALIC.toString() + this.bookletEdition; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java index 4c8fd47b4..024dc5643 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java @@ -119,7 +119,7 @@ // // List links = this.getWebLinks(); // if (links != null && !links.isEmpty()) { -// this.buttonViewOnline = new TexturedButton(RES_LOC_GADGETS, this.guiLeft + this.xSize - 24, this.guiTop + this.ySize - 25, 0, 172, 16, 16, Collections.singletonList(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".onlineButton.name")), btn -> { +// this.buttonViewOnline = new TexturedButton(RES_LOC_GADGETS, this.guiLeft + this.xSize - 24, this.guiTop + this.ySize - 25, 0, 172, 16, 16, Collections.singletonList(TextFormatting.GOLD + StringUtil.localize("booklet.actuallyadditions.onlineButton.name")), btn -> { // }); // this.addButton(this.buttonViewOnline); // } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java index 3964bee31..82d52bf4e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java @@ -88,7 +88,7 @@ // // @OnlyIn(Dist.CLIENT) // protected String getLocalizationKey() { -// return "booklet." + ActuallyAdditions.MODID + ".chapter." + this.chapter.getIdentifier() + ".text." + this.localizationKey; +// return "booklet.actuallyadditions.chapter." + this.chapter.getIdentifier() + ".text." + this.localizationKey; // } // // @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java index 757cb6926..73388c25e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java @@ -73,7 +73,7 @@ // } // // if (this.page != null && this.page != this.gui.pages[0] && this.page != this.gui.pages[1]) { -// list.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".clickToSeeRecipe")); +// list.add(TextFormatting.GOLD + StringUtil.localize("booklet.actuallyadditions.clickToSeeRecipe")); // } // // GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.font); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java index 8d6fb52f7..ac2ffb9ce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java @@ -130,7 +130,7 @@ // int height = 3; ///* // if (recipe instanceof BlankRecipe) { -// this.recipeTypeLocKey = "tooltip." + ActuallyAdditions.MODID + ".disabled"; +// this.recipeTypeLocKey = "tooltip.actuallyadditions.disabled"; // gui.addOrModifyItemRenderer(recipe.getResultItem(), startX + 100, startY + 25, 1F, false); // return; // } else if (recipe instanceof ShapedRecipes) { @@ -138,13 +138,13 @@ // width = shaped.recipeWidth; // height = shaped.recipeHeight; // ings = shaped.recipeItems.toArray(new Ingredient[shaped.recipeItems.size()]); -// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".shapedRecipe"; +// this.recipeTypeLocKey = "booklet.actuallyadditions.shapedRecipe"; // } else if (recipe instanceof ShapelessRecipes) { // ShapelessRecipes shapeless = (ShapelessRecipes) recipe; // for (int i = 0; i < shapeless.recipeItems.size(); i++) { // ings[i] = shapeless.recipeItems.get(i); // } -// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".shapelessRecipe"; +// this.recipeTypeLocKey = "booklet.actuallyadditions.shapelessRecipe"; // } else if (recipe instanceof ShapedOreRecipe) { // ShapedOreRecipe shaped = (ShapedOreRecipe) recipe; // try { @@ -156,13 +156,13 @@ // for (int i = 0; i < shaped.getIngredients().size(); i++) { // ings[i] = shaped.getIngredients().get(i); // } -// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".shapedOreRecipe"; +// this.recipeTypeLocKey = "booklet.actuallyadditions.shapedOreRecipe"; // } else if (recipe instanceof ShapelessOreRecipe) { // ShapelessOreRecipe shapeless = (ShapelessOreRecipe) recipe; // for (int i = 0; i < shapeless.getIngredients().size(); i++) { // ings[i] = shapeless.getIngredients().get(i); // } -// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".shapelessOreRecipe"; +// this.recipeTypeLocKey = "booklet.actuallyadditions.shapelessOreRecipe"; // } // // diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java index a5b52c848..2fb7a8375 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java @@ -44,7 +44,7 @@ // gui.getMinecraft().getTextureManager().bind(GuiBooklet.RES_LOC_GADGETS); // GuiUtils.drawTexturedModalRect(startX + 38, startY + 6, 136, 0, 52, 74, 0); // -// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".crusherRecipe") + ")", startX + 36, startY + 85, 0, false, gui.getMediumFontSize()); +// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet.actuallyadditions.crusherRecipe") + ")", startX + 36, startY + 85, 0, false, gui.getMediumFontSize()); // // PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 100); // diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java index bbd8d96f6..9b698f988 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java @@ -53,7 +53,7 @@ // gui.getMinecraft().getTextureManager().bind(GuiBooklet.RES_LOC_GADGETS); // GuiUtils.drawTexturedModalRect(startX + 5, startY + 10, 117, 74, 116, 72, 0); // -// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".empowererRecipe") + ")", startX + 6, startY + 85, 0, false, gui.getMediumFontSize()); +// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet.actuallyadditions.empowererRecipe") + ")", startX + 6, startY + 85, 0, false, gui.getMediumFontSize()); // // PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 100); // if (this.recipe != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java index 398357dac..167a11e72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java @@ -59,7 +59,7 @@ // gui.getMinecraft().getTextureManager().bind(GuiBooklet.RES_LOC_GADGETS); // GuiUtils.drawTexturedModalRect(startX + 23, startY + 10, 0, 146, 80, 26, 0); // -// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".furnaceRecipe") + ")", startX + 32, startY + 42, 0, false, gui.getMediumFontSize()); +// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet.actuallyadditions.furnaceRecipe") + ")", startX + 32, startY + 42, 0, false, gui.getMediumFontSize()); // // PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 57); // } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java index 732e78e80..66edb4d04 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java @@ -40,7 +40,7 @@ // public void init(GuiBookletBase gui, int startX, int startY) { // super.init(gui, startX, startY); // -// gui.getButtonList().add(new Button(this.buttonId, startX + 125 / 2 - 50, startY + 130, 100, 20, StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".chapter." + this.chapter.getIdentifier() + ".button." + this.localizationKey))); +// gui.getButtonList().add(new Button(this.buttonId, startX + 125 / 2 - 50, startY + 130, 100, 20, StringUtil.localize("booklet.actuallyadditions.chapter." + this.chapter.getIdentifier() + ".button." + this.localizationKey))); // } // // @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java index a1b0c3a25..a62311a27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java @@ -47,7 +47,7 @@ // gui.getMinecraft().getTextureManager().bind(GuiBooklet.RES_LOC_GADGETS); // GuiUtils.drawTexturedModalRect(startX + 30, startY + 10, 80, 146, 68, 48, 0); // -// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".reconstructorRecipe") + ")", startX + 6, startY + 63, 0, false, gui.getMediumFontSize()); +// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet.actuallyadditions.reconstructorRecipe") + ")", startX + 6, startY + 63, 0, false, gui.getMediumFontSize()); // // PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 88); // if (this.recipe != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java index aff6f62b3..241a5bc38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java @@ -66,7 +66,7 @@ // @Override // @OnlyIn(Dist.CLIENT) // protected String getLocalizationKey() { -// return "booklet." + ActuallyAdditions.MODID + ".trials." + this.chapter.getIdentifier() + ".text." + this.localizationKey; +// return "booklet.actuallyadditions.trials." + this.chapter.getIdentifier() + ".text." + this.localizationKey; // } // // @Override @@ -99,9 +99,9 @@ // // boolean completed = data.completedTrials.contains(this.chapter.getIdentifier()); // if (completed) { -// this.button.displayString = TextFormatting.DARK_GREEN + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trialFinishButton.completed.name"); +// this.button.displayString = TextFormatting.DARK_GREEN + StringUtil.localize("booklet.actuallyadditions.trialFinishButton.completed.name"); // } else { -// this.button.displayString = TextFormatting.DARK_RED + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trialFinishButton.uncompleted.name"); +// this.button.displayString = TextFormatting.DARK_RED + StringUtil.localize("booklet.actuallyadditions.trialFinishButton.uncompleted.name"); // } // // } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java index 13ae0741d..d75df4897 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java @@ -105,30 +105,30 @@ public class ClientEvents { // // TODO: [port] come back to this and see if we can re-add it // //OreDict Names // // int[] oreIDs = OreDictionary.getOreIDs(event.getItemStack()); - // // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".oredictName.desc") + ":"); + // // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip.actuallyadditions.oredictName.desc") + ":"); // // if (oreIDs.length > 0) { // // for (int oreID : oreIDs) { // // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + OreDictionary.getOreName(oreID)); // // } // // } else { - // // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".noOredictNameAvail.desc")); + // // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + StringUtil.localize("tooltip.actuallyadditions.noOredictNameAvail.desc")); // // } // // //Code Name - // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".codeName.desc") + ":"); + // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip.actuallyadditions.codeName.desc") + ":"); // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + Item.REGISTRY.getNameForObject(event.getItemStack().getItem())); // // //Base Item's Unlocalized Name // String baseName = event.getItemStack().getItem().getTranslationKey(); // if (baseName != null) { - // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".baseUnlocName.desc") + ":"); + // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip.actuallyadditions.baseUnlocName.desc") + ":"); // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + baseName); // } // // //Metadata // int meta = event.getItemStack().getItemDamage(); // int max = event.getItemStack().getMaxDamage(); - // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".meta.desc") + ":"); + // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip.actuallyadditions.meta.desc") + ":"); // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + meta + (max > 0 // ? "/" + max // : "")); @@ -136,14 +136,14 @@ public class ClientEvents { // //Unlocalized Name // String metaName = event.getItemStack().getItem().getTranslationKey(event.getItemStack()); // if (metaName != null && baseName != null && !metaName.equals(baseName)) { - // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".unlocName.desc") + ":"); + // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip.actuallyadditions.unlocName.desc") + ":"); // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + metaName); // } // // //NBT // CompoundNBT compound = event.getItemStack().getTagCompound(); // if (compound != null && !compound.isEmpty()) { - // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".nbt.desc") + ":"); + // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip.actuallyadditions.nbt.desc") + ":"); // if (Screen.hasShiftDown()) { // int limit = ConfigIntValues.CTRL_INFO_NBT_CHAR_LIMIT.getValue(); // String compoundStrg = compound.toString(); @@ -157,16 +157,16 @@ public class ClientEvents { // } // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + compoundDisplay); // } else { - // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + TextFormatting.ITALIC + "[" + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".pressShift.desc") + "]"); + // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + TextFormatting.ITALIC + "[" + StringUtil.localize("tooltip.actuallyadditions.pressShift.desc") + "]"); // } // } // // //Disabling Info - // event.getToolTip().add(TextFormatting.ITALIC + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".disablingInfo.desc")); + // event.getToolTip().add(TextFormatting.ITALIC + StringUtil.localize("tooltip.actuallyadditions.disablingInfo.desc")); // // } else { // if (ConfigBoolValues.CTRL_INFO_FOR_EXTRA_INFO.isEnabled()) { - // event.getToolTip().add(TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".ctrlForMoreInfo.desc")); + // event.getToolTip().add(TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + StringUtil.localize("tooltip.actuallyadditions.ctrlForMoreInfo.desc")); // } // } // } @@ -204,17 +204,17 @@ public class ClientEvents { if (tileHit instanceof TileEntityBase base) { if (base.isRedstoneToggle()) { - Component component = Component.translatable("info." + ActuallyAdditions.MODID + ".redstoneMode").append(": ") - .append(Component.translatable("info." + ActuallyAdditions.MODID + ".redstoneMode." + (base.isPulseMode + Component component = Component.translatable("info.actuallyadditions.redstoneMode").append(": ") + .append(Component.translatable("info.actuallyadditions.redstoneMode." + (base.isPulseMode ? "pulse" : "deactivation")).withStyle(ChatFormatting.DARK_RED)); guiGraphics.drawString(font, component, (int) (event.getWindow().getGuiScaledWidth() / 2f + 5), (int) (event.getWindow().getGuiScaledHeight() / 2f + 5), 0xFFFFFF); Component expl; if (!stack.isEmpty() && stack.getItem() == CommonConfig.Other.redstoneConfigureItem) { - expl = Component.translatable("info." + ActuallyAdditions.MODID + ".redstoneMode.validItem").withStyle(ChatFormatting.GREEN); + expl = Component.translatable("info.actuallyadditions.redstoneMode.validItem").withStyle(ChatFormatting.GREEN); } else { - expl = Component.translatable("info." + ActuallyAdditions.MODID + ".redstoneMode.invalidItem", Component.translatable(CommonConfig.Other.redstoneConfigureItem.asItem().getDescriptionId()).getString()).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC); + expl = Component.translatable("info.actuallyadditions.redstoneMode.invalidItem", Component.translatable(CommonConfig.Other.redstoneConfigureItem.asItem().getDescriptionId()).getString()).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC); } guiGraphics.drawString(font, expl, (int) (event.getWindow().getGuiScaledWidth() / 2f + 5), (int) (event.getWindow().getGuiScaledHeight() / 2f + 15), 0xFFFFFF); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index fdfd0d9db..9bdea973a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -43,12 +43,12 @@ public class GuiFeeder extends AAScreen { super.render(guiGraphics, x, y, f); if (x >= this.leftPos + 69 && y >= this.topPos + 30 && x <= this.leftPos + 69 + 10 && y <= this.topPos + 30 + 10) { List array = List.of( - Component.literal(this.tileFeeder.currentAnimalAmount + " ").append(Component.translatable("info." + ActuallyAdditions.MODID + ".gui.animals")), + Component.literal(this.tileFeeder.currentAnimalAmount + " ").append(Component.translatable("info.actuallyadditions.gui.animals")), this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < TileEntityFeeder.THRESHOLD - ? Component.translatable("info." + ActuallyAdditions.MODID + ".gui.enoughToBreed") + ? Component.translatable("info.actuallyadditions.gui.enoughToBreed") : this.tileFeeder.currentAnimalAmount >= TileEntityFeeder.THRESHOLD - ? Component.translatable("info." + ActuallyAdditions.MODID + ".gui.tooMany") - : Component.translatable("info." + ActuallyAdditions.MODID + ".gui.notEnough") + ? Component.translatable("info.actuallyadditions.gui.tooMany") + : Component.translatable("info.actuallyadditions.gui.notEnough") ); guiGraphics.renderComponentTooltip(this.font, array, x, y); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java index a27d3f28e..4e575a5fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java @@ -39,8 +39,8 @@ import java.util.List; public class GuiLaserRelayItemWhitelist extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_laser_relay_item_whitelist"); - private final Component inboundText = Component.translatable("info." + ActuallyAdditions.MODID + ".gui.inbound"); - private final Component outboundText = Component.translatable("info." + ActuallyAdditions.MODID + ".gui.outbound"); + private final Component inboundText = Component.translatable("info.actuallyadditions.gui.inbound"); + private final Component outboundText = Component.translatable("info.actuallyadditions.gui.outbound"); private final TileEntityLaserRelayItemAdvanced tile; private FilterSettingsGui leftFilter; @@ -100,8 +100,8 @@ public class GuiLaserRelayItemWhitelist extends AAScreen list = new ArrayList<>(); - list.add(Component.translatable("info." + ActuallyAdditions.MODID + ".gui.smart").withStyle(ChatFormatting.BOLD).getVisualOrderText()); - list.addAll(this.font.split(Component.translatable("info." + ActuallyAdditions.MODID + ".gui.smartInfo"), 200)); + list.add(Component.translatable("info.actuallyadditions.gui.smart").withStyle(ChatFormatting.BOLD).getVisualOrderText()); + list.addAll(this.font.split(Component.translatable("info.actuallyadditions.gui.smartInfo"), 200)); guiGraphics.renderTooltip(this.font, list, mouseX, mouseY); //renderTooltip } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java index 3a64b0198..7ec9d1852 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java @@ -68,8 +68,8 @@ // public void drawGuiContainerForegroundLayer(int x, int y) { // String name = this.cloud.name == null || this.cloud.name.isEmpty() // ? "" -// : TextFormatting.GOLD + this.cloud.name + TextFormatting.RESET + " " + StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.the") + " "; -// String localizedName = name + StringUtil.localize("container." + ActuallyAdditions.MODID + ".cloud.name"); +// : TextFormatting.GOLD + this.cloud.name + TextFormatting.RESET + " " + StringUtil.localize("info.actuallyadditions.gui.the") + " "; +// String localizedName = name + StringUtil.localize("container.actuallyadditions.cloud.name"); // this.font.drawString(localizedName, this.xSize / 2 - this.font.getStringWidth(localizedName) / 2, -10, StringUtil.DECIMAL_COLOR_WHITE); // } // diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java index 0499be6fb..83aaa50d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java @@ -159,7 +159,7 @@ public class DrillItem extends ItemEnergy { @Override public InteractionResultHolder use(Level world, @Nonnull Player player, @Nonnull InteractionHand hand) { if (!world.isClientSide && player.isShiftKeyDown() && hand == InteractionHand.MAIN_HAND) { - player.openMenu(new SimpleMenuProvider((id, inv, p) -> new ContainerDrill(id, inv), Component.translatable("container." + ActuallyAdditions.MODID + ".drill"))); + player.openMenu(new SimpleMenuProvider((id, inv, p) -> new ContainerDrill(id, inv), Component.translatable("container.actuallyadditions.drill"))); // player.openGui(ActuallyAdditions.INSTANCE, GuiHandler.GuiTypes.DRILL.ordinal(), world, (int) player.posX, (int) player.posY, (int) player.posZ); } return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index 79451930d..e44552a79 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -91,11 +91,11 @@ public class ItemBooklet extends ItemBase implements IHudDisplay { @OnlyIn(Dist.CLIENT) @Override public void appendHoverText(ItemStack stack, @Nullable Level playerIn, List tooltip, TooltipFlag advanced) { - tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".item_booklet.desc").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("tooltip.actuallyadditions.item_booklet.desc").withStyle(ChatFormatting.GRAY)); // TODO: this is bad for (int i = 1; i <= 4; i++) { - tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".item_booklet.sub." + i).withStyle(i == 4 + tooltip.add(Component.translatable("tooltip.actuallyadditions.item_booklet.sub." + i).withStyle(i == 4 ? ChatFormatting.GOLD : ChatFormatting.RESET).withStyle(i == 4 ? ChatFormatting.ITALIC @@ -116,8 +116,8 @@ public class ItemBooklet extends ItemBase implements IHudDisplay { // IBookletPage page = BookletUtils.findFirstPageForStack(blockStack); // if (page != null) { // String strg1 = page.getChapter().getLocalizedName(); -// String strg2 = StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.hudDisplay.page") + " " + (page.getChapter().getPageIndex(page) + 1); -// String strg3 = StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.hudDisplay.open"); +// String strg2 = StringUtil.localize("info.actuallyadditions.booklet.hudDisplay.page") + " " + (page.getChapter().getPageIndex(page) + 1); +// String strg3 = StringUtil.localize("info.actuallyadditions.booklet.hudDisplay.open"); // // AssetUtil.renderStackToGui(StackUtil.isValid(page.getChapter().getDisplayItemStack()) // ? page.getChapter().getDisplayItemStack() @@ -126,9 +126,9 @@ public class ItemBooklet extends ItemBase implements IHudDisplay { // minecraft.font.drawShadow(TextFormatting.YELLOW + "" + TextFormatting.ITALIC + strg2, resolution.getGuiScaledWidth() / 2 - minecraft.font.width(strg2) / 2, height + 30, StringUtil.DECIMAL_COLOR_WHITE); // minecraft.font.drawShadow(TextFormatting.GOLD + strg3, resolution.getGuiScaledWidth() / 2 - minecraft.font.width(strg3) / 2, height + 60, StringUtil.DECIMAL_COLOR_WHITE); // } else { -// String strg1 = TextFormatting.DARK_RED + StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.hudDisplay.noInfo"); -// String strg2 = TextFormatting.DARK_GREEN + "" + TextFormatting.ITALIC + StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.hudDisplay.noInfo.desc.1"); -// String strg3 = TextFormatting.DARK_GREEN + "" + TextFormatting.ITALIC + StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.hudDisplay.noInfo.desc.2"); +// String strg1 = TextFormatting.DARK_RED + StringUtil.localize("info.actuallyadditions.booklet.hudDisplay.noInfo"); +// String strg2 = TextFormatting.DARK_GREEN + "" + TextFormatting.ITALIC + StringUtil.localize("info.actuallyadditions.booklet.hudDisplay.noInfo.desc.1"); +// String strg3 = TextFormatting.DARK_GREEN + "" + TextFormatting.ITALIC + StringUtil.localize("info.actuallyadditions.booklet.hudDisplay.noInfo.desc.2"); // // minecraft.font.drawShadow(strg1, resolution.getGuiScaledWidth() / 2 - minecraft.font.width(strg1) / 2, height + 30, StringUtil.DECIMAL_COLOR_WHITE); // minecraft.font.drawShadow(strg2, resolution.getGuiScaledWidth() / 2 - minecraft.font.width(strg2) / 2, height + 50, StringUtil.DECIMAL_COLOR_WHITE); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java index 6bcf7d960..32e4ff491 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java @@ -90,7 +90,7 @@ public class ItemCoffee extends ItemBase { //TODO: Do we want to change the satu .withStyle(ChatFormatting.GRAY)); } } else { - tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".coffeeCup.noEffect").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("tooltip.actuallyadditions.coffeeCup.noEffect").withStyle(ChatFormatting.GRAY)); } } @@ -132,7 +132,7 @@ public class ItemCoffee extends ItemBase { //TODO: Do we want to change the satu @Override public String getExtraText() { - return I18n.get("jei." + ActuallyAdditions.MODID + ".coffee.extra.milk"); + return I18n.get("jei.actuallyadditions.coffee.extra.milk"); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java index 45dec6928..035d69d3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java @@ -38,7 +38,7 @@ public class ItemFilter extends ItemBase { @Override public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { if (!world.isClientSide && hand == InteractionHand.MAIN_HAND) { - player.openMenu(new SimpleMenuProvider((windowId, inv, playerEnt) -> new ContainerFilter(windowId, inv), Component.translatable("container." + ActuallyAdditions.MODID + ".filter"))); + player.openMenu(new SimpleMenuProvider((windowId, inv, playerEnt) -> new ContainerFilter(windowId, inv), Component.translatable("container.actuallyadditions.filter"))); // player.openGui(ActuallyAdditions.INSTANCE, GuiHandler.GuiTypes.FILTER.ordinal(), world, (int) player.posX, (int) player.posY, (int) player.posZ); } return InteractionResultHolder.pass(player.getItemInHand(hand)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index 1c2820c9d..69520b537 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -47,7 +47,7 @@ public class ItemLaserWrench extends ItemBase { if (!world.isClientSide) { if (ItemPhantomConnector.getStoredPosition(stack) == null) { ItemPhantomConnector.storeConnection(stack, pos.getX(), pos.getY(), pos.getZ(), world); - player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".laser.stored.desc"), true); + player.displayClientMessage(Component.translatable("tooltip.actuallyadditions.laser.stored.desc"), true); } else { BlockPos savedPos = ItemPhantomConnector.getStoredPosition(stack); if (savedPos != null) { @@ -63,13 +63,13 @@ public class ItemLaserWrench extends ItemBase { ((TileEntityLaserRelay) savedTile).sendUpdate(); relay.sendUpdate(); - player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".laser.connected.desc"), true); + player.displayClientMessage(Component.translatable("tooltip.actuallyadditions.laser.connected.desc"), true); return InteractionResult.SUCCESS; } } - player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".laser.cantConnect.desc"), false); + player.displayClientMessage(Component.translatable("tooltip.actuallyadditions.laser.cantConnect.desc"), false); ItemPhantomConnector.clearStorage(stack, "XCoordOfTileStored", "YCoordOfTileStored", "ZCoordOfTileStored", "WorldOfTileStored"); } } @@ -91,11 +91,11 @@ public class ItemLaserWrench extends ItemBase { public void appendHoverText(ItemStack stack, Level playerIn, List list, TooltipFlag advanced) { BlockPos coords = ItemPhantomConnector.getStoredPosition(stack); if (coords != null) { - list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".boundTo.desc").append(":")); + list.add(Component.translatable("tooltip.actuallyadditions.boundTo.desc").append(":")); list.add(Component.literal("X: " + coords.getX())); list.add(Component.literal("Y: " + coords.getY())); list.add(Component.literal("Z: " + coords.getZ())); - list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".clearStorage.desc").withStyle(ChatFormatting.ITALIC)); + list.add(Component.translatable("tooltip.actuallyadditions.clearStorage.desc").withStyle(ChatFormatting.ITALIC)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index b01cf910e..446ec9898 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -93,7 +93,7 @@ public class ItemPhantomConnector extends ItemBase { ((TileEntityBase) tile).sendUpdate(); } clearStorage(stack, "XCoordOfTileStored", "YCoordOfTileStored", "ZCoordOfTileStored", "WorldOfTileStored"); - context.getPlayer().displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".phantom.connected.desc"), true); + context.getPlayer().displayClientMessage(Component.translatable("tooltip.actuallyadditions.phantom.connected.desc"), true); return InteractionResult.SUCCESS; } return InteractionResult.FAIL; @@ -101,7 +101,7 @@ public class ItemPhantomConnector extends ItemBase { } //Storing Connections storeConnection(stack, pos.getX(), pos.getY(), pos.getZ(), context.getLevel()); - context.getPlayer().displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".phantom.stored.desc"), true); + context.getPlayer().displayClientMessage(Component.translatable("tooltip.actuallyadditions.phantom.stored.desc"), true); } return InteractionResult.SUCCESS; } @@ -117,11 +117,11 @@ public class ItemPhantomConnector extends ItemBase { public void appendHoverText(ItemStack stack, @Nullable Level playerIn, List list, TooltipFlag advanced) { BlockPos coords = getStoredPosition(stack); if (coords != null) { - list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".boundTo.desc").append(":")); + list.add(Component.translatable("tooltip.actuallyadditions.boundTo.desc").append(":")); list.add(Component.literal("X: " + coords.getX())); list.add(Component.literal("Y: " + coords.getY())); list.add(Component.literal("Z: " + coords.getZ())); - list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".clearStorage.desc").withStyle(ChatFormatting.ITALIC)); + list.add(Component.translatable("tooltip.actuallyadditions.clearStorage.desc").withStyle(ChatFormatting.ITALIC)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java index f59aa6a03..d09b130cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java @@ -50,13 +50,13 @@ public class ItemPlayerProbe extends ItemBase { if (player != null) { if (player.isShiftKeyDown()) { ItemPhantomConnector.clearStorage(stack, "UUID", "Name"); - ((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.1"), false); - player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.notice"), false); + ((Player) entity).displayClientMessage(Component.translatable("tooltip.actuallyadditions.playerProbe.disconnect.1"), false); + player.displayClientMessage(Component.translatable("tooltip.actuallyadditions.playerProbe.notice"), false); //TheAchievements.GET_UNPROBED.get(player); } } else { ItemPhantomConnector.clearStorage(stack, "UUID", "Name"); - ((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.2"), false); + ((Player) entity).displayClientMessage(Component.translatable("tooltip.actuallyadditions.playerProbe.disconnect.2"), false); } } } @@ -112,7 +112,7 @@ public class ItemPlayerProbe extends ItemBase { public void appendHoverText(ItemStack stack, @Nullable Level playerIn, List tooltip, TooltipFlag advanced) { if (stack.getOrCreateTag().contains("Name")) { String name = stack.getOrCreateTag().getString("Name"); - tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.probing").append(": " + name)); + tooltip.add(Component.translatable("tooltip.actuallyadditions.playerProbe.probing").append(": " + name)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java index 7aca24139..610a830d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java @@ -136,7 +136,7 @@ // String entity = this.getStoredEntity(stack); // if (entity != null) { // list.add("Entity: " + entity); -// list.add(TextFormatting.ITALIC + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".clearStorage.desc")); +// list.add(TextFormatting.ITALIC + StringUtil.localize("tooltip.actuallyadditions.clearStorage.desc")); // } // } //} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index 6c31455f5..00e889e9c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -14,6 +14,7 @@ import de.ellpeck.actuallyadditions.mod.attachments.ActuallyAttachments; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import de.ellpeck.actuallyadditions.mod.tile.CustomEnergyStorage; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; @@ -56,7 +57,8 @@ public abstract class ItemEnergy extends ItemBase { if(storage != null) { int energy = storage.getEnergyStored(); NumberFormat format = NumberFormat.getInstance(); - tooltip.add(Component.translatable("misc.actuallyadditions.power_long", format.format(energy), format.format(storage.getMaxEnergyStored()))); + tooltip.add(Component.translatable("misc.actuallyadditions.power_long", format.format(energy), format.format(storage.getMaxEnergyStored())) + .withStyle(ChatFormatting.GRAY)); } } @@ -65,18 +67,6 @@ public abstract class ItemEnergy extends ItemBase { return false; } -// @Override -// public void fillItemCategory(CreativeModeTab group, NonNullList items) { -// super.fillItemCategory(group, items); -// if (!this.allowdedIn(group)) { -// return; -// } -// -// ItemStack charged = new ItemStack(this); -// charged.getOrCreateTag().putDouble("Energy", this.getMaxEnergyStored(charged)); -// items.add(charged); -// } - @Override public boolean isBarVisible(ItemStack itemStack) { return true; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java index 2377e7e4c..227049d5a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java @@ -60,7 +60,7 @@ // @Override // public List getTooltipStrings(int mouseX, int mouseY) { // if (this.theButton.isMouseOver()) { -// return Collections.singletonList(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".clickToSeeRecipe")); +// return Collections.singletonList(StringUtil.localize("booklet.actuallyadditions.clickToSeeRecipe")); // } else { // return Collections.emptyList(); // } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java index d026e7c09..9fdcdc6be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java @@ -48,7 +48,7 @@ // // @Override // public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { -// List header = minecraft.fontRenderer.listFormattedStringToWidth(StringUtil.localize("container.nei." + ActuallyAdditions.MODID + ".booklet.header").replaceAll("", TextFormatting.BLUE + "").replaceAll("", TextFormatting.BLACK + ""), 150); +// List header = minecraft.fontRenderer.listFormattedStringToWidth(StringUtil.localize("container.nei.actuallyadditions.booklet.header").replaceAll("", TextFormatting.BLUE + "").replaceAll("", TextFormatting.BLACK + ""), 150); // for (int i = 0; i < header.size(); i++) { // minecraft.fontRenderer.drawString(header.get(i), 0, 17 + i * (minecraft.fontRenderer.FONT_HEIGHT + 1), 0, false); // } @@ -56,7 +56,7 @@ // int maxLines = 4; // IBookletChapter chapter = this.thePage.getChapter(); // String aText = chapter.getAllPages()[0].getInfoText(); -// List text = minecraft.fontRenderer.listFormattedStringToWidth(aText != null ? aText : TextFormatting.DARK_RED + StringUtil.localize("container.nei." + ActuallyAdditions.MODID + ".booklet.noText"), 150); +// List text = minecraft.fontRenderer.listFormattedStringToWidth(aText != null ? aText : TextFormatting.DARK_RED + StringUtil.localize("container.nei.actuallyadditions.booklet.noText"), 150); // for (int i = 0; i < Math.min(maxLines, text.size()); i++) { // minecraft.fontRenderer.drawString(text.get(i) + (i == maxLines - 1 && text.size() > maxLines ? TextFormatting.RESET + "" + TextFormatting.BLACK + "..." : ""), 0, 16 + 25 + i * (minecraft.fontRenderer.FONT_HEIGHT + 1), 0, false); // } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineCategory.java index bdf70683a..942999c6d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineCategory.java @@ -67,12 +67,12 @@ public class CoffeeMachineCategory implements IRecipeCategory 0) { - guiGraphics.drawString(mc.font, Component.translatable("jei." + ActuallyAdditions.MODID + ".coffee.maxAmount").append(": " + recipe.getMaxAmplifier()), 2, 28, 4210752, false); + guiGraphics.drawString(mc.font, Component.translatable("jei.actuallyadditions.coffee.maxAmount").append(": " + recipe.getMaxAmplifier()), 2, 28, 4210752, false); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index 88236a67c..7bf012218 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -153,7 +153,7 @@ public abstract class TileEntityBase extends BlockEntity { @Deprecated public String getNameForTranslation() { - return "removeme";// "container." + ActuallyAdditions.MODID + "." + this.name + ".name"; + return "removeme";// "container.actuallyadditions." + this.name + ".name"; } // @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java index a9c08308a..fa8a96040 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java @@ -260,13 +260,13 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { @Override @OnlyIn(Dist.CLIENT) public Component getExtraDisplayString() { - return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.energy.extra").append(": ").append(Component.translatable(this.mode.name).withStyle(ChatFormatting.DARK_RED)); + return Component.translatable("info.actuallyadditions.laserRelay.energy.extra").append(": ").append(Component.translatable(this.mode.name).withStyle(ChatFormatting.DARK_RED)); } @Override @OnlyIn(Dist.CLIENT) public Component getCompassDisplayString() { - return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.energy.display").withStyle(ChatFormatting.GREEN); + return Component.translatable("info.actuallyadditions.laserRelay.energy.display").withStyle(ChatFormatting.GREEN); } @Override @@ -296,9 +296,9 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { } public enum Mode { - BOTH("info." + ActuallyAdditions.MODID + ".laserRelay.mode.both"), - OUTPUT_ONLY("info." + ActuallyAdditions.MODID + ".laserRelay.mode.outputOnly"), - INPUT_ONLY("info." + ActuallyAdditions.MODID + ".laserRelay.mode.inputOnly"); + BOTH("info.actuallyadditions.laserRelay.mode.both"), + OUTPUT_ONLY("info.actuallyadditions.laserRelay.mode.outputOnly"), + INPUT_ONLY("info.actuallyadditions.laserRelay.mode.inputOnly"); public final String name; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java index c67249543..b1b78fc66 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java @@ -252,13 +252,13 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { @Override @OnlyIn(Dist.CLIENT) public Component getExtraDisplayString() { - return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.fluid.extra").append(": ").append(Component.translatable(this.mode.name).withStyle(ChatFormatting.DARK_RED)); + return Component.translatable("info.actuallyadditions.laserRelay.fluid.extra").append(": ").append(Component.translatable(this.mode.name).withStyle(ChatFormatting.DARK_RED)); } @Override @OnlyIn(Dist.CLIENT) public Component getCompassDisplayString() { - return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.energy.display").withStyle(ChatFormatting.GREEN); + return Component.translatable("info.actuallyadditions.laserRelay.energy.display").withStyle(ChatFormatting.GREEN); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java index d1b8f953d..6c97f8b22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java @@ -159,13 +159,13 @@ public class TileEntityLaserRelayItem extends TileEntityLaserRelay { @Override @OnlyIn(Dist.CLIENT) public Component getExtraDisplayString() { - return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.item.extra").append(": ").append(Component.literal(String.valueOf(this.getPriority())).withStyle(ChatFormatting.DARK_RED)); + return Component.translatable("info.actuallyadditions.laserRelay.item.extra").append(": ").append(Component.literal(String.valueOf(this.getPriority())).withStyle(ChatFormatting.DARK_RED)); } @Override @OnlyIn(Dist.CLIENT) public Component getCompassDisplayString() { - return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.item.display.1").append("\n").append(Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.item.display.2")).withStyle(ChatFormatting.GREEN); + return Component.translatable("info.actuallyadditions.laserRelay.item.display.1").append(" - ").append(Component.translatable("info.actuallyadditions.laserRelay.item.display.2")).withStyle(ChatFormatting.GREEN); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java index 28e01782b..cbdbe0b07 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java @@ -44,11 +44,11 @@ public class UpdateChecker { if (Minecraft.getInstance().player != null) { Player player = Minecraft.getInstance().player; if (UpdateChecker.checkFailed) { - player.displayClientMessage(Component.translatable("info." + ActuallyAdditions.MODID + ".update.failed"), false); + player.displayClientMessage(Component.translatable("info.actuallyadditions.update.failed"), false); } else if (UpdateChecker.needsUpdateNotify) { - player.displayClientMessage(Component.translatable("info." + ActuallyAdditions.MODID + ".update.generic"), false); - player.displayClientMessage(Component.translatable("info." + ActuallyAdditions.MODID + ".update.versionCompare", ActuallyAdditions.VERSION, UpdateChecker.updateVersionString), false); - player.displayClientMessage(Component.translatable("info." + ActuallyAdditions.MODID + ".update.buttons", UpdateChecker.CHANGELOG_LINK, UpdateChecker.DOWNLOAD_LINK), false); + player.displayClientMessage(Component.translatable("info.actuallyadditions.update.generic"), false); + player.displayClientMessage(Component.translatable("info.actuallyadditions.update.versionCompare", ActuallyAdditions.VERSION, UpdateChecker.updateVersionString), false); + player.displayClientMessage(Component.translatable("info.actuallyadditions.update.buttons", UpdateChecker.CHANGELOG_LINK, UpdateChecker.DOWNLOAD_LINK), false); } if (threadFinished) { NeoForge.EVENT_BUS.unregister(this); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 4b6d9d05b..9a08fb950 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -841,7 +841,7 @@ "booklet.actuallyadditions.chapter.blackLotus.text.1": "Think of this: You need to craft black wool, black clay or anything else that needs black dye but you are just guilty about killing so many innocent squids? Well, the Black Lotus is exactly the thing you need! Just look around in the wild a bit, and you will find one, then being able to craft some Black Dye that can be used instead of Ink Sacs so that you don't need to kill poor squids and L any longer.", "booklet.actuallyadditions.chapter.blackLotus.text.2": "Do the lotus pose", "booklet.actuallyadditions.chapter.crystals": "Crystals and Reconstructor", - "booklet.actuallyadditions.chapter.crystals.text.1": "The Atomic Reconstructor is used to craft Crystals, which are the main crafting ingredient in most items from Actually Additions. Upon being supplied with power, it shoots out a Laser. When the Laser hits a block, it will convert all surrounding items and blocks, provided they can be converted.", + "booklet.actuallyadditions.chapter.crystals.text.1": "The Atomic Reconstructor is used to craft Crystals, which are the main crafting ingredient in most items from Actually Additions. Upon being supplied with power, it shoots out a Laser. It will convert all surrounding items and blocks along the beam's path, provided they can be converted, until it hits a block.", "booklet.actuallyadditions.chapter.crystals.text.2": "When shooting a laser, it uses 1000 CF, but additional rates vary depending on the conversion. There are various Lenses that can be attached to the Reconstructor that don't all follow the default behavior of the Reconstructor and are able to do some neat things. See the Reconstruction section in the booklet for more information.", "booklet.actuallyadditions.chapter.crystals.text.3": "When right-clicking the Reconstructor with a Redstone Torch in hand, it will change between a mode where it gets deactivated by Redstone and a mode where it responds to pulses. It should be noted that any recipes listed without information about Lenses don't use one. I thought that was obvious.", "booklet.actuallyadditions.chapter.crystals.text.5": "When you have crafted a couple of items, you might want to find a way to automate this. There is a very simple way to do accomplish this: Place the Atomic Reconstructor down facing into a Precision Dropper (to find it, look it up in the All Items Entry!). Next, place a Ranged Collector in the area that has the converted items set as a allowlist. Now you can just chuck your raw materials into the Dropper to convert them!",