Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ dependencies {
compileOnly("com.github.GTNewHorizons:Postea:1.2.5:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:SimpleSkinBackport:1.0.2-GTNH:dev") {transitive = false}

devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.110-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev")
devOnlyNonPublishable("io.github.legacymoddingmc:unimixins:0.1.23:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.110-GTNH:dev")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:Angelica:2.1.49:dev')

// Deobf Extra Utilities, allows hodgepodge mixins to not crash. For testing feature parity and postea only.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

import static com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess.MODID;

import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.IReloadableResourceManager;
import net.minecraftforge.client.MinecraftForgeClient;

import com.fouristhenumber.utilitiesinexcess.client.UIERMRL;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockTrueGreenscreen;
import com.fouristhenumber.utilitiesinexcess.common.renderers.ChunchunmaruRenderer;
import com.fouristhenumber.utilitiesinexcess.common.renderers.FireBatteryRenderer;
Expand Down Expand Up @@ -74,6 +77,9 @@ public void init(FMLInitializationEvent event) {
if (Mods.FindIt.isLoaded()) {
FindItHelper.init();
}

((IReloadableResourceManager) Minecraft.getMinecraft()
.getResourceManager()).registerReloadListener(new UIERMRL());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.fouristhenumber.utilitiesinexcess.client;

import net.minecraft.client.resources.IResourceManager;
import net.minecraft.client.resources.IResourceManagerReloadListener;

import com.fouristhenumber.utilitiesinexcess.compat.Mods;
import com.fouristhenumber.utilitiesinexcess.compat.nei.NEIConfig;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

@SideOnly(Side.CLIENT)
public class UIERMRL implements IResourceManagerReloadListener {

@Override
public void onResourceManagerReload(IResourceManager p_110549_1_) {
if (Mods.NEI.isLoaded()) {
NEIConfig.registerAliases();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package com.fouristhenumber.utilitiesinexcess.compat.nei;

import java.util.ArrayList;
import java.util.List;

import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;

import com.fouristhenumber.utilitiesinexcess.ModBlocks;
import com.fouristhenumber.utilitiesinexcess.ModItems;
import com.fouristhenumber.utilitiesinexcess.Tags;
import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess;
import com.fouristhenumber.utilitiesinexcess.common.items.ItemInversionSigilActive;
import com.fouristhenumber.utilitiesinexcess.compat.Mods;
import com.gtnewhorizon.gtnhlib.eventbus.EventBusSubscriber;

Expand Down Expand Up @@ -85,4 +90,64 @@ public static void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) {
.build());
}
}

public static void registerAliases() {
// spotless:off
ArrayList<ItemStack> aliasedItemStacks = new ArrayList<>(List.of(
new ItemStack(ModBlocks.FLOATING_BLOCK.getItem()),
new ItemStack(ModBlocks.UNDERWORLD_PORTAL.getItem()),
new ItemStack(ModBlocks.END_OF_TIME_PORTAL.getItem()),
new ItemStack(ModBlocks.PACIFISTS_BENCH.getItem()),
new ItemStack(ModBlocks.GIGA_TORCH.getItem()),
new ItemStack(ModBlocks.ENDSPARK.getItem()),
new ItemStack(ModBlocks.ENDER_LOCUS.getItem()),
new ItemStack(ModBlocks.INVERTED_BLOCK.getItem()),
new ItemStack(ModBlocks.MAGIC_WOOD.get()),
new ItemStack(ModBlocks.SIGNIFICANTLY_SHRUNK_CHEST.get()),
new ItemStack(ModBlocks.RADICALLY_REDUCED_CHEST.get()),
new ItemStack(ModBlocks.MARGINALLY_MAXIMISED_CHEST.get()),
new ItemStack(ModBlocks.LOW_TEMPERATURE_FURNACE_GENERATOR.get()),
new ItemStack(ModBlocks.LOW_TEMPERATURE_FURNACE_SUBSTATION.get()),
new ItemStack(ModBlocks.LOW_TEMPERATURE_FURNACE_POWERPLANT.get()),
new ItemStack(ModBlocks.COLLECTOR.get()),

new ItemStack(ModItems.ANTI_PARTICULATE_SHOVEL.get()),
new ItemStack(ModItems.MOB_JAR.get()),
new ItemStack(ModItems.INVERSION_SIGIL_INACTIVE.get()),
ItemInversionSigilActive.getStack(),
new ItemStack(ModItems.PSEUDO_REVERSION_SIGIL.get()),
new ItemStack(ModItems.INVERTED_INGOT.get()),
new ItemStack(ModItems.INVERTED_INGOT.get(), 1, 1),
new ItemStack(ModItems.ARCHITECTS_WAND.get()),
new ItemStack(ModItems.SUPER_ARCHITECTS_WAND.get()),
new ItemStack(ModItems.HEAVENLY_RING_FEATHER.get()),
new ItemStack(ModItems.HEAVENLY_RING_DRAGON.get()),
new ItemStack(ModItems.HEAVENLY_RING_FAIRY.get()),
new ItemStack(ModItems.HEAVENLY_RING_METAL.get()),
new ItemStack(ModItems.HEAVENLY_RING_MAGIC.get()),
new ItemStack(ModItems.CHUNCHUNMARU.get()),
new ItemStack(ModItems.FIRE_BATTERY.get()),
new ItemStack(ModItems.ENDER_LOTUS_SEED.get()),
new ItemStack(ModItems.BLOCK_ANALYZER.get()),
new ItemStack(ModItems.XRAY_GLASSES.get())
));
// spotless:on

for (int i = 0; i < 16; i++) {
aliasedItemStacks.add(new ItemStack(ModBlocks.LAPIS_AETHERIUS.getItem(), 1, i));
}

for (int i = 0; i < 10; i++) {
aliasedItemStacks.add(new ItemStack(ModBlocks.DECORATIVE_GLASS.getItem(), 1, i));
}

for (ItemStack itemStack : aliasedItemStacks) {
if (itemStack.getItem() == null) continue;

API.setAliases(
itemStack,
StatCollector.translateToLocal(itemStack.getUnlocalizedName() + ".aliases")
.split(";"));
}
}
}
54 changes: 54 additions & 0 deletions src/main/resources/assets/utilitiesinexcess/lang/cs_CZ.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# NEI item aliases
item.heavenly_ring_magic.aliases=Andělský prsten
item.heavenly_ring_metal.aliases=Andělský prsten
item.heavenly_ring_fairy.aliases=Andělský prsten
item.heavenly_ring_dragon.aliases=Andělský prsten
item.heavenly_ring_feather.aliases=Andělský prsten
item.architects_wand.aliases=Stavitelova hůlka
item.pseudo_reversion_sigil.aliases=Divizní pečeť
item.inversion_sigil_active.aliases=Divizní pečeť
item.inversion_sigil_inactive.aliases=Divizní pečeť
item.anti_particulate_shovel.aliases=Erozní lopata
item.mob_jar.aliases=Zlaté laso
item.fire_battery.aliases=Žhavící cívka
item.block_analyzer.aliases=Přenosný skenr
item.xray_glasses.aliases=Sonarové brýle
item.inverted_ingot.aliases=Nestabilní cihlička
tile.floating_block.aliases=Andělský blok
tile.underworld_portal.aliases=Portál do 'Hlubokého temna'
tile.endspark.aliases=Endeří jádro
tile.inverted_block.aliases=Nestabilní cihličkový blok
tile.magic_wood.aliases=Magické dřevo
tile.decorative_glass.0.aliases=Zhuštěné sklo
tile.decorative_glass.1.aliases=Ohraničené sklo
tile.decorative_glass.2.aliases=Skleněné cihly
tile.decorative_glass.3.aliases=Vybrušované sklo
tile.decorative_glass.4.aliases=Zlaté ohraničené sklo
tile.decorative_glass.5.aliases=Obsidianové sklo
tile.decorative_glass.6.aliases=Točící se sklo
tile.decorative_glass.7.aliases=Světlitové sklo
tile.decorative_glass.8.aliases=Srdcové sklo
tile.decorative_glass.9.aliases=Čtverečné sklo
tile.low_temperature_furnace_powerplant.aliases=Generátor přeživšího
tile.low_temperature_furnace_substation.aliases=Generátor přeživšího
tile.low_temperature_furnace_generator.aliases=Generátor přeživšího
tile.lapis_aetherius.0.aliases=Lapisová nebeskost Albus (Bílá)
tile.lapis_aetherius.1.aliases=Lapisová nebeskost Aurantiacus (Oranžová)
tile.lapis_aetherius.2.aliases=Lapisová nebeskost Purpura Amethystinus (Purpurová)
tile.lapis_aetherius.3.aliases=Lapisová nebeskost Caesicius (Světle modrá)
tile.lapis_aetherius.4.aliases=Lapisová nebeskost Flavus (Žlutá)
tile.lapis_aetherius.5.aliases=Lapisová nebeskost Viridis (Zelená)
tile.lapis_aetherius.6.aliases=Lapisová nebeskost Roseus (Růžová)
tile.lapis_aetherius.7.aliases=Lapisová nebeskost Cinereus (Šedá)
tile.lapis_aetherius.8.aliases=Lapisová nebeskost Lux Cinereus (Světle šedá)
tile.lapis_aetherius.9.aliases=Lapisová nebeskost Callainus (Azurová)
tile.lapis_aetherius.10.aliases=Lapisová nebeskost Purpura (Fialová)
tile.lapis_aetherius.11.aliases=Lapisová nebeskost Caeruleus (Modrá)
tile.lapis_aetherius.12.aliases=Lapisová nebeskost Fuscus (Hnědá)
tile.lapis_aetherius.13.aliases=Lapisová nebeskost Paphiae Myrti (Tmavě zelená)
tile.lapis_aetherius.14.aliases=Lapisová nebeskost Rufus (Červená)
tile.lapis_aetherius.15.aliases=Lapisová nebeskost Nox (Černá)
tile.giga_torch.aliases=Magnumová pochodeň
tile.pacifists_bench.aliases=Mírumilovný stolek
item.ender_lotus_seed.aliases=Semínka lilie z endu
tile.ender_locus.aliases=QED (Kvantové zaplétací zařízení)
54 changes: 54 additions & 0 deletions src/main/resources/assets/utilitiesinexcess/lang/de_DE.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# NEI item aliases
item.heavenly_ring_magic.aliases=Engelsring
item.heavenly_ring_metal.aliases=Engelsring
item.heavenly_ring_fairy.aliases=Engelsring
item.heavenly_ring_dragon.aliases=Engelsring
item.heavenly_ring_feather.aliases=Engelsring
item.architects_wand.aliases=Baumeisterstab
item.pseudo_reversion_sigil.aliases=Teilungssiegel
item.inversion_sigil_active.aliases=Teilungssiegel
item.inversion_sigil_inactive.aliases=Teilungssiegel
item.anti_particulate_shovel.aliases=Erosionsschaufel
item.mob_jar.aliases=Goldenes Lasso
item.fire_battery.aliases=Heizwendel
item.block_analyzer.aliases=Tragbarer Scanner
item.xray_glasses.aliases=Sonarbrille
item.inverted_ingot.aliases=Labiler Barren
tile.floating_block.aliases=Engelsblock
tile.underworld_portal.aliases=Portal zur 'Deep Dark'
tile.endspark.aliases=Enderkern
tile.inverted_block.aliases=Labiler Barrenblock
tile.magic_wood.aliases=Magisches Holz
tile.decorative_glass.0.aliases=Verdichtetes Glas
tile.decorative_glass.1.aliases=Umrandetes Glas
tile.decorative_glass.2.aliases=Glasziegel
tile.decorative_glass.3.aliases=Gemeißeltes Glas
tile.decorative_glass.4.aliases=Golden Umrandetes Glas
tile.decorative_glass.5.aliases=Obsidianglas
tile.decorative_glass.6.aliases=Wirbelglas
tile.decorative_glass.7.aliases=Glowstone-Glas
tile.decorative_glass.8.aliases=Herzglas
tile.decorative_glass.9.aliases=Quadratglas
tile.low_temperature_furnace_powerplant.aliases=Generator des Überlebenskünstlers
tile.low_temperature_furnace_substation.aliases=Generator des Überlebenskünstlers
tile.low_temperature_furnace_generator.aliases=Generator des Überlebenskünstlers
tile.lapis_aetherius.0.aliases=Lapis Caelestis Albus (Weiß)
tile.lapis_aetherius.1.aliases=Lapis Caelestis Aurantiacus (Orange)
tile.lapis_aetherius.2.aliases=Lapis Caelestis Purpura Amethystinus (Magenta)
tile.lapis_aetherius.3.aliases=Lapis Caelestis Caesicius (Hellblau)
tile.lapis_aetherius.4.aliases=Lapis Caelestis Flavus (Gelb)
tile.lapis_aetherius.5.aliases=Lapis Caelestis Viridis (Grün)
tile.lapis_aetherius.6.aliases=Lapis Caelestis Roseus (Pink)
tile.lapis_aetherius.7.aliases=Lapis Caelestis Cinereus (Grau)
tile.lapis_aetherius.8.aliases=Lapis Caelestis Lux Cinereus (Hellgrau)
tile.lapis_aetherius.9.aliases=Lapis Caelestis Callainus (Türkis)
tile.lapis_aetherius.10.aliases=Lapis Caelestis Purpura (Violett)
tile.lapis_aetherius.11.aliases=Lapis Caelestis Caeruleus (Blau)
tile.lapis_aetherius.12.aliases=Lapis Caelestis Fuscus (Braun)
tile.lapis_aetherius.13.aliases=Lapis Caelestis Paphiae Myrti (Dunkelgrün)
tile.lapis_aetherius.14.aliases=Lapis Caelestis Rufus (Rot)
tile.lapis_aetherius.15.aliases=Lapis Caelestis Nox (Schwarz)
tile.giga_torch.aliases=Magnumfackel
tile.pacifists_bench.aliases=Friedlichkeitstisch
item.ender_lotus_seed.aliases=Enderliliensamen
tile.ender_locus.aliases=QED (Quantum Entanglement Device)
37 changes: 37 additions & 0 deletions src/main/resources/assets/utilitiesinexcess/lang/en_PT.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# NEI item aliases
item.heavenly_ring_magic.aliases=Ring o' Not Fallin'
item.heavenly_ring_metal.aliases=Ring o' Not Fallin'
item.heavenly_ring_fairy.aliases=Ring o' Not Fallin'
item.heavenly_ring_dragon.aliases=Ring o' Not Fallin'
item.heavenly_ring_feather.aliases=Ring o' Not Fallin'
item.architects_wand.aliases=Fast Ship Builder
item.pseudo_reversion_sigil.aliases=Sigil of Fancy-Pancy Math an' Numbers
item.inversion_sigil_active.aliases=Sigil of Fancy-Pancy Math an' Numbers
item.inversion_sigil_inactive.aliases=Sigil of Fancy-Pancy Math an' Numbers
item.anti_particulate_shovel.aliases=Booty Digger
item.mob_jar.aliases=Golden Rope
item.block_analyzer.aliases=Device o' "What be' this doin'"?
item.xray_glasses.aliases=Where be' the 'ores and ores?
item.inverted_ingot.aliases=Why be this bullion so hot?
tile.floating_block.aliases=Block o' Air Buildin'
tile.underworld_portal.aliases=Portal to the 'Voodoo Realm'
tile.endspark.aliases=Tall-Mans Booty
tile.inverted_block.aliases=Chunk O' Maff
tile.magic_wood.aliases=Magic Knowedge
tile.decorative_glass.0.aliases=Crystal Glass
tile.decorative_glass.1.aliases=Edged Crystal
tile.decorative_glass.2.aliases=Bricks O' Crystal
tile.decorative_glass.3.aliases=Carved Crystal
tile.decorative_glass.4.aliases=Booty Edged Crystal
tile.decorative_glass.5.aliases=Crystal O' Tears
tile.decorative_glass.6.aliases=Swirling Crystal
tile.decorative_glass.7.aliases=Lightgem Crystal
tile.decorative_glass.8.aliases=Crystal O' Love
tile.decorative_glass.9.aliases=Square Crystal
tile.low_temperature_furnace_powerplant.aliases=Shipwrecked Generator
tile.low_temperature_furnace_substation.aliases=Shipwrecked Generator
tile.low_temperature_furnace_generator.aliases=Shipwrecked Generator
tile.giga_torch.aliases=Pillar O' Flame
tile.pacifists_bench.aliases=Table O' the Yellow-Bellied Dog
item.ender_lotus_seed.aliases=Tall Lilly Seeds
tile.ender_locus.aliases=QED (What be this?)
62 changes: 62 additions & 0 deletions src/main/resources/assets/utilitiesinexcess/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -739,3 +739,65 @@ gui.cabinet.slot_dir.title=Slot fill direction
gui.cabinet.slot_dir.horizontal=Horizontal
gui.cabinet.slot_dir.vertical=Vertical


# NEI item aliases
item.heavenly_ring_magic.aliases=Angel Ring
item.heavenly_ring_metal.aliases=Angel Ring
item.heavenly_ring_fairy.aliases=Angel Ring
item.heavenly_ring_dragon.aliases=Angel Ring
item.heavenly_ring_feather.aliases=Angel Ring
item.architects_wand.aliases=Builder's Wand
item.pseudo_reversion_sigil.aliases=Division Sigil
item.inversion_sigil_active.aliases=Division Sigil
item.inversion_sigil_inactive.aliases=Division Sigil
item.anti_particulate_shovel.aliases=Erosion Shovel
item.mob_jar.aliases=Golden Lasso
item.fire_battery.aliases=Heating Coil
item.block_analyzer.aliases=Portable Scanner
item.xray_glasses.aliases=Sonar Goggles
item.inverted_ingot.aliases=Unstable Ingot
item.inverted_ingot.stable.aliases=Mobius "Unstable/Stable" Ingot
item.chunchunmaru.aliases=Kikoku
tile.floating_block.aliases=Angel Block
tile.marginally_maximised_chest.aliases=Slightly Larger Chest
tile.radically_reduced_chest.aliases=Mini-Chest
tile.significantly_shrunk_chest.aliases=Mini-Chest
tile.underworld_portal.aliases=Portal to The Deep Dark
tile.temporal_gate.aliases=Portal to The Last Millenium
tile.endspark.aliases=Ender Core
tile.inverted_block.aliases=Unstable Ingot Block
tile.magic_wood.aliases=Magical Wood
tile.decorative_glass.0.aliases=Thickened Glass
tile.decorative_glass.1.aliases=Edged Glass
tile.decorative_glass.2.aliases=Glass Bricks
tile.decorative_glass.3.aliases=Carved Glass
tile.decorative_glass.4.aliases=Golden Edged Glass
tile.decorative_glass.5.aliases=Obsidian Glass
tile.decorative_glass.6.aliases=Swirling Glass
tile.decorative_glass.7.aliases=Glowstone Glass
tile.decorative_glass.8.aliases=Heart Glass
tile.decorative_glass.9.aliases=Square Glass
tile.collector.aliases=Ender Collector
tile.low_temperature_furnace_powerplant.aliases=Survivalist Generator
tile.low_temperature_furnace_substation.aliases=Survivalist Generator
tile.low_temperature_furnace_generator.aliases=Survivalist Generator
tile.lapis_aetherius.0.aliases=Lapis Caelestis Albus (White)
tile.lapis_aetherius.1.aliases=Lapis Caelestis Aurantiacus (Orange)
tile.lapis_aetherius.2.aliases=Lapis Caelestis Purpura Amethystinus (Magenta)
tile.lapis_aetherius.3.aliases=Lapis Caelestis Caesicius (Light Blue)
tile.lapis_aetherius.4.aliases=Lapis Caelestis Flavus (Yellow)
tile.lapis_aetherius.5.aliases=Lapis Caelestis Viridis (Green)
tile.lapis_aetherius.6.aliases=Lapis Caelestis Roseus (Pink)
tile.lapis_aetherius.7.aliases=Lapis Caelestis Cinereus (Gray)
tile.lapis_aetherius.8.aliases=Lapis Caelestis Lux Cinereus (Light Gray)
tile.lapis_aetherius.9.aliases=Lapis Caelestis Callainus (Cyan)
tile.lapis_aetherius.10.aliases=Lapis Caelestis Purpura (Purple)
tile.lapis_aetherius.11.aliases=Lapis Caelestis Caeruleus (Blue)
tile.lapis_aetherius.12.aliases=Lapis Caelestis Fuscus (Brown)
tile.lapis_aetherius.13.aliases=Lapis Caelestis Paphiae Myrti (Dark Green)
tile.lapis_aetherius.14.aliases=Lapis Caelestis Rufus (Red)
tile.lapis_aetherius.15.aliases=Lapis Caelestis Nox (Black)
tile.giga_torch.aliases=Magnum Torch
tile.pacifists_bench.aliases=Peaceful Table
item.ender_lotus_seed.aliases=Ender-Lily Seeds
tile.ender_locus.aliases=QED (Quantum Entanglement Device)
Loading