aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java3
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java15
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsUEVplus.java160
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java8
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java3
5 files changed, 187 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index a11bb7ea6e..74f169681c 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -2554,6 +2554,9 @@ public enum ItemList implements IItemContainer {
BetterJukebox_EV,
BetterJukebox_IV,
WirelessHeadphones,
+ Thermal_Superconductor,
+ Relativistic_Heat_Capacitor,
+ Phononic_Seed_Crystal,
ResearchCompleter, // Populated in EMT
SpaceElevatorController, // Populated in GTNH-Intergalactic
// semicolon after the comment to reduce merge conflicts
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 2dada8dfb0..3d314c4742 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -20,6 +20,7 @@ import javax.annotation.Nonnull;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -37,6 +38,7 @@ import gregtech.common.config.gregtech.ConfigHarvestLevel;
import gregtech.common.render.items.CosmicNeutroniumRenderer;
import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
import gregtech.common.render.items.GaiaSpiritRenderer;
+import gregtech.common.render.items.GlitchEffectRenderer;
import gregtech.common.render.items.InfinityRenderer;
import gregtech.common.render.items.TranscendentMetalRenderer;
import gregtech.common.render.items.UniversiumRenderer;
@@ -1976,6 +1978,17 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
MaterialsUEVplus.ExcitedDTSC.mChemicalFormula = "[-Stellar-Stellar-]";
MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.mChemicalFormula = "Stellar";
PolyAluminiumChloride.mChemicalFormula = "Al\u2082(OH)\u2083Cl\u2083";
+ MaterialsUEVplus.QuarkGluonPlasma.mChemicalFormula = EnumChatFormatting.OBFUSCATED + "X"
+ + EnumChatFormatting.RESET
+ + EnumChatFormatting.GRAY
+ + "g"
+ + EnumChatFormatting.OBFUSCATED
+ + "X";
+ MaterialsUEVplus.PhononCrystalSolution.mChemicalFormula = "\u3004";
+ MaterialsUEVplus.PhononMedium.mChemicalFormula = "((Si\u2085O\u2081\u2080Fe)\u2083(Bi\u2082Te\u2083)\u2084ZrO\u2082Fe\u2085\u2080C)\u2085Og*Pr\u2081\u2085((C\u2081\u2084Os\u2081\u2081O\u2087Ag\u2083SpH\u2082O)\u2084?\u2081\u2080(Fs\u26B6)\u2086(\u2318\u262F\u262F\u2318)\u2085)\u2086\u3004\u2084";
+ MaterialsUEVplus.SixPhasedCopper.mChemicalFormula = "\u2722";
+ MaterialsUEVplus.Mellion.mChemicalFormula = "Tn\u2081\u2081Or\u2088Rb\u2081\u2081?\u2087?\u2081\u2083?\u2081\u2083";
+ MaterialsUEVplus.Creon.mChemicalFormula = "\u2E0E";
}
private static void initSubTags() {
@@ -2516,6 +2529,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
MaterialsUEVplus.Universium.renderer = new UniversiumRenderer();
MaterialsUEVplus.Eternity.renderer = new InfinityRenderer();
MaterialsUEVplus.MagMatter.renderer = new InfinityRenderer();
+ MaterialsUEVplus.SixPhasedCopper.renderer = new GlitchEffectRenderer();
+ MaterialsUEVplus.GravitonShard.renderer = new InfinityRenderer();
}
private static void fillGeneratedMaterialsMap() {
diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
index 1ff8cc2fb0..7542e1f600 100644
--- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
+++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
@@ -590,6 +590,166 @@ public class MaterialsUEVplus {
1,
Dyes._NULL);
+ public static Materials PhononMedium = new Materials(
+ 145,
+ TextureSet.SET_FLUID,
+ 1.0F,
+ 0,
+ 2,
+ 16,
+ 255,
+ 255,
+ 255,
+ 0,
+ "PhononMedium",
+ "Lossless Phonon Transfer Medium",
+ -1,
+ -1,
+ 500,
+ 1,
+ false,
+ true,
+ 1,
+ 1,
+ 1,
+ Dyes._NULL);
+
+ public static Materials PhononCrystalSolution = new Materials(
+ 146,
+ TextureSet.SET_FLUID,
+ 1.0F,
+ 0,
+ 2,
+ 16,
+ 255,
+ 255,
+ 255,
+ 0,
+ "PhononCrystalSolution",
+ "Saturated Phononic Crystal Solution",
+ -1,
+ -1,
+ 500,
+ 1,
+ false,
+ true,
+ 1,
+ 1,
+ 1,
+ Dyes._NULL);
+
+ public static Materials SixPhasedCopper = new Materials(
+ 147,
+ TextureSet.SET_SHINY,
+ 1.0F,
+ 8 * 2621440,
+ 26,
+ 1 | 2 | 64 | 128,
+ 255,
+ 120,
+ 20,
+ 0,
+ "SixPhasedCopper",
+ "Six-Phased Copper",
+ -1,
+ -1,
+ 1000,
+ 14000,
+ true,
+ false,
+ 2,
+ 1,
+ 1,
+ Dyes._NULL,
+ Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1)))
+ .disableAutoGeneratedBlastFurnaceRecipes()
+ .disableAutoGeneratedVacuumFreezerRecipe()
+ .setProcessingMaterialTierEU(TierEU.RECIPE_UEV);
+
+ public static Materials Mellion = new Materials(
+ 148,
+ TextureSet.SET_SHINY,
+ 1.0F,
+ 8 * 2621440,
+ 26,
+ 1 | 2 | 64 | 128,
+ 60,
+ 5,
+ 5,
+ 0,
+ "Mellion",
+ "Mellion",
+ -1,
+ -1,
+ 1000,
+ 14000,
+ true,
+ false,
+ 2,
+ 1,
+ 1,
+ Dyes._NULL,
+ Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1)))
+ .disableAutoGeneratedBlastFurnaceRecipes()
+ .disableAutoGeneratedVacuumFreezerRecipe()
+ .setProcessingMaterialTierEU(TierEU.RECIPE_UEV);
+
+ public static Materials Creon = new Materials(
+ 149,
+ TextureSet.SET_SHINY,
+ 1.0F,
+ 8 * 2621440,
+ 26,
+ 1 | 2 | 64 | 128,
+ 70,
+ 0,
+ 70,
+ 0,
+ "Creon",
+ "Creon",
+ -1,
+ -1,
+ 1000,
+ 14000,
+ true,
+ false,
+ 2,
+ 1,
+ 1,
+ Dyes._NULL,
+ Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1)))
+ .disableAutoGeneratedBlastFurnaceRecipes()
+ .disableAutoGeneratedVacuumFreezerRecipe()
+ .setProcessingMaterialTierEU(TierEU.RECIPE_UEV)
+ .setHasCorrespondingPlasma(true);
+
+ public static Materials GravitonShard = new Materials(
+ 150,
+ new TextureSet("GravitonShard", true),
+ 1.0F,
+ 8 * 2621440,
+ 26,
+ 256,
+ 255,
+ 255,
+ 255,
+ 0,
+ "GravitonShard",
+ "Graviton Shard",
+ -1,
+ -1,
+ 100000,
+ 100000,
+ false,
+ false,
+ 2,
+ 1,
+ 1,
+ Dyes._NULL,
+ Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 150)))
+ .disableAutoGeneratedBlastFurnaceRecipes()
+ .disableAutoGeneratedVacuumFreezerRecipe();
+
/**
* called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is
* initialized
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index d0c9399980..8e80f41a05 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -701,6 +701,8 @@ public enum OrePrefixes {
dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
+ cell.disableComponent(MaterialsUEVplus.GravitonShard);
+
// ingot.mNotGeneratedItems.add(Materials.Ichorium);
nugget.mNotGeneratedItems.add(Materials.Gold);
plate.mNotGeneratedItems.add(Materials.Paper);
@@ -780,6 +782,7 @@ public enum OrePrefixes {
nanite.mGeneratedItems.add(MaterialsUEVplus.BlackDwarfMatter);
nanite.mGeneratedItems.add(Materials.Glowstone);
nanite.mGeneratedItems.add(MaterialsUEVplus.Eternity);
+ nanite.mGeneratedItems.add(MaterialsUEVplus.SixPhasedCopper);
// -----
gear.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
@@ -788,6 +791,8 @@ public enum OrePrefixes {
frame.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
frameGt.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
+ gem.mGeneratedItems.add(MaterialsUEVplus.GravitonShard);
+
dust.mGeneratedItems.addAll(dustPure.mGeneratedItems);
dust.mGeneratedItems.addAll(dustImpure.mGeneratedItems);
dust.mGeneratedItems.addAll(dustRefined.mGeneratedItems);
@@ -1001,7 +1006,8 @@ public enum OrePrefixes {
OrePrefixes.gemExquisite,
OrePrefixes.gearGt,
OrePrefixes.itemCasing,
- OrePrefixes.nanite));
+ OrePrefixes.nanite,
+ OrePrefixes.cell));
/**
* Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check.
*/
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 4a5142138a..7caa8f41e5 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -1161,6 +1161,7 @@ public class Textures {
BLOCK_UNIVERSIUM,
BLOCK_ETERNITY,
BLOCK_MAGMATTER,
+ BLOCK_SIXPHASEDCOPPER,
BLOCK_ORIHARUKON,
@@ -1573,7 +1574,7 @@ public class Textures {
BLOCK_BLAZE },
STORAGE_BLOCKS12 = { BLOCK_CRYOLITE, BLOCK_SILICONSG, BLOCK_NICKELALUMINIUM, BLOCK_SPACETIME,
BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, BLOCK_BLACKDWARFMATTER,
- BLOCK_UNIVERSIUM, BLOCK_ETERNITY, BLOCK_MAGMATTER };
+ BLOCK_UNIVERSIUM, BLOCK_ETERNITY, BLOCK_MAGMATTER, BLOCK_SIXPHASEDCOPPER };
public static final ITexture[] HIDDEN_TEXTURE = { TextureFactory.builder()
.addIcon(HIDDEN_FACE)
generated by cgit (git 2.46.0) at 2025-06-04 04:11:50 +0000