Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-28 09:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:cf0349b102daa56f7136637fe9f9c7ad9940232f
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7
..
compare: Ellpeck:9000eb3fabd1bb35ee20939af5e2c6d7e6d12b76
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7

No commits in common. "cf0349b102daa56f7136637fe9f9c7ad9940232f" and "9000eb3fabd1bb35ee20939af5e2c6d7e6d12b76" have entirely different histories.
cf0349b102 ... 9000eb3fab

48 changed files with 136 additions and 127 deletions
Show stats Expand all files Collapse all files

4
src/main/java/de/ellpeck/actuallyadditions/data/CoffeeIngredientGenerator.java
View file

@ -32,13 +32,13 @@ public class CoffeeIngredientGenerator extends RecipeProvider {
@Override
protected void buildRecipes(@Nonnull RecipeOutput recipeOutput) {
buildIngredient(recipeOutput, Items.MILK_BUCKET, 0, "jei.actuallyadditions.coffee.extra.milk");
buildIngredient(recipeOutput, Items.MILK_BUCKET, 0, "jei." + ActuallyAdditions.MODID + ".coffee.extra.milk");
//Pam's puts milk in a tag, so we'll use that
TagKey<Item> 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.coffee.extra.milk");
Ingredient.of(milkTag), 0, "jei." + ActuallyAdditions.MODID + ".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));

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java
View file

@ -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)).withStyle(ChatFormatting.GRAY));
pTooltip.add(Component.translatable("misc.actuallyadditions.power_single", format.format(energy)));
if (BET.contains("IsPulseMode")) {
pTooltip.add(Component.translatable("info.actuallyadditions.redstoneMode").append(": ")

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
View file

@ -175,9 +175,9 @@
// ? ((BlockGiantChest) this.block).type
// : -1;
// if (type == 2) {
// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container.actuallyadditions.giantChestLarge.desc"));
// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container." + ActuallyAdditions.MODID + ".giantChestLarge.desc"));
// } else if (type == 0) {
// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container.actuallyadditions.giantChest.desc"));
// tooltip.add(TextFormatting.ITALIC + StringUtil.localize("container." + ActuallyAdditions.MODID + ".giantChest.desc"));
// }
// }
//

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java
View file

@ -221,7 +221,7 @@ public class BlockLaserRelay extends FullyDirectionalBlock.Container implements
if (compass) {
expl = relay.getCompassDisplayString();
} else {
expl = Component.translatable("info.actuallyadditions.laserRelay.mode.noCompasss", Component.translatable(CommonConfig.Other.relayConfigureItem.getDescriptionId()).getString()).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC);
expl = Component.translatable("info." + ActuallyAdditions.MODID + ".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);

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java
View file

@ -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.factory.notPart.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF);
guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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.factory.working.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF);
guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip." + ActuallyAdditions.MODID + ".factory.working.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF);
}
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java
View file

@ -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.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.MODID + ".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());

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
View file

@ -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.machineBroke").withStyle(ChatFormatting.RED), false);
player.displayClientMessage(Component.translatable("info." + ActuallyAdditions.MODID + ".machineBroke").withStyle(ChatFormatting.RED), false);
}
}
return theState;

10
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ReconstructorRenderer.java
View file

@ -63,4 +63,14 @@ public class ReconstructorRenderer implements BlockEntityRenderer<TileEntityAtom
matrices.popPose();
}
@Override
public boolean shouldRenderOffScreen(TileEntityAtomicReconstructor tile) {
return tile.getProgress() > 0.0f;
}
@Override
public AABB getRenderBoundingBox(TileEntityAtomicReconstructor blockEntity) {
return BlockEntityRenderer.super.getRenderBoundingBox(blockEntity);
}
}

11
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java
View file

@ -35,7 +35,6 @@ import net.minecraft.world.level.block.Rotation;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
public class RenderLaserRelay implements BlockEntityRenderer<TileEntityLaserRelay> {
@ -126,14 +125,4 @@ public class RenderLaserRelay implements BlockEntityRenderer<TileEntityLaserRela
public boolean shouldRenderOffScreen(TileEntityLaserRelay tile) {
return true;
}
@Override
public AABB getRenderBoundingBox(TileEntityLaserRelay blockEntity) {
return INFINITE_EXTENT_AABB;
}
@Override
public int getViewDistance() {
return 32;
}
}

10
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java
View file

@ -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.bookmarkButton.bookmark.openDesc"));
// list.add(TextFormatting.ITALIC + StringUtil.localize("booklet.actuallyadditions.bookmarkButton.bookmark.removeDesc"));
// list.add(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.bookmark.openDesc"));
// list.add(TextFormatting.ITALIC + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.bookmark.removeDesc"));
// } else {
// list.add(TextFormatting.GOLD + StringUtil.localize("booklet.actuallyadditions.bookmarkButton.noBookmark.name"));
// list.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.noBookmark.name"));
//
// if (this.booklet instanceof GuiPage) {
// list.add(StringUtil.localize("booklet.actuallyadditions.bookmarkButton.noBookmark.pageDesc"));
// list.add(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.noBookmark.pageDesc"));
// } else {
// list.add(StringUtil.localize("booklet.actuallyadditions.bookmarkButton.noBookmark.notPageDesc"));
// list.add(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".bookmarkButton.noBookmark.notPageDesc"));
// }
// }
//

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java
View file

@ -34,7 +34,7 @@
//
// if (this.visible) {
// if (this.isHovered || this.isTrials) {
// this.drawCenteredString(minecraft.font, StringUtil.localize("booklet.actuallyadditions.trialsButton.name"), this.x + (this.width - 8) / 2, this.y + (this.height - 8) / 2, 14737632);
// this.drawCenteredString(minecraft.font, StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trialsButton.name"), this.x + (this.width - 8) / 2, this.y + (this.height - 8) / 2, 14737632);
// }
// }
// }

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java
View file

@ -59,7 +59,7 @@
// @Override
// @OnlyIn(Dist.CLIENT)
// public String getLocalizedName() {
// return StringUtil.localize("booklet.actuallyadditions.chapter." + this.getIdentifier() + ".name");
// return StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".chapter." + this.getIdentifier() + ".name");
// }
//
// @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java
View file

@ -31,7 +31,7 @@
// @Override
// @OnlyIn(Dist.CLIENT)
// public String getLocalizedName() {
// return StringUtil.localize("booklet.actuallyadditions.trials." + this.getIdentifier() + ".name");
// return StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trials." + this.getIdentifier() + ".name");
// }
//
// @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java
View file

@ -98,7 +98,7 @@
// @Override
// @OnlyIn(Dist.CLIENT)
// public String getLocalizedName() {
// return StringUtil.localize("booklet.actuallyadditions.indexEntry." + this.getIdentifier() + ".name");
// return StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".indexEntry." + this.getIdentifier() + ".name");
// }
//
// @Override

4
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java
View file

@ -76,7 +76,7 @@
// int conf = config.getValue();
// if (conf <= 0) {
// try {
// return Float.parseFloat(StringUtil.localize("booklet.actuallyadditions.fontSize." + lang));
// return Float.parseFloat(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".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.booklet.searchField"), this.guiLeft + this.xSize + 2, this.guiTop + this.ySize - 40 + 2, 0xFFFFFF);
// 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.searchField.render(matrices, mouseX, mouseY, partialTicks);

14
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java
View file

@ -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.booklet.manualName.1." + flavor;
// this.bookletName = "info." + ActuallyAdditions.MODID + ".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.booklet.edition") + " " + Util.getMajorModVersion();
// this.bookletEdition = StringUtil.localize("info." + ActuallyAdditions.MODID + ".booklet.edition") + " " + Util.getMajorModVersion();
// }
// }
//
// List<String> configText = new ArrayList<>();
// 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
// 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
// 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<String> achievementText = new ArrayList<>();
// 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
// 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
// //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.booklet.manualName.2");
// strg = TextFormatting.DARK_GREEN + StringUtil.localize("info." + ActuallyAdditions.MODID + ".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;

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java
View file

@ -119,7 +119,7 @@
//
// List<String> 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.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.MODID + ".onlineButton.name")), btn -> {
// });
// this.addButton(this.buttonViewOnline);
// }

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java
View file

@ -88,7 +88,7 @@
//
// @OnlyIn(Dist.CLIENT)
// protected String getLocalizationKey() {
// return "booklet.actuallyadditions.chapter." + this.chapter.getIdentifier() + ".text." + this.localizationKey;
// return "booklet." + ActuallyAdditions.MODID + ".chapter." + this.chapter.getIdentifier() + ".text." + this.localizationKey;
// }
//
// @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java
View file

@ -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.clickToSeeRecipe"));
// list.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".clickToSeeRecipe"));
// }
//
// GuiUtils.drawHoveringText(list, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.font);

10
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java
View file

@ -130,7 +130,7 @@
// int height = 3;
///*
// if (recipe instanceof BlankRecipe) {
// this.recipeTypeLocKey = "tooltip.actuallyadditions.disabled";
// this.recipeTypeLocKey = "tooltip." + ActuallyAdditions.MODID + ".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.shapedRecipe";
// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".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.shapelessRecipe";
// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".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.shapedOreRecipe";
// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".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.shapelessOreRecipe";
// this.recipeTypeLocKey = "booklet." + ActuallyAdditions.MODID + ".shapelessOreRecipe";
// }
//
//

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java
View file

@ -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.crusherRecipe") + ")", startX + 36, startY + 85, 0, false, gui.getMediumFontSize());
// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".crusherRecipe") + ")", startX + 36, startY + 85, 0, false, gui.getMediumFontSize());
//
// PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 100);
//

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java
View file

@ -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.empowererRecipe") + ")", startX + 6, startY + 85, 0, false, gui.getMediumFontSize());
// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".empowererRecipe") + ")", startX + 6, startY + 85, 0, false, gui.getMediumFontSize());
//
// PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 100);
// if (this.recipe != null) {

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java
View file

@ -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.furnaceRecipe") + ")", startX + 32, startY + 42, 0, false, gui.getMediumFontSize());
// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".furnaceRecipe") + ")", startX + 32, startY + 42, 0, false, gui.getMediumFontSize());
//
// PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 57);
// }

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java
View file

@ -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.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.MODID + ".chapter." + this.chapter.getIdentifier() + ".button." + this.localizationKey)));
// }
//
// @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java
View file

@ -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.reconstructorRecipe") + ")", startX + 6, startY + 63, 0, false, gui.getMediumFontSize());
// gui.renderScaledAsciiString("(" + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".reconstructorRecipe") + ")", startX + 6, startY + 63, 0, false, gui.getMediumFontSize());
//
// PageTextOnly.renderTextToPage(gui, this, startX + 6, startY + 88);
// if (this.recipe != null) {

6
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java
View file

@ -66,7 +66,7 @@
// @Override
// @OnlyIn(Dist.CLIENT)
// protected String getLocalizationKey() {
// return "booklet.actuallyadditions.trials." + this.chapter.getIdentifier() + ".text." + this.localizationKey;
// return "booklet." + ActuallyAdditions.MODID + ".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.trialFinishButton.completed.name");
// this.button.displayString = TextFormatting.DARK_GREEN + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trialFinishButton.completed.name");
// } else {
// this.button.displayString = TextFormatting.DARK_RED + StringUtil.localize("booklet.actuallyadditions.trialFinishButton.uncompleted.name");
// this.button.displayString = TextFormatting.DARK_RED + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".trialFinishButton.uncompleted.name");
// }
//
// }

28
src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java
View file

@ -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.oredictName.desc") + ":");
// // event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".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.noOredictNameAvail.desc"));
// // event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".noOredictNameAvail.desc"));
// // }
//
// //Code Name
// event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip.actuallyadditions.codeName.desc") + ":");
// event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".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.baseUnlocName.desc") + ":");
// event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".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.meta.desc") + ":");
// event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".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.unlocName.desc") + ":");
// event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".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.nbt.desc") + ":");
// event.getToolTip().add(ADVANCED_INFO_HEADER_PRE + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".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.pressShift.desc") + "]");
// event.getToolTip().add(ADVANCED_INFO_TEXT_PRE + TextFormatting.ITALIC + "[" + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".pressShift.desc") + "]");
// }
// }
//
// //Disabling Info
// event.getToolTip().add(TextFormatting.ITALIC + StringUtil.localize("tooltip.actuallyadditions.disablingInfo.desc"));
// event.getToolTip().add(TextFormatting.ITALIC + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".disablingInfo.desc"));
//
// } else {
// if (ConfigBoolValues.CTRL_INFO_FOR_EXTRA_INFO.isEnabled()) {
// event.getToolTip().add(TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + StringUtil.localize("tooltip.actuallyadditions.ctrlForMoreInfo.desc"));
// event.getToolTip().add(TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".ctrlForMoreInfo.desc"));
// }
// }
// }
@ -204,17 +204,17 @@ public class ClientEvents {
if (tileHit instanceof TileEntityBase base) {
if (base.isRedstoneToggle()) {
Component component = Component.translatable("info.actuallyadditions.redstoneMode").append(": ")
.append(Component.translatable("info.actuallyadditions.redstoneMode." + (base.isPulseMode
Component component = Component.translatable("info." + ActuallyAdditions.MODID + ".redstoneMode").append(": ")
.append(Component.translatable("info." + ActuallyAdditions.MODID + ".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.redstoneMode.validItem").withStyle(ChatFormatting.GREEN);
expl = Component.translatable("info." + ActuallyAdditions.MODID + ".redstoneMode.validItem").withStyle(ChatFormatting.GREEN);
} else {
expl = Component.translatable("info.actuallyadditions.redstoneMode.invalidItem", Component.translatable(CommonConfig.Other.redstoneConfigureItem.asItem().getDescriptionId()).getString()).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC);
expl = Component.translatable("info." + ActuallyAdditions.MODID + ".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);
}

8
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java
View file

@ -43,12 +43,12 @@ public class GuiFeeder extends AAScreen<ContainerFeeder> {
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<Component> array = List.of(
Component.literal(this.tileFeeder.currentAnimalAmount + " ").append(Component.translatable("info.actuallyadditions.gui.animals")),
Component.literal(this.tileFeeder.currentAnimalAmount + " ").append(Component.translatable("info." + ActuallyAdditions.MODID + ".gui.animals")),
this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < TileEntityFeeder.THRESHOLD
? Component.translatable("info.actuallyadditions.gui.enoughToBreed")
? Component.translatable("info." + ActuallyAdditions.MODID + ".gui.enoughToBreed")
: this.tileFeeder.currentAnimalAmount >= TileEntityFeeder.THRESHOLD
? Component.translatable("info.actuallyadditions.gui.tooMany")
: Component.translatable("info.actuallyadditions.gui.notEnough")
? Component.translatable("info." + ActuallyAdditions.MODID + ".gui.tooMany")
: Component.translatable("info." + ActuallyAdditions.MODID + ".gui.notEnough")
);
guiGraphics.renderComponentTooltip(this.font, array, x, y);
}

8
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java
View file

@ -39,8 +39,8 @@ import java.util.List;
public class GuiLaserRelayItemWhitelist extends AAScreen<ContainerLaserRelayItemWhitelist> {
private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_laser_relay_item_whitelist");
private final Component inboundText = Component.translatable("info.actuallyadditions.gui.inbound");
private final Component outboundText = Component.translatable("info.actuallyadditions.gui.outbound");
private final Component inboundText = Component.translatable("info." + ActuallyAdditions.MODID + ".gui.inbound");
private final Component outboundText = Component.translatable("info." + ActuallyAdditions.MODID + ".gui.outbound");
private final TileEntityLaserRelayItemAdvanced tile;
private FilterSettingsGui leftFilter;
@ -100,8 +100,8 @@ public class GuiLaserRelayItemWhitelist extends AAScreen<ContainerLaserRelayItem
if (this.buttonSmartWhitelistLeft.isMouseOver(mouseX, mouseY) || this.buttonSmartWhitelistRight.isMouseOver(mouseX, mouseY)) {
List<FormattedCharSequence> list = new ArrayList<>();
list.add(Component.translatable("info.actuallyadditions.gui.smart").withStyle(ChatFormatting.BOLD).getVisualOrderText());
list.addAll(this.font.split(Component.translatable("info.actuallyadditions.gui.smartInfo"), 200));
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));
guiGraphics.renderTooltip(this.font, list, mouseX, mouseY); //renderTooltip
}

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java
View file

@ -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.gui.the") + " ";
// String localizedName = name + StringUtil.localize("container.actuallyadditions.cloud.name");
// : TextFormatting.GOLD + this.cloud.name + TextFormatting.RESET + " " + StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.the") + " ";
// String localizedName = name + StringUtil.localize("container." + ActuallyAdditions.MODID + ".cloud.name");
// this.font.drawString(localizedName, this.xSize / 2 - this.font.getStringWidth(localizedName) / 2, -10, StringUtil.DECIMAL_COLOR_WHITE);
// }
//

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java
View file

@ -159,7 +159,7 @@ public class DrillItem extends ItemEnergy {
@Override
public InteractionResultHolder<ItemStack> 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.drill")));
player.openMenu(new SimpleMenuProvider((id, inv, p) -> new ContainerDrill(id, inv), Component.translatable("container." + ActuallyAdditions.MODID + ".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));

14
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java
View file

@ -91,11 +91,11 @@ public class ItemBooklet extends ItemBase implements IHudDisplay {
@OnlyIn(Dist.CLIENT)
@Override
public void appendHoverText(ItemStack stack, @Nullable Level playerIn, List<Component> tooltip, TooltipFlag advanced) {
tooltip.add(Component.translatable("tooltip.actuallyadditions.item_booklet.desc").withStyle(ChatFormatting.GRAY));
tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".item_booklet.desc").withStyle(ChatFormatting.GRAY));
// TODO: this is bad
for (int i = 1; i <= 4; i++) {
tooltip.add(Component.translatable("tooltip.actuallyadditions.item_booklet.sub." + i).withStyle(i == 4
tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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.booklet.hudDisplay.page") + " " + (page.getChapter().getPageIndex(page) + 1);
// String strg3 = StringUtil.localize("info.actuallyadditions.booklet.hudDisplay.open");
// 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");
//
// 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.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");
// 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");
//
// 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);

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java
View file

@ -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.coffeeCup.noEffect").withStyle(ChatFormatting.GRAY));
tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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.coffee.extra.milk");
return I18n.get("jei." + ActuallyAdditions.MODID + ".coffee.extra.milk");
}
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java
View file

@ -38,7 +38,7 @@ public class ItemFilter extends ItemBase {
@Override
public InteractionResultHolder<ItemStack> 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.filter")));
player.openMenu(new SimpleMenuProvider((windowId, inv, playerEnt) -> new ContainerFilter(windowId, inv), Component.translatable("container." + ActuallyAdditions.MODID + ".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));

10
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java
View file

@ -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.laser.stored.desc"), true);
player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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.laser.connected.desc"), true);
player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".laser.connected.desc"), true);
return InteractionResult.SUCCESS;
}
}
player.displayClientMessage(Component.translatable("tooltip.actuallyadditions.laser.cantConnect.desc"), false);
player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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<Component> list, TooltipFlag advanced) {
BlockPos coords = ItemPhantomConnector.getStoredPosition(stack);
if (coords != null) {
list.add(Component.translatable("tooltip.actuallyadditions.boundTo.desc").append(":"));
list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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.clearStorage.desc").withStyle(ChatFormatting.ITALIC));
list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".clearStorage.desc").withStyle(ChatFormatting.ITALIC));
}
}
}

8
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java
View file

@ -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.phantom.connected.desc"), true);
context.getPlayer().displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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.phantom.stored.desc"), true);
context.getPlayer().displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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<Component> list, TooltipFlag advanced) {
BlockPos coords = getStoredPosition(stack);
if (coords != null) {
list.add(Component.translatable("tooltip.actuallyadditions.boundTo.desc").append(":"));
list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".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.clearStorage.desc").withStyle(ChatFormatting.ITALIC));
list.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".clearStorage.desc").withStyle(ChatFormatting.ITALIC));
}
}
}

8
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java
View file

@ -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.playerProbe.disconnect.1"), false);
player.displayClientMessage(Component.translatable("tooltip.actuallyadditions.playerProbe.notice"), false);
((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.1"), false);
player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.notice"), false);
//TheAchievements.GET_UNPROBED.get(player);
}
} else {
ItemPhantomConnector.clearStorage(stack, "UUID", "Name");
((Player) entity).displayClientMessage(Component.translatable("tooltip.actuallyadditions.playerProbe.disconnect.2"), false);
((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.2"), false);
}
}
}
@ -112,7 +112,7 @@ public class ItemPlayerProbe extends ItemBase {
public void appendHoverText(ItemStack stack, @Nullable Level playerIn, List<Component> tooltip, TooltipFlag advanced) {
if (stack.getOrCreateTag().contains("Name")) {
String name = stack.getOrCreateTag().getString("Name");
tooltip.add(Component.translatable("tooltip.actuallyadditions.playerProbe.probing").append(": " + name));
tooltip.add(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.probing").append(": " + name));
}
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java
View file

@ -136,7 +136,7 @@
// String entity = this.getStoredEntity(stack);
// if (entity != null) {
// list.add("Entity: " + entity);
// list.add(TextFormatting.ITALIC + StringUtil.localize("tooltip.actuallyadditions.clearStorage.desc"));
// list.add(TextFormatting.ITALIC + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".clearStorage.desc"));
// }
// }
//}

16
src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java
View file

@ -14,7 +14,6 @@ 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;
@ -57,8 +56,7 @@ 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()))
.withStyle(ChatFormatting.GRAY));
tooltip.add(Component.translatable("misc.actuallyadditions.power_long", format.format(energy), format.format(storage.getMaxEnergyStored())));
}
}
@ -67,6 +65,18 @@ public abstract class ItemEnergy extends ItemBase {
return false;
}
// @Override
// public void fillItemCategory(CreativeModeTab group, NonNullList<ItemStack> 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;

2
src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java
View file

@ -60,7 +60,7 @@
// @Override
// public List<String> getTooltipStrings(int mouseX, int mouseY) {
// if (this.theButton.isMouseOver()) {
// return Collections.singletonList(StringUtil.localize("booklet.actuallyadditions.clickToSeeRecipe"));
// return Collections.singletonList(StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".clickToSeeRecipe"));
// } else {
// return Collections.emptyList();
// }

4
src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java
View file

@ -48,7 +48,7 @@
//
// @Override
// public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
// List<String> header = minecraft.fontRenderer.listFormattedStringToWidth(StringUtil.localize("container.nei.actuallyadditions.booklet.header").replaceAll("<item>", TextFormatting.BLUE + "").replaceAll("<r>", TextFormatting.BLACK + ""), 150);
// List<String> header = minecraft.fontRenderer.listFormattedStringToWidth(StringUtil.localize("container.nei." + ActuallyAdditions.MODID + ".booklet.header").replaceAll("<item>", TextFormatting.BLUE + "").replaceAll("<r>", 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<String> text = minecraft.fontRenderer.listFormattedStringToWidth(aText != null ? aText : TextFormatting.DARK_RED + StringUtil.localize("container.nei.actuallyadditions.booklet.noText"), 150);
// List<String> text = minecraft.fontRenderer.listFormattedStringToWidth(aText != null ? aText : TextFormatting.DARK_RED + StringUtil.localize("container.nei." + ActuallyAdditions.MODID + ".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);
// }

4
src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineCategory.java
View file

@ -67,12 +67,12 @@ public class CoffeeMachineCategory implements IRecipeCategory<CoffeeIngredientRe
Minecraft mc = Minecraft.getInstance();
if (!Strings.isNullOrEmpty(recipe.getExtraText())) {
guiGraphics.drawString(mc.font, Component.translatable("jei.actuallyadditions.coffee.special").append( ":"), 2, 4, 4210752, false);
guiGraphics.drawString(mc.font, Component.translatable("jei." + ActuallyAdditions.MODID + ".coffee.special").append( ":"), 2, 4, 4210752, false);
guiGraphics.drawString(mc.font, Component.literal(recipe.getExtraText()), 2, 16, 4210752, false);
}
if (recipe.getMaxAmplifier() > 0) {
guiGraphics.drawString(mc.font, Component.translatable("jei.actuallyadditions.coffee.maxAmount").append(": " + recipe.getMaxAmplifier()), 2, 28, 4210752, false);
guiGraphics.drawString(mc.font, Component.translatable("jei." + ActuallyAdditions.MODID + ".coffee.maxAmount").append(": " + recipe.getMaxAmplifier()), 2, 28, 4210752, false);
}
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
View file

@ -153,7 +153,7 @@ public abstract class TileEntityBase extends BlockEntity {
@Deprecated
public String getNameForTranslation() {
return "removeme";// "container.actuallyadditions." + this.name + ".name";
return "removeme";// "container." + ActuallyAdditions.MODID + "." + this.name + ".name";
}
// @Override

10
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java
View file

@ -260,13 +260,13 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay {
@Override
@OnlyIn(Dist.CLIENT)
public Component getExtraDisplayString() {
return Component.translatable("info.actuallyadditions.laserRelay.energy.extra").append(": ").append(Component.translatable(this.mode.name).withStyle(ChatFormatting.DARK_RED));
return Component.translatable("info." + ActuallyAdditions.MODID + ".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.laserRelay.energy.display").withStyle(ChatFormatting.GREEN);
return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.energy.display").withStyle(ChatFormatting.GREEN);
}
@Override
@ -296,9 +296,9 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay {
}
public enum Mode {
BOTH("info.actuallyadditions.laserRelay.mode.both"),
OUTPUT_ONLY("info.actuallyadditions.laserRelay.mode.outputOnly"),
INPUT_ONLY("info.actuallyadditions.laserRelay.mode.inputOnly");
BOTH("info." + ActuallyAdditions.MODID + ".laserRelay.mode.both"),
OUTPUT_ONLY("info." + ActuallyAdditions.MODID + ".laserRelay.mode.outputOnly"),
INPUT_ONLY("info." + ActuallyAdditions.MODID + ".laserRelay.mode.inputOnly");
public final String name;

4
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java
View file

@ -252,13 +252,13 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay {
@Override
@OnlyIn(Dist.CLIENT)
public Component getExtraDisplayString() {
return Component.translatable("info.actuallyadditions.laserRelay.fluid.extra").append(": ").append(Component.translatable(this.mode.name).withStyle(ChatFormatting.DARK_RED));
return Component.translatable("info." + ActuallyAdditions.MODID + ".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.laserRelay.energy.display").withStyle(ChatFormatting.GREEN);
return Component.translatable("info." + ActuallyAdditions.MODID + ".laserRelay.energy.display").withStyle(ChatFormatting.GREEN);
}
@Override

4
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java
View file

@ -159,13 +159,13 @@ public class TileEntityLaserRelayItem extends TileEntityLaserRelay {
@Override
@OnlyIn(Dist.CLIENT)
public Component getExtraDisplayString() {
return Component.translatable("info.actuallyadditions.laserRelay.item.extra").append(": ").append(Component.literal(String.valueOf(this.getPriority())).withStyle(ChatFormatting.DARK_RED));
return Component.translatable("info." + ActuallyAdditions.MODID + ".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.laserRelay.item.display.1").append(" - ").append(Component.translatable("info.actuallyadditions.laserRelay.item.display.2")).withStyle(ChatFormatting.GREEN);
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);
}
@Override

8
src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java
View file

@ -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.update.failed"), false);
player.displayClientMessage(Component.translatable("info." + ActuallyAdditions.MODID + ".update.failed"), false);
} else if (UpdateChecker.needsUpdateNotify) {
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);
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);
}
if (threadFinished) {
NeoForge.EVENT_BUS.unregister(this);

2
src/main/resources/assets/actuallyadditions/lang/en_us.json
View file

@ -841,7 +841,7 @@
"booklet.actuallyadditions.chapter.blackLotus.text.1": "Think of this: <n>You need to craft <imp>black wool<r>, <imp>black clay<r> or anything else that <imp>needs black dye<r> but you are just guilty about killing so many <imp>innocent squids<r>? <n>Well, the <item>Black Lotus<r> is exactly the thing you need! <n>Just look around <imp>in the wild<r> a bit, and you will find one, then being able to craft some <item>Black Dye<r> that can be used <imp>instead of Ink Sacs<r> so that you don't need to kill poor squids and L any longer.",
"booklet.actuallyadditions.chapter.blackLotus.text.2": "<i>Do the lotus pose",
"booklet.actuallyadditions.chapter.crystals": "Crystals and Reconstructor",
"booklet.actuallyadditions.chapter.crystals.text.1": "The <item>Atomic Reconstructor<r> is used to craft <item>Crystals<r>, which are the main crafting ingredient in most items from <imp>Actually Additions<r>. <n>Upon being supplied with power, it shoots out a Laser. <tifisgrin>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.1": "The <item>Atomic Reconstructor<r> is used to craft <item>Crystals<r>, which are the main crafting ingredient in most items from <imp>Actually Additions<r>. <n>Upon being supplied with power, it shoots out a Laser. <tifisgrin>When the Laser hits a block<r>, it will convert all surrounding items and blocks, provided they can be converted.",
"booklet.actuallyadditions.chapter.crystals.text.2": "When shooting a laser, it uses <imp>1000 CF<r>, but additional rates vary depending on the conversion. <n>There are various <item>Lenses<r> 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. <n>See the <imp>Reconstruction section<r> in the booklet <imp>for more information<r>.",
"booklet.actuallyadditions.chapter.crystals.text.3": "When right-clicking the Reconstructor with a <item>Redstone Torch<r> in hand, it will change between a mode where it <imp>gets deactivated by Redstone<r> and a mode where it <imp>responds to pulses<r>. It should be noted that any recipes listed without information about Lenses <imp>don't use one<r>. <n><i>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 <imp>automate this<r>. <n>There is a very simple way to do accomplish this: <n>Place the <item>Atomic Reconstructor<r> down facing into a <item>Precision Dropper<r> (to find it, look it up in the <imp>All Items<r> Entry!). <n>Next, place a <item>Ranged Collector<r> in the area that has the converted items set as a allowlist. <n>Now you can just chuck your raw materials into the Dropper to convert them!",