diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-07-30 21:33:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-30 22:33:27 +0200 |
commit | da607d977bc465e6aed08b366c24353d84e81642 (patch) | |
tree | c713015b17400635f34a2fdad6cc91222de0e6af /src/main | |
parent | f1cccfbe7de3362ae4ca8276df2523b8bb2be5a5 (diff) | |
download | GT5-Unofficial-da607d977bc465e6aed08b366c24353d84e81642.tar.gz GT5-Unofficial-da607d977bc465e6aed08b366c24353d84e81642.tar.bz2 GT5-Unofficial-da607d977bc465e6aed08b366c24353d84e81642.zip |
Add energised tesseract (#1175)
* New recipe methods.
* Pulverise tesseracts
* New pulveriser method
* Cleanup code
* Smelting/cooling methods
* Super coolant
* Add hot ingot
* Expand DTPF UI
* Add energised tesseract
* Disable incorrect freezer recipe.
* Remove compressor recipe + adjust values of transcendent metal a bit.
* Fix missing textures
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main')
30 files changed, 25 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 8d9dc49d0b..b73e6bd3a8 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -418,6 +418,7 @@ public enum ItemList implements IItemContainer { Electric_Pump_MAX, Tesseract, + EnergisedTesseract, Steam_Valve_LV, Steam_Valve_MV, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 49a2cd3fe6..19c3b5d931 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -882,7 +882,7 @@ 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) , 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))); - public static Materials TranscendentMetal = new Materials( 581, new TextureSet("transcendentmetal", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 50, 50, 50,255, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, false, true, 200, 1000, 1000, Dyes.dyeBlack , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes(); + public static Materials TranscendentMetal = new Materials( 581, new TextureSet("transcendentmetal", true) , 290.0F, 3*2621440, 22, 1|2|64|128, 50, 50, 50,255, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, true, true, 200, 1000, 1000, Dyes.dyeBlack , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); static { MaterialsKevlar.init(); @@ -2008,7 +2008,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { FreshWater ); - TranscendentMetal.add(SubTag.NO_SMELTING); +// TranscendentMetal.add(SubTag.NO_SMELTING); Wood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); WoodSealed.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING, SubTag.NO_WORKING); Peanutwood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 6489ce8c6f..9452218ca6 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -560,6 +560,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tesseract.set(addItem(415, "Raw Tesseract", "", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L))); ItemList.GigaChad.set(addItem(416, "Giga Chad Token", "You are worthy", new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1000L))); + ItemList.EnergisedTesseract.set(addItem(417, "Energised Tesseract", "Higher dimensional engineering", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L))); ItemList.Electric_Piston_LV.set(addItem(640, "Electric Piston (LV)", "", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L))); ItemList.Electric_Piston_MV.set(addItem(641, "Electric Piston (MV)", "", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L))); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 74f2a762c0..17b88759eb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -55,7 +55,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if ((!OrePrefixes.block.isIgnored(aMaterial)) && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))) { GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(9L, aStack), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); } - if (((OrePrefixes.block.isIgnored(aMaterial)) || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Basalt) && (aMaterial != Materials.Marble) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper)) { + // This is so disgustingly bad. + if (((OrePrefixes.block.isIgnored(aMaterial)) || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Basalt) && (aMaterial != Materials.Marble) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper) && (aMaterial != Materials.TranscendentMetal)) { GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 8599e839d5..a8a365109a 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.Map; +import static gregtech.api.GregTech_API.mGTPlusPlus; import static gregtech.api.enums.GT_Values.*; public class GT_MachineRecipeLoader implements Runnable { @@ -619,6 +620,17 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 64), ItemList.GalliumArsenideCrystal.get(4L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 4), GT_Utility.getIntegratedCircuit(3), Materials.Radon.getGas(16000), GT_Values.NF, ItemList.Circuit_Silicon_Ingot5.get(1), GT_Values.NI, GT_Values.NI, GT_Values.NI, 21000, 30720, 9000); GT_Values.RA.addCutterRecipe(new ItemStack[]{ItemList.Circuit_Silicon_Ingot5.get(1)}, new ItemStack[]{ItemList.Circuit_Silicon_Wafer5.get(64), ItemList.Circuit_Silicon_Wafer5.get(64), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64L)}, 3200, 7680, true); + // Energised tesseract + if (mGTPlusPlus) { + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack[]{ItemList.Tesseract.get(1), GT_Utility.copyAmount(0L, GT_ModHandler.getModItem("miscutils", "MU-metaitem.01:>", 1, 32105))}, + new FluidStack[]{GT_Values.NF}, + + new ItemStack[]{ItemList.EnergisedTesseract.get(1)}, + new FluidStack[]{Materials.ExcitedDTEC.getFluid(100L)}, + 30 * 20, 32_000_000, true + ); + } // ----------------------------------------------------------------------------------------------------------------------------- // Catalysts for Plasma Forge. @@ -3936,7 +3948,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addBlastRecipe(Materials.Galena.getDust(1), GT_Values.NI, Materials.Oxygen.getGas(3000), Materials.SulfurDioxide.getGas(1000), Materials.RoastedLead.getDust(1), Materials.Ash.getDustTiny(1), 120, 120, 1200); - if (GregTech_API.mGTPlusPlus) { + if (mGTPlusPlus) { GT_Values.RA.addBlastRecipe( Materials.TranscendentMetal.getDust(1), diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.transcendentmetal.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.transcendentmetal.png Binary files differnew file mode 100644 index 0000000000..ef8b07e15a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.transcendentmetal.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.transcendentmetal.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.transcendentmetal.png.mcmeta new file mode 100644 index 0000000000..0645f48c62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.transcendentmetal.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png Binary files differnew file mode 100644 index 0000000000..b58ded215f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png Binary files differnew file mode 100644 index 0000000000..a56a62ad1b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png Binary files differnew file mode 100644 index 0000000000..6de77b309b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png Binary files differnew file mode 100644 index 0000000000..e5f7b5e76f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png Binary files differnew file mode 100644 index 0000000000..4bb49067ed --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png Binary files differnew file mode 100644 index 0000000000..b58ded215f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png Binary files differnew file mode 100644 index 0000000000..2edad5a448 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png Binary files differnew file mode 100644 index 0000000000..d93c52c24c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png Binary files differnew file mode 100644 index 0000000000..935f66ff43 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png Binary files differnew file mode 100644 index 0000000000..0a7e9d6e9e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png Binary files differnew file mode 100644 index 0000000000..7985626666 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png Binary files differnew file mode 100644 index 0000000000..65529e2772 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png Binary files differnew file mode 100644 index 0000000000..06b3e0d189 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png Binary files differnew file mode 100644 index 0000000000..b33a1bac91 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png Binary files differnew file mode 100644 index 0000000000..343e8ff5b8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png Binary files differnew file mode 100644 index 0000000000..aec8883d6a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png Binary files differnew file mode 100644 index 0000000000..b5e620f045 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png Binary files differnew file mode 100644 index 0000000000..c1ef295198 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png Binary files differnew file mode 100644 index 0000000000..d83a131004 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png Binary files differnew file mode 100644 index 0000000000..455335e5c2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaForge.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaForge.png Binary files differindex 1171bc1fc6..762d9f370e 100644 --- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaForge.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaForge.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/417.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/417.png Binary files differnew file mode 100644 index 0000000000..1906d2a3c9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/417.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/417.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/417.png.mcmeta new file mode 100644 index 0000000000..cc8a1f3c96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/417.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}}
\ No newline at end of file |