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

moar refactoring.

Browse source
This commit is contained in:
Flanks255 2022-06-05 15:36:27 -05:00
parent 123b5b1810
commit 35bf265618
10 changed files with 3 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java
View file

@ -47,11 +47,6 @@ public class GuiBioReactor extends AAScreen<ContainerBioReactor> {
//this.energy.render(mouseX, mouseY);
}
@Override
public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) {
AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.tile);
}
@Override
public void renderBg(MatrixStack matrices, float partialTicks, int x, int y) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);

5
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java
View file

@ -49,11 +49,6 @@ public class GuiEnergizer extends AAScreen<ContainerEnergizer> {
this.energy.render(matrices, x, y);
}
@Override
public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) {
AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.energizer);
}
@Override
public void renderBg(MatrixStack matrices, float f, int x, int y) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);

5
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java
View file

@ -50,11 +50,6 @@ public class GuiEnervator extends AAScreen<ContainerEnervator> {
this.energy.render(matrices, x, y);
}
@Override
public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) {
AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.enervator);
}
@Override
public void renderBg(MatrixStack matrices, float f, int x, int y) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);

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

@ -51,11 +51,6 @@ public class GuiFeeder extends AAScreen<ContainerFeeder> {
}
}
@Override
public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) {
AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.tileFeeder);
}
@Override
public void renderBg(MatrixStack matrices, float f, int x, int y) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);

6
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java
View file

@ -50,12 +50,6 @@ public class GuiMiner extends AAScreen<ContainerMiner> {
// });
// this.addButton(buttonReset);
}
@Override
public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) {
AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.miner);
}
@Override
public void renderBg(MatrixStack matrices, float f, int x, int y) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);

6
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java
View file

@ -78,12 +78,6 @@ public class GuiPhantomPlacer extends AAScreen<ContainerPhantomPlacer> {
// private String getSide() {
// return GuiInputter.SIDES[this.placer.side + 1];
// }
@Override
public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) {
AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.placer);
}
@Override
public void renderBg(MatrixStack matrices, float f, int x, int y) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);

5
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java
View file

@ -72,11 +72,6 @@ public class GuiXPSolidifier extends AAScreen<ContainerXPSolidifier> {
// this.addButton(buttonAll);
}
@Override
public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) {
AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.solidifier);
}
@Override
public void renderBg(MatrixStack matrices, float f, int x, int y) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);

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

@ -158,6 +158,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickableTile
// return !oldState.getBlock().isAssociatedBlock(newState.getBlock());
// }
@Deprecated
public String getNameForTranslation() {
return "removeme";// "container." + ActuallyAdditions.MODID + "." + this.name + ".name";
}

16
src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java
View file

@ -47,12 +47,6 @@ public final class StringUtil {
return I18n.get(text, replace);
}
@SuppressWarnings("deprecation")
//TODO: delete this shit and move ItemPotionRing's getItemStackDisplayName into getUnlocalizedName
public static String localizeIllegallyOnTheServerDontUseMePls(String langKey) {
return I18n.get(langKey);
}
// TODO: Move to official
@OnlyIn(Dist.CLIENT)
public static void drawSplitString(FontRenderer renderer, String strg, int x, int y, int width, int color, boolean shadow) {
@ -94,14 +88,4 @@ public final class StringUtil {
// throw new RuntimeException("Actually Additions failed to access LanguageMap.inject. Report this!");
// }
// }
// TODO: This might be wrong
public static String badTranslate(String someUnlocAAItemName) {
// if (cancerino == null) {
// cancerino = new LanguageMap();
// setupLangMap();
// }
// return cancerino.translateKey("item.actuallyadditions." + someUnlocAAItemName + ".name");
return ForgeI18n.parseFormat("item.actuallyadditions." + someUnlocAAItemName + ".name");
}
}

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

@ -551,8 +551,8 @@
"info.actuallyadditions.gui.smartInfo": "When pressing this, all items from inventories adjacent to this relay will be added to this part of the white- or blacklist. Adding Item Filters to the list before will cause them to also be filled.",
"info.actuallyadditions.inputter.info.1": "This is the first Slot in the connected Inventory to <p> at.",
"info.actuallyadditions.inputter.info.2": "This is the slot after the last Slot in the connected Inventory to <p> at. What that means: If you, for example, write 2 in the field to the left and 5 in this one, it will <p> at Slot 2, 3, and 4.",
"info.actuallyadditions.noLens": "No Lens",
"info.actuallyadditions.noItem": "No Items in Buffer",
"info.actuallyadditions.nolens": "No Lens",
"info.actuallyadditions.noitem": "No Items in Buffer",
"info.actuallyadditions.booklet.manualName.1.1": "Actually Additions",
"info.actuallyadditions.booklet.manualName.1.2": "Actual Additions",
"info.actuallyadditions.booklet.manualName.1.3": "Actually Addiction",