Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.7 Stargate #980

Merged
merged 18 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,6 @@ public void loadConfig() {
API.hideItem(GTModHandler.getModItem(Natura.ID, "barleyFood", 1, 8, missing));
}

if (SGCraft.isModLoaded()) {
API.hideItem(GTModHandler.getModItem(SGCraft.ID, "sgControllerCrystal", 1, 0, missing));
}

if (EnderIO.isModLoaded()) {
ItemStack creativeBank = GTModHandler.getModItem(EnderIO.ID, "blockCapBank", 1, 0, missing);
creativeBank.setTagInfo("type", new NBTTagString("CREATIVE"));
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/dreammaster/gthandler/CustomItemList.java
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,12 @@ public enum CustomItemList implements IItemContainer {
QuantumCircuitDimensional,
GatePlateDimensional,
ChevronDimensional,
FramePartDimensional;
FramePartDimensional,
GatePlateHarmonic,
ChevronHarmonic,
FramePartHarmonic,
StargateDustAncients,
StargateCrystalAncients;

private ItemStack mStack;
private boolean mHasNotBeenSet = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void run() {
GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { "PSP", "SwS", "PSP", 'P',
OrePrefixes.plate.get(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter), 'S',
GTOreDictUnificator.get("plateShirabon", 1) });
OrePrefixes.plate.get(MaterialsUEVplus.MagMatter) });

// Mine and Blade Battlegear remove recipes NBT?
Object[] o = new Object[0];
Expand Down
22 changes: 21 additions & 1 deletion src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,11 @@ private void registerItems() {
CustomItemList.GatePlateDimensional.set(ItemList.GatePlateDimensional.getIS());
CustomItemList.ChevronDimensional.set(ItemList.ChevronDimensional.getIS());
CustomItemList.FramePartDimensional.set(ItemList.FramePartDimensional.getIS());
CustomItemList.GatePlateHarmonic.set(ItemList.GatePlateHarmonic.getIS());
CustomItemList.ChevronHarmonic.set(ItemList.ChevronHarmonic.getIS());
CustomItemList.FramePartHarmonic.set(ItemList.FramePartHarmonic.getIS());
CustomItemList.StargateDustAncients.set(ItemList.StargateDustAncients.getIS());
CustomItemList.StargateCrystalAncients.set(ItemList.StargateCrystalAncients.getIS());
}

private void registerTooltips() {
Expand All @@ -457,7 +462,9 @@ private void registerTooltips() {
ItemList.ChevronOrigin.getIS(),
ItemList.FramePartOrigin.getIS(),
ItemList.GatePlateOrigin.getIS(),
ItemList.NanoCircuitOrigin.getIS());
ItemList.NanoCircuitOrigin.getIS(),
ItemList.StargateDustAncients.getIS(),
ItemList.StargateCrystalAncients.getIS());
List<ItemStack> polychrome = Arrays.asList(
ItemList.PikoCircuitPolychrome.getIS(),
ItemList.QuantumCircuitPolychrome.getIS(),
Expand All @@ -470,6 +477,10 @@ private void registerTooltips() {
ItemList.GatePlateDimensional.getIS(),
ItemList.ChevronDimensional.getIS(),
ItemList.FramePartDimensional.getIS());
List<ItemStack> harmonic = Arrays.asList(
ItemList.GatePlateHarmonic.getIS(),
ItemList.ChevronHarmonic.getIS(),
ItemList.FramePartHarmonic.getIS());
for (ItemStack itemStack : origin) {
addItemTooltip(
itemStack,
Expand Down Expand Up @@ -500,5 +511,14 @@ private void registerTooltips() {
+ StatCollector.translateToLocal("item.Dimensional.version"));
}

for (ItemStack itemStack : harmonic) {
addItemTooltip(
itemStack,
() -> EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("item.Harmonic.tooltip")
+ EnumChatFormatting.RESET
+ EnumChatFormatting.BLUE
+ " "
+ StatCollector.translateToLocal("item.Harmonic.version"));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ public void run() {
GTValues.RA.stdBuilder().itemInputs(
GTOreDictUnificator
.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 4L),
GTOreDictUnificator.get("plateShirabon", 4),
GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 4L),
GTUtility.getIntegratedCircuit(8)).itemOutputs(CustomItemList.Casing_UXV.get(1L))
.duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

import appeng.api.AEApi;
import bartworks.common.loaders.ItemRegistry;
import bartworks.system.material.WerkstoffLoader;
import goodgenerator.items.GGMaterial;
import goodgenerator.util.ItemRefer;
import gregtech.api.GregTechAPI;
Expand Down Expand Up @@ -877,6 +878,104 @@ public void run() {
com.dreammaster.item.ItemList.FramePartDimensional.getIS(1),
1 * HOURS,
(int) TierEU.RECIPE_UXV);

// EOH Gate
TTRecipeAdder.addResearchableAssemblylineRecipe(
com.dreammaster.item.ItemList.GatePlateDimensional.getIS(1),
(int) TierEU.RECIPE_MAX,
32768,
(int) TierEU.RECIPE_UXV,
64,
new ItemStack[] { ItemList.Casing_Dim_Bridge.get(64),
tectech.thing.CustomItemList.StabilisationFieldGeneratorTier8.get(64),
GTOreDictUnificator.get("blockShirabon", 64L),
GTOreDictUnificator.get("blockShirabon", 64L),
GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.SpaceTime, 64L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 16L),
GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8L),
GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Universium, 8L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L),
GTOreDictUnificator.get("plateDenseShirabon", 8L), ItemList.Sensor_UXV.get(16L),
ItemList.Emitter_UXV.get(16L),
getModItem(EternalSingularity.ID, "eternal_singularity", 16L),
MaterialsUEVplus.Universium.getNanite(16), MaterialsUEVplus.BlackDwarfMatter.getNanite(16),
MaterialsUEVplus.WhiteDwarfMatter.getNanite(16) },
new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
Materials.SuperconductorUMVBase.getMolten(4 * 36864L),
MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
com.dreammaster.item.ItemList.GatePlateHarmonic.getIS(1),
125_000 * SECONDS,
(int) TierEU.RECIPE_UMV);

TTRecipeAdder.addResearchableAssemblylineRecipe(
com.dreammaster.item.ItemList.ChevronDimensional.getIS(1),
(int) TierEU.RECIPE_MAX,
32_768,
(int) TierEU.RECIPE_UXV,
64,
new ItemStack[] {
GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.TranscendentMetal, 64L),
GTOreDictUnificator.get("blockShirabon", 64),
tectech.thing.CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
tectech.thing.CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 16L),
GTOreDictUnificator.get(
OrePrefixes.frameGt,
MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
16L),
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L),
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L),
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Opal, 16L),
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 16L),
GTOreDictUnificator.get(
OrePrefixes.plateDense,
MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
8L),
GTOreDictUnificator.get("plateDenseShirabon", 8), ItemList.Electric_Motor_UXV.get(64L),
ItemList.Electric_Piston_UXV.get(64L), ItemList.Field_Generator_UXV.get(16L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1L).splitStack(32) },
new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(36864L),
MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
com.dreammaster.item.ItemList.ChevronHarmonic.getIS(1),
125_000 * SECONDS,
(int) TierEU.RECIPE_UMV);

TTRecipeAdder.addResearchableAssemblylineRecipe(
com.dreammaster.item.ItemList.FramePartDimensional.getIS(1),
(int) TierEU.RECIPE_MAX,
32_768,
(int) TierEU.RECIPE_UXV,
64,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L),
GTOreDictUnificator.get(
OrePrefixes.stickLong,
MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
64L),
GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L),

GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L),
GTOreDictUnificator.get("stickLongShirabon", 64),
new ItemStack(WerkstoffLoader.items.get(OrePrefixes.stickLong), 64, 39),
MaterialsAlloy.QUANTUM.getLongRod(64), MaterialsElements.STANDALONE.HYPOGEN.getLongRod(64),
MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(64),
new ItemStack(WerkstoffLoader.items.get(OrePrefixes.stickLong), 64, 10106),
MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getLongRod(64),

GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L),
GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Universium, 64L),
MaterialsAlloy.ABYSSAL.getLongRod(64),
GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 64L), },
new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
MaterialsUEVplus.Universium.getMolten(4 * 36864L),
MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
com.dreammaster.item.ItemList.FramePartHarmonic.getIS(1),
125_000 * SECONDS,
(int) TierEU.RECIPE_UMV);
}

GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Input_Bus_ME_Advanced.get(1L))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,9 @@ public static void spaceRecipes() {
.fluidInputs(Materials.UUMatter.getFluid(250L)).requiresCleanRoom().requiresLowGravity()
.duration(10 * MINUTES).eut(TierEU.RECIPE_EV).addTo(autoclaveRecipes);

if (SGCraft.isModLoaded()) {

GTValues.RA.stdBuilder()
.itemInputs(com.dreammaster.item.ItemList.StargateCrystalDust.getIS().splitStack(64))
.itemOutputs(GTModHandler.getModItem(SGCraft.ID, "sgCoreCrystal", 1L)).outputChances(10000)
.fluidInputs(Materials.Silver.getPlasma(8000L)).requiresCleanRoom().requiresLowGravity()
.duration(3 * MINUTES).eut(TierEU.RECIPE_ZPM).addTo(autoclaveRecipes);

}

GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.StargateDustAncients.getIS().splitStack(64))
.itemOutputs(com.dreammaster.item.ItemList.StargateCrystalAncients.getIS()).outputChances(10000)
.fluidInputs(Materials.Silver.getPlasma(8000L)).requiresCleanRoom().requiresLowGravity()
.duration(3 * MINUTES).eut(TierEU.RECIPE_ZPM).addTo(autoclaveRecipes);
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.dreammaster.gthandler.recipes;

import static gregtech.api.enums.Mods.EnderIO;
import static gregtech.api.enums.Mods.SGCraft;
import static gregtech.api.enums.Mods.TinkerConstruct;
import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
import static gregtech.api.util.GTRecipeBuilder.HOURS;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
Expand All @@ -16,6 +18,7 @@
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
Expand Down Expand Up @@ -1617,5 +1620,22 @@ public void run() {
.eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1000).addTo(blastFurnaceRecipes);

}

if (SGCraft.isModLoaded()) {

GTValues.RA.stdBuilder()
.itemInputs(com.dreammaster.item.ItemList.StargateCrystalDust.getIS().splitStack(64))
.fluidInputs(MaterialsUEVplus.StargateCrystalSlurry.getFluid(128_000_000L))
.itemOutputs(GTModHandler.getModItem(SGCraft.ID, "sgCoreCrystal", 1L)).duration(7 * 24 * HOURS * 2)
.eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 100_000).addTo(blastFurnaceRecipes); // ^ 2 weeks

GTValues.RA.stdBuilder()
.itemInputs(com.dreammaster.item.ItemList.StargateCrystalDust.getIS().splitStack(64))
.fluidInputs(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(128_000_000L))
.itemOutputs(GTModHandler.getModItem(SGCraft.ID, "sgControllerCrystal", 1L))
.duration(7 * 24 * HOURS * 2).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 100_000)
.addTo(blastFurnaceRecipes);

}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ public void run() {
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.TranscendentMetal, 16),
GTModHandler.getModItem(Avaritia.ID, "Resource", 32L, 8),
GTModHandler.getModItem(Avaritia.ID, "Resource", 16L, 8),
GTUtility.copyAmount(0, Particle.getBaseParticle(Particle.HIGGS_BOSON)))
.fluidInputs(
MaterialsUEVplus.ExcitedDTEC.getFluid(1797693L),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void run() {
if (GalacticraftAmunRa.isModLoaded()) {
GTValues.RA.stdBuilder()
.itemInputs(GTModHandler.getModItem(GalacticraftAmunRa.ID, "tile.baseBlockRock", 1L, 14))
.itemOutputs(GTModHandler.getModItem(GalacticraftAmunRa.ID, "item.baseItem", 8L, 26))
.itemOutputs(GTModHandler.getModItem(GalacticraftAmunRa.ID, "item.baseItem", 64L, 26))
.duration(15 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(extractorRecipes);
}

Expand Down
Loading