aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaya <10861407+serenibyss@users.noreply.github.com>2024-09-06 02:16:54 -0500
committerGitHub <noreply@github.com>2024-09-06 02:16:54 -0500
commit1d464dce567a61fa85b667199c432da02fa81545 (patch)
treeaa7daafa1142f58b340c55706b32db6b87f2652b /src
parenta710669b398402316e62d5f50143171ad7c92e90 (diff)
downloadGT5-Unofficial-1d464dce567a61fa85b667199c432da02fa81545.tar.gz
GT5-Unofficial-1d464dce567a61fa85b667199c432da02fa81545.tar.bz2
GT5-Unofficial-1d464dce567a61fa85b667199c432da02fa81545.zip
Halkonite/Superdense Plate fixes (#3081)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java6
-rw-r--r--src/main/java/gregtech/common/items/MetaGeneratedItem01.java1
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java1
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java20
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense.png.mcmeta2
6 files changed, 29 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 9949a61cfd..177dc4f589 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -2276,6 +2276,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
TengamAttuned,
MaterialsUEVplus.Eternity,
MaterialsUEVplus.MagMatter,
+ MaterialsUEVplus.Creon,
+ MaterialsUEVplus.Mellion,
MaterialsUEVplus.HotProtoHalkonite,
MaterialsUEVplus.ProtoHalkonite,
MaterialsUEVplus.HotExoHalkonite,
@@ -2546,6 +2548,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
OrePrefixes.ingotHot.disableComponent(Materials.EnergeticAlloy);
OrePrefixes.ingotHot.disableComponent(Materials.PulsatingIron);
OrePrefixes.ingotHot.disableComponent(Materials.CrudeSteel);
+ OrePrefixes.ingotHot.disableComponent(MaterialsUEVplus.HotProtoHalkonite);
+ OrePrefixes.ingotHot.disableComponent(MaterialsUEVplus.ProtoHalkonite);
+ OrePrefixes.ingotHot.disableComponent(MaterialsUEVplus.HotExoHalkonite);
+ OrePrefixes.ingotHot.disableComponent(MaterialsUEVplus.ExoHalkonite);
}
/**
diff --git a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
index b17ad3e32e..ab9917435c 100644
--- a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
@@ -584,7 +584,6 @@ public class MetaGeneratedItem01 extends MetaGeneratedItemX32 {
OrePrefixes.plateQuadruple,
OrePrefixes.plateQuintuple,
OrePrefixes.plateDense,
- OrePrefixes.plateSuperdense,
OrePrefixes.stick,
OrePrefixes.lens,
OrePrefixes.round,
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
index 1b889f2f37..ee5e1d8316 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
@@ -421,6 +421,7 @@ public class ChemicalBathRecipes implements Runnable {
this.addProtoHalkonitePartRecipe(OrePrefixes.frameGt, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.ingot, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.plate, 1);
+ this.addProtoHalkonitePartRecipe(OrePrefixes.plateDouble, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.plateDense, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.stick, 2);
this.addProtoHalkonitePartRecipe(OrePrefixes.round, 8);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
index 8f6ba3729d..67719803d5 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
@@ -277,6 +277,26 @@ public class CompressorRecipes implements Runnable {
.addTo(compressorRecipes);
GTValues.RA.stdBuilder()
+ .itemInputs(GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Creon, 1))
+ .fluidInputs(MaterialsUEVplus.MoltenProtoHalkoniteBase.getFluid(32 * 144))
+ .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.HotProtoHalkonite, 1))
+ // Require stabilized black hole
+ .metadata(CompressionTierKey.INSTANCE, 2)
+ .duration(45 * SECONDS / 4)
+ .eut(TierEU.RECIPE_UIV)
+ .addTo(compressorRecipes);
+
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Mellion, 1))
+ .fluidInputs(MaterialsUEVplus.MoltenProtoHalkoniteBase.getFluid(32 * 144))
+ .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.HotProtoHalkonite, 1))
+ // Require stabilized black hole
+ .metadata(CompressionTierKey.INSTANCE, 2)
+ .duration(45 * SECONDS / 4)
+ .eut(TierEU.RECIPE_UIV)
+ .addTo(compressorRecipes);
+
+ GTValues.RA.stdBuilder()
.itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.gem, 9))
.itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.block, 1))
.duration(15 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
index 89a1aefa89..813897b3cd 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
@@ -415,6 +415,7 @@ public class VacuumFreezerRecipes implements Runnable {
this.addProtoHalkonitePartRecipe(OrePrefixes.frameGt, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.ingot, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.plate, 1);
+ this.addProtoHalkonitePartRecipe(OrePrefixes.plateDouble, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.plateDense, 1);
this.addProtoHalkonitePartRecipe(OrePrefixes.stick, 2);
this.addProtoHalkonitePartRecipe(OrePrefixes.round, 8);
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense.png.mcmeta
index 0936e9caba..6575dfcc65 100644
--- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense.png.mcmeta
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense.png.mcmeta
@@ -1 +1 @@
-{ "animation": { "interpolate": false, "frametime": 1 } } \ No newline at end of file
+{"animation": {"frametime": 3}}