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

Add Chromatic Glass Crystal #1149

Merged
merged 4 commits into from
Jan 15, 2025
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
3 changes: 3 additions & 0 deletions src/main/java/com/dreammaster/gthandler/CustomItemList.java
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,9 @@ public enum CustomItemList implements IItemContainer {
BioBall,
PotassiumHydroxideDust,
ChromaticLens,
ChromaticGem,
ChromaticGemFlawless,
ChromaticGemExquisite,
RadoxPolymerLens,
NanoCircuitOrigin,
ChevronOrigin,
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,9 @@ private void registerItems() {
CustomItemList.PotassiumHydroxideDust.set(NHItemList.PotassiumHydroxideDust.getIS());
CustomItemList.RadoxPolymerLens.set(NHItemList.RadoxPolymerLens.getIS());
CustomItemList.ChromaticLens.set(NHItemList.ChromaticLens.getIS());
CustomItemList.ChromaticGem.set(NHItemList.ChromaticGem.getIS());
CustomItemList.ChromaticGemFlawless.set(NHItemList.ChromaticGemFlawless.getIS());
CustomItemList.ChromaticGemExquisite.set(NHItemList.ChromaticGemExquisite.getIS());
CustomItemList.NanoCircuitOrigin.set(NHItemList.NanoCircuitOrigin.getIS());
CustomItemList.ChevronOrigin.set(NHItemList.ChevronOrigin.getIS());
CustomItemList.FramePartOrigin.set(NHItemList.FramePartOrigin.getIS());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ public void run() {
.itemOutputs(ItemList.GalliumArsenideCrystalSmallPart.get(4L)).duration(2 * SECONDS + 10 * TICKS).eut(4)
.addTo(hammerRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemExquisite.get(1))
.itemOutputs(CustomItemList.ChromaticGemFlawless.get(2)).duration(2 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(hammerRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemFlawless.get(1))
.itemOutputs(CustomItemList.ChromaticGem.get(2)).duration(2 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(hammerRecipes);

if (TinkerConstruct.isModLoaded()) {
GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "Smeltery", 1L, 2))
.itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 3L, 2)).duration(1 * SECONDS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gtPlusPlus.core.material.MaterialsElements;

public class MaceratorRecipes implements Runnable {

Expand Down Expand Up @@ -92,6 +93,18 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L))
.outputChances(10000, 2500, 2000, 1500).duration(10 * SECONDS).eut(8).addTo(maceratorRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemExquisite.get(1))
.itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(8)).duration(16 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(maceratorRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemFlawless.get(1))
.itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(4)).duration(8 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(maceratorRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGem.get(1))
.itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(2)).duration(4 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(maceratorRecipes);

if (OpenPrinters.isModLoaded()) {

// Open Printers
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/dreammaster/item/NHItemList.java
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,9 @@ public enum NHItemList {
CircuitMAX(new ModSimpleBaseItem("CircuitMAX", ModTabList.ModCircuitsTab)),
RadoxPolymerLens(new ModSimpleBaseItem("RadoxPolymerLens", ModTabList.ModSpaceTab)),
ChromaticLens(new ModSimpleBaseItem("ChromaticLens", ModTabList.ModSpaceTab)),
ChromaticGem(new ModSimpleBaseItem("ChromaticGem", ModTabList.ModSpaceTab)),
ChromaticGemFlawless(new ModSimpleBaseItem("ChromaticGemFlawless", ModTabList.ModSpaceTab)),
ChromaticGemExquisite(new ModSimpleBaseItem("ChromaticGemExquisite", ModTabList.ModSpaceTab)),
NanoCircuitOrigin(new ModSimpleBaseItem("OriginNanoCircuit", ModTabList.ModSpaceTab)),
GatePlateOrigin(new ModSimpleBaseItem("OriginGatePlate", ModTabList.ModSpaceTab)),
ChevronOrigin(new ModSimpleBaseItem("OriginChevron", ModTabList.ModSpaceTab)),
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/dreamcraft/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,9 @@ item.CircuitUXV.name=Any UXV Circuit
item.CircuitMAX.name=Any MAX Circuit
item.RadoxPolymerLens.name=Radox Polymer Lens
item.ChromaticLens.name=Chromatic Lens
item.ChromaticGem.name=Chromatic Crystal
item.ChromaticGemFlawless.name=Flawless Chromatic Crystal
item.ChromaticGemExquisite.name=Exquisite Chromatic Crystal
item.Origin.tooltip=The first conquering
item.Origin.version=(2.1.0.0)
item.OriginNanoCircuit.name=Nano Circuit of Split Origin
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading