diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-07-05 06:40:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 12:40:33 +0700 |
| commit | 6ae126921b95a38acef23e6025371f032f5ae2f4 (patch) | |
| tree | 811c783e7638500a966754ea6a0ee87854f5a488 /src/main/java/gregtech/api/enums | |
| parent | 864f4183d5f3e600e531e0d4afecdf4b265819b3 (diff) | |
| download | GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.tar.gz GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.tar.bz2 GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.zip | |
DTPF Laser (#1100)
* DTPF Laser
* exotic
* Structure forms with TT laser, recipe broken. WIP.
* Format amps in PA correctly.
* Fix incorrect colouring on text.
* New DTPF controller textures.
* Update spacetime material.
* Update DTPF texture
* Update DTPF NEI page
* Add spacetime wires
* Tons of fixes/adjustments.
* Localise achievements.
* Typos
* More fixes + move plasmas to mixer.
* Spacetime adjustment
* Spacetime blocks.
* Spacetime wires.
* Localise coils
* Adjust DTPF fuels
* Adjust DTPF fuels.
* Stuff
* Fix optimiser
* DTPF
* Depreciated
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/Textures.java | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index aef05a502a..2a910e8911 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -870,12 +870,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials DimensionallyTranscendentResidue = new Materials( 589, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 0, 1, "DimensionallyTranscendentResidue" , "Dimensionally Transcendent Residue" , -1, -1, 25, 1, false, true, 1, 1, 1, Dyes.dyeBlack); - public static Materials SpaceTime = new Materials( 588, new TextureSet("spacetime", true) , 1.0F, 0, 2, 1|2|16|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))); + public static Materials SpaceTime = new Materials( 588, new TextureSet("spacetime", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))); static { MaterialsKevlar.init(); } - + /** * Materials which are renamed automatically */ diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 01ad649311..6515c448cf 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -509,6 +509,8 @@ public class Textures { OVERLAY_FLUID_STORAGE_MONITOR13, OVERLAY_FLUID_STORAGE_MONITOR14, + OVERLAY_DTPF_OFF, + OVERLAY_DTPF_ON, OVERLAY_FUSION1, OVERLAY_FUSION1_GLOW, OVERLAY_FUSION2, @@ -1025,6 +1027,7 @@ public class Textures { BLOCK_TUNGSTEN, BLOCK_TUNGSTENSTEEL, BLOCK_ULTIMET, + BLOCK_SPACETIME, BLOCK_URANIUM, BLOCK_URANIUM235, @@ -1087,7 +1090,7 @@ public class Textures { MARBLE_COBBLE, BLOCK_NICKELALUMINIUM, BLOCK_SILICONSG, - + MARBLE_COBBLE_MOSSY, MARBLE_BRICKS, MARBLE_BRICKS_CRACKED, @@ -1705,7 +1708,8 @@ public class Textures { STORAGE_BLOCKS12 = { BLOCK_CRYOLITE, BLOCK_SILICONSG, - BLOCK_NICKELALUMINIUM + BLOCK_NICKELALUMINIUM, + BLOCK_SPACETIME }; public static final ITexture[] HIDDEN_TEXTURE = { |