diff options
author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-07-31 13:13:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-01 00:13:20 +0700 |
commit | 99b0281dcf4ba451a363f811fdc6b671a239dc71 (patch) | |
tree | 7391763433587d53031b3e86dba37aa473eb332c /src/main/java/gregtech/api/enums | |
parent | b4ee66356b06d0fcc75654506ed67aa57755393b (diff) | |
download | GT5-Unofficial-99b0281dcf4ba451a363f811fdc6b671a239dc71.tar.gz GT5-Unofficial-99b0281dcf4ba451a363f811fdc6b671a239dc71.tar.bz2 GT5-Unofficial-99b0281dcf4ba451a363f811fdc6b671a239dc71.zip |
Laser Engraver Multi (#2771)
* Laser engraver boilerplate and structure
* Made a rough, untextured laser renderer
* Laser renderer is kind of functional
* Laser renderer follows curve
* Laser turns on/off when recipe is running
* Sampsa laser
* Color changing boilerplate
* Registered all gt lenses
* Fixed default renderer to white
* NBT reading functional
* Stole SE code to try and get TE working. It does not
* Laser renderer finally functioning with more than 1 laser!
* Moved tick count to TileLaser so lasers don't tick each other
* Implemented laser source hatch
* Structure update + spotless
* Switched to the GT_Values tier list
* Update tooltip and message player about rendering toggle
* Allow fluid input/output
* Attempting to give proper name to laser plate
* Fixed laser plate name
* New laser plate texture
* New casing just dropped
* Allow UMV glass to use any laser source
* Switched laser to a simple line renderer instead of a model
* Fixed hatch texture I missed earlier
* Spotless
* Controller textures
* render: New laser renderer
- Use GL quad rendering instead of line rendering to fix scaling
- Set lightmap coords (Emit bloom glow with shaders)
- Set opacity to 1.0
- Slight cleanup
* Got rid of the old laser model
* Tweaked some numbers on the renderer
* Spotless
* cleanup
* I give up on rotation, I've spent too much time trying to get this to work
* Got block item working I think
* Fixed tooltip for laser and multicanner
* Support bartworks lenses
* Finishing touches
* Removed unneeded assignment
* Allow UXV lasers to do all recipes
* Forgot to call super for nbt data...
* Replace magic numbers
* oops, spotless
* Another magic voltage number
* Rotations and mirror flips
Now with spotless
* fixed west/east
* ok but actually fixed now, mixed up west/east with north/south
* Updated laser source snapping to account for rotation being allowed
* Cleanup rotation axis and remove unecessary nbt
* Re-added nbt but actually load it properly now
* Fix NEI displaying lots of hatches
---------
Co-authored-by: LekKit <50500857+LekKit@users.noreply.github.com>
Co-authored-by: BucketBrigade <apple12a1@hotmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/api/enums')
4 files changed, 22 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index bda681dc75..74c392ce67 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -650,7 +650,18 @@ public class GT_Values { public static final String AuthorQuerns = "Author: " + EnumChatFormatting.RED + "Querns"; public static final String AuthorSilverMoon = "Author: " + EnumChatFormatting.AQUA + "SilverMoon"; public static final String AuthorTheEpicGamer274 = "Author: " + "TheEpicGamer274"; - public static final String AuthorFourIsTheNumber = "Author: " + EnumChatFormatting.LIGHT_PURPLE + "FourIsTheNumber"; + public static final String AuthorFourIsTheNumber = "Author: " + EnumChatFormatting.LIGHT_PURPLE + + EnumChatFormatting.ITALIC + + "Four" + + EnumChatFormatting.WHITE + + EnumChatFormatting.ITALIC + + "Is" + + EnumChatFormatting.LIGHT_PURPLE + + EnumChatFormatting.ITALIC + + "The" + + EnumChatFormatting.WHITE + + EnumChatFormatting.ITALIC + + "Number"; public static final String authorBaps = "Author: " + EnumChatFormatting.GOLD + "Ba" + EnumChatFormatting.LIGHT_PURPLE diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index f024361c19..d1c30a0935 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1462,6 +1462,9 @@ public enum ItemList implements IItemContainer { Electromagnet_Tengam, Machine_Multi_Canner, + Machine_Multi_IndustrialLaserEngraver, + Laser_Plate, + Casing_Laser, Machine_Multi_Lathe, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 8abf07e1b1..b34c5d79f0 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -610,6 +610,7 @@ public enum MetaTileEntityIDs { CRAFTING_INPUT_SLAVE(2716), INPUT_HATCH_ME(2717), INPUT_BUS_ME(2718), + INDUSTRIAL_LASER_ENGRAVER_CONTROLLER(3004), CHEST_BUFFER_ULV(9230), CHEST_BUFFER_LV(9231), CHEST_BUFFER_MV(9232), diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index ba13de2552..b190d60d00 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -336,6 +336,12 @@ public class Textures { OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW, OVERLAY_FRONT_MULTI_CANNER_GLOW, + LASER_PLATE, + MACHINE_CASING_LASER, + OVERLAY_FRONT_ENGRAVER, + OVERLAY_FRONT_ENGRAVER_ACTIVE, + OVERLAY_FRONT_ENGRAVER_ACTIVE_GLOW, + OVERLAY_FRONT_ENGRAVER_GLOW, OVERLAY_FRONT_MULTI_LATHE, OVERLAY_FRONT_MULTI_LATHE_ACTIVE, OVERLAY_FRONT_MULTI_LATHE_ACTIVE_GLOW, |