From d815f1f0e7b267c1c7ef97fdf2c790b6c9f6a378 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Fri, 12 Aug 2022 19:33:19 +0100 Subject: More wireless fixes/updates (#1206) * Fix possible out-of-bounds error. * Bye bye OpV * Bye bye OpV * Some textures while I'm here * Test * Maybe * New command * Fix forge minecraft shenanigans interfering with saving data. * Localisation of achievements * Add save intervals for energy map. * Refactor as to not use dumb bloat * New interface for wireless hatches * Remove prefix * Big refactor and code cleanup. Also fixes bug with energy not getting added sometimes * Fix typo causing ore dict issues * New interface * Clean up commands a little * Add some colouring and clean up a little. * Update desc * Add more catches for command misuse and colours * Jenkins Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> --- .../gregtech/common/items/GT_MetaGenerated_Item_03.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/gregtech/common/items') diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index d60bef3ff0..1e3402618a 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -279,27 +279,27 @@ public class GT_MetaGenerated_Item_03 OreDictionary.registerOre("UHV", ItemList.Circuit_ExoticProcessor.get(1)); ItemList.Circuit_ExoticAssembly.set(addItem(tLastID = 167, "Exotic Assembly", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UEV", ItemList.Circuit_ExoticAssembly.get(1)); - ItemList.Circuit_ExoticComputer.set(addItem(tLastID = 168, "Exotic Computer", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); + ItemList.Circuit_ExoticComputer.set(addItem(tLastID = 168, "Exotic Computer", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UIV", ItemList.Circuit_ExoticComputer.get(1)); ItemList.Circuit_ExoticMainframe.set(addItem(tLastID = 169, "Exotic Mainframe", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UMV", ItemList.Circuit_ExoticMainframe.get(1)); // Cosmic circuits - ItemList.Circuit_CosmicProcessor.set(addItem(tLastID = 170, "Cosmic Processor", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); + ItemList.Circuit_CosmicProcessor.set(addItem(tLastID = 170, "Cosmic Processor", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UEV", ItemList.Circuit_CosmicProcessor.get(1)); - ItemList.Circuit_CosmicAssembly.set(addItem(tLastID = 171, "Cosmic Assembly", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); + ItemList.Circuit_CosmicAssembly.set(addItem(tLastID = 171, "Cosmic Assembly", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UIV", ItemList.Circuit_CosmicAssembly.get(1)); - ItemList.Circuit_CosmicComputer.set(addItem(tLastID = 172, "Cosmic Computer", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); + ItemList.Circuit_CosmicComputer.set(addItem(tLastID = 172, "Cosmic Computer", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UMV", ItemList.Circuit_CosmicComputer.get(1)); ItemList.Circuit_CosmicMainframe.set(addItem(tLastID = 173, "Cosmic Mainframe", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UXV", ItemList.Circuit_CosmicMainframe.get(1)); // Transcendent circuits - ItemList.Circuit_TranscendentProcessor.set(addItem(tLastID = 174, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION)); + ItemList.Circuit_TranscendentProcessor.set(addItem(tLastID = 174, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UIV", ItemList.Circuit_TranscendentProcessor.get(1)); - ItemList.Circuit_TranscendentAssembly.set(addItem(tLastID = 175, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION)); + ItemList.Circuit_TranscendentAssembly.set(addItem(tLastID = 175, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UMV", ItemList.Circuit_TranscendentAssembly.get(1)); - ItemList.Circuit_TranscendentComputer.set(addItem(tLastID = 176, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION)); + ItemList.Circuit_TranscendentComputer.set(addItem(tLastID = 176, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("UXV", ItemList.Circuit_TranscendentComputer.get(1)); ItemList.Circuit_TranscendentMainframe.set(addItem(tLastID = 177, "Temporally Transcendent Mainframe", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION)); OreDictionary.registerOre("MAX", ItemList.Circuit_TranscendentMainframe.get(1)); -- cgit