diff options
author | boubou19 <miisterunknown@gmail.com> | 2023-07-18 17:52:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-18 17:52:23 +0200 |
commit | ca2ebd4bd1887d32dab8c9c23b419c617a1b4f58 (patch) | |
tree | 1d60029ecbe34dfa7b757de940fe7d35ed1f5a2f /src/main/java/gregtech/common | |
parent | e3576b233aaf41022cd9c4b94385d843439b0d5b (diff) | |
download | GT5-Unofficial-ca2ebd4bd1887d32dab8c9c23b419c617a1b4f58.tar.gz GT5-Unofficial-ca2ebd4bd1887d32dab8c9c23b419c617a1b4f58.tar.bz2 GT5-Unofficial-ca2ebd4bd1887d32dab8c9c23b419c617a1b4f58.zip |
Added machine type on single block tooltips (#2138)
* change tooltips
* put machine types together
* Added constructor to accept multi line tooltip on sbs
* sorting machine registering methods
* update MachineType
* migrate machines to multiline description
* add new constructor for matter amplifier
* migrate matter amplifier to multi line tooltip
* spotless apply
* Capitalize machine types
* breakdown large run methods into themed methods
* migrate TE IDs to an enum (1/?)
* spotless apply
* migrate TE IDs to an enum (2/?)
* migrate TE IDs to an enum (3/?)
* migrate TE IDs to an enum (4/?)
* spotless apply
* sorting crafting recipes by type + fix meta id typo
* migrate TE IDs to an enum(5/?)
* spotless apply
* merge master (#2143)
* Make structure tooltips more colorful (#2133)
* default color changes
* add colored casing amount builders
* oversight
* address reviews
* GPL Special Item access (#2134)
* Added getters to allow a machine to set the special item for recipe checking
* Changes to ore factorys running mode description (#2135)
* Changes the integrated ore factory mode description to match what its actually doing.
* Some tooltip grammar changes.
That would have annoyed me :)
* Enable void protection for PA (#2136)
* Added ofNoOverclock builder that accepts eut and duration (#2140)
* Fix findRecipe might limit stack size by 64 (#2139)
* Fix potential issue with applecore ItemFoodProxy (#2137)
* Fix potential issue with applecore ItemFoodProxy
* Fix the worst class loader issue ive ever encountered
---------
Co-authored-by: GDCloud <93287602+GDCloudstrike@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: Lyfts <127234178+Lyfts@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Serenibyss <10861407+serenibyss@users.noreply.github.com>
* Moved machine type and descriptions to lang files
* Removed redundant visibility modifier
* Only expose translated descriptions
* Using prefix gt.recipe for NEI compatibility
* Deprecate use of LanguageManager in GT_Recipe_Map
* Unify GT_Recipe and MachineType localization
* Electromagnetic Polarizer consistency with Separator
* Added Packager MachineType
* Added Scanner MachineType
* Added Rock breaker MachineType
* Added Mass Fabricator MachineType
* Added Replicator MachineType
* Added "Machine Type" tooltip to steam machines
* public modifier unnecessary
* Spotless apply
---------
Co-authored-by: minecraft7771 <maxim235@gmx.de>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GDCloud <93287602+GDCloudstrike@users.noreply.github.com>
Co-authored-by: Lyfts <127234178+Lyfts@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Serenibyss <10861407+serenibyss@users.noreply.github.com>
Co-authored-by: YannickMG <yannickmg@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/common')
5 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java index bc6e87c53b..14002597df 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.ItemList; +import gregtech.api.enums.MachineType; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -43,7 +44,7 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine aNameRegional, aTier, 1, - "Puts things into Boxes", + MachineType.PACKAGER.tooltipDescription(), 2, 1, "Packager.png", diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java index 87d84f7ca7..5de32bd649 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java @@ -24,6 +24,7 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.ItemList; +import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -51,7 +52,7 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac aNameRegional, aTier, 1, - "UUM = Matter * Fabrication Squared", + MachineType.MATTER_FABRICATOR.tooltipDescription(), 1, 1, "Massfabricator.png", diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java index 295cb01ead..c6e45fca19 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java @@ -27,6 +27,7 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.GregTech_API; import gregtech.api.enums.Element; import gregtech.api.enums.ItemList; +import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.ITexture; @@ -62,7 +63,7 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine aNameRegional, aTier, 1, - "Producing Elemental Matter", + MachineType.REPLICATOR.tooltipDescription(), 1, 1, "Replicator.png", diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java index 3e6d3065f0..91382cafaf 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java @@ -21,6 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.ITexture; @@ -41,7 +42,7 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_BasicMachin aNameRegional, aTier, 1, - "Put Lava and Water adjacent", + MachineType.ROCKBREAKER.tooltipDescription(), 1, 1, "RockBreaker.png", diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 0882276aa5..ba9483647c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -33,6 +33,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import gregtech.GT_Mod; import gregtech.api.enums.ItemList; +import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; @@ -59,7 +60,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { aNameRegional, aTier, 1, - "Scans Crops and other things.", + MachineType.SCANNER.tooltipDescription(), 1, 1, "Scanner.png", |