diff options
Diffstat (limited to 'src/main/java/gregtech/api')
4 files changed, 22 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java index 1fc32cd413..7c14ff2f14 100644 --- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java +++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java @@ -644,7 +644,7 @@ public class MaterialsUEVplus { 1.0F, 8 * 2621440, 26, - 1 | 2 | 64 | 128, + 1 | 2 | 32 | 64 | 128, 255, 120, 20, @@ -664,7 +664,8 @@ public class MaterialsUEVplus { Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ITER, 1))) .disableAutoGeneratedBlastFurnaceRecipes() .disableAutoGeneratedVacuumFreezerRecipe() - .setProcessingMaterialTierEU(TierEU.RECIPE_UEV); + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .setHasCorrespondingPlasma(true); public static Materials Mellion = new Materials( 148, @@ -888,6 +889,17 @@ public class MaterialsUEVplus { 1, Dyes._NULL); + public static Materials StargateCrystalSlurry = new MaterialBuilder( + 160, + new TextureSet("sgcrystalfluid", true), + "Stargate Crystal Slurry").setName("sgcrystalslurry") + .addFluid() + .addCell() + .setRGBA(255, 255, 255, 0) + .setTransparent(false) + .constructMaterial() + .setProcessingMaterialTierEU(TierEU.RECIPE_MAX); + /** * 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 7af17351b9..003624007f 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -693,7 +693,6 @@ public enum OrePrefixes { plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - plateSuperdense.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); cell.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); @@ -860,6 +859,7 @@ public enum OrePrefixes { nanite.mGeneratedItems.add(Materials.Glowstone); nanite.mGeneratedItems.add(MaterialsUEVplus.Eternity); nanite.mGeneratedItems.add(MaterialsUEVplus.SixPhasedCopper); + nanite.mGeneratedItems.add(MaterialsUEVplus.MagMatter); // ----- gear.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); diff --git a/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java b/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java index 7a4036e7ba..0e8a3e49fa 100644 --- a/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java +++ b/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java @@ -1,5 +1,6 @@ package gregtech.api.recipe.maps; +import static gregtech.api.util.GTRecipeConstants.EU_MULTIPLIER; import static gregtech.api.util.GTUtility.formatNumbers; import java.util.List; @@ -44,12 +45,13 @@ public class TranscendentPlasmaMixerFrontend extends RecipeMapFrontend { protected void drawEnergyInfo(RecipeDisplayInfo recipeInfo) { // These look odd because recipeInfo.recipe.mEUt is actually the EU per litre of fluid processed, not // the EU/t. + long multiplier = recipeInfo.recipe.getMetadataOrDefault(EU_MULTIPLIER, 10); recipeInfo.drawText( GTUtility.trans("152", "Total: ") - + formatNumbers(1000L * recipeInfo.recipe.mDuration / 100L * recipeInfo.recipe.mEUt) + + formatNumbers(multiplier * recipeInfo.recipe.mDuration * recipeInfo.recipe.mEUt) + " EU"); // 1000 / (20 ticks * 5 seconds) = 10L/t. 10L/t * x EU/L = 10 * x EU/t. - long averageUsage = 10L * recipeInfo.recipe.mEUt; + long averageUsage = multiplier * recipeInfo.recipe.mEUt; recipeInfo.drawText( "Average: " + formatNumbers(averageUsage) + " EU/t" + GTUtility.getTierNameWithParentheses(averageUsage)); } diff --git a/src/main/java/gregtech/api/util/GTRecipeConstants.java b/src/main/java/gregtech/api/util/GTRecipeConstants.java index 82a477756a..98be4718a0 100644 --- a/src/main/java/gregtech/api/util/GTRecipeConstants.java +++ b/src/main/java/gregtech/api/util/GTRecipeConstants.java @@ -216,6 +216,9 @@ public class GTRecipeConstants { public static final RecipeMetadataKey<Boolean> NO_GAS = SimpleRecipeMetadataKey.create(Boolean.class, "no_gas"); + public static final RecipeMetadataKey<Integer> EU_MULTIPLIER = SimpleRecipeMetadataKey + .create(Integer.class, "eu_multiplier"); + /** * Add a arc furnace recipe. Adds to both normal arc furnace and plasma arc furnace. * Will override the fluid input with oxygen/plasma for the respective recipe maps, so there is no point setting it. |