diff --git a/dependencies.gradle b/dependencies.gradle index 964e90c3d..5018f5d95 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,28 +1,28 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.70:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.1:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.21:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.3:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.22:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") - compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } compileOnly("com.github.GTNewHorizons:amunra:0.8.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java index 64956252c..7d9bbb3ed 100644 --- a/src/main/java/com/dreammaster/gthandler/CustomItemList.java +++ b/src/main/java/com/dreammaster/gthandler/CustomItemList.java @@ -385,6 +385,9 @@ public enum CustomItemList implements IItemContainer { BioBall, PotassiumHydroxideDust, ChromaticLens, + ChromaticGem, + ChromaticGemFlawless, + ChromaticGemExquisite, RadoxPolymerLens, NanoCircuitOrigin, ChevronOrigin, diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java index 96ecf4e51..62c390dda 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java @@ -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()); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java index bc02614a7..ef07d229f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java @@ -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) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java index 403a43804..ffc412df5 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java @@ -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 { @@ -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 diff --git a/src/main/java/com/dreammaster/item/NHItemList.java b/src/main/java/com/dreammaster/item/NHItemList.java index bf95c2575..f868e6ad7 100644 --- a/src/main/java/com/dreammaster/item/NHItemList.java +++ b/src/main/java/com/dreammaster/item/NHItemList.java @@ -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)), diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index e4913edc9..ed83cea00 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -1813,7 +1813,6 @@ public static void run() { removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "painting", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "flint_and_steel", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "dragon_egg", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "map", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "wooden_door", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "iron_door", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "skull", 1, 1, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index 68ff65dd7..df82bd9b2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -7,8 +7,10 @@ import static gregtech.api.enums.Mods.IronTanks; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.RemoteIO; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes; @@ -29,10 +31,11 @@ import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; +import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.material.MaterialsAlloy; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry; public class ScriptGregtechPlusPlus implements IScriptLoader { @@ -95,11 +98,11 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( getModItem(EternalSingularity.ID, "combined_singularity", 1, 15, missing), - ItemList.EnergisedTesseract.get(1), - ItemUtils.getSimpleStack(GenericChem.TemporalHarmonyCatalyst, 0)) + ItemList.EnergisedTesseract.get(1)) .itemOutputs(GTOreDictUnificator.get("dustShirabon", 64), ItemList.Timepiece.get(1)) .fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(1152)) .fluidOutputs(MaterialsUEVplus.Eternity.getMolten(9216), MaterialsUEVplus.Time.getMolten(18432)) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.TemporalHarmonyCatalyst)) .metadata(QFT_FOCUS_TIER, 4).duration(20 * SECONDS).eut(TierEU.RECIPE_UMV) .addTo(quantumForceTransformerRecipes); addForestryRecipes(); @@ -107,6 +110,83 @@ public void loadRecipes() { @Optional.Method(modid = Mods.Names.FORESTRY) private void addForestryRecipes() { + + // Arborist Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.WoodSealed, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.WoodSealed, 4), + GTModHandler.getModItem(Minecraft.ID, "paper", 1, 0, missing), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameArborist)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Stabilization Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameStalilize)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Slowing Frame + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.TUMBAGA.getLongRod(4), + MaterialsAlloy.TUMBAGA.getRod(4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameSlow, 1, 0)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Decaying Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.WroughtIron, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameDecay)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + // Working Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(new ItemStack(FRItemRegistry.hiveFrameBusy)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Mutagenic Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium235, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Plutonium241, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameMutagenic)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Accelerated Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Electrum, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameAccelerated)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), new ItemStack(FRItemRegistry.hiveFrameVoid)); RecipeManagers.carpenterManager.addRecipe( 60, diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java index b79eeaddc..4499f5e72 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java @@ -979,14 +979,6 @@ public void loadRecipes() { "ingotIridium", null, null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - "craftingToolHardHammer", - null, - null, - GTOreDictUnificator.get(OrePrefixes.ingotDouble, Materials.Iridium, 1L), - null, - null); addShapedRecipe( createItemStack( diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index 6f6704c49..10a388510 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -4278,17 +4278,6 @@ private void craftingRecipes() { null, "craftingToolScrewdriver", null); - addShapedRecipe( - getModItem(Minecraft.ID, "map", 1, 0, missing), - "paperEmpty", - "paperEmpty", - "paperEmpty", - "paperEmpty", - getModItem(Minecraft.ID, "compass", 1, 0, missing), - "paperEmpty", - "paperEmpty", - "paperEmpty", - "paperEmpty"); addShapelessRecipe( getModItem(Minecraft.ID, "dye", 3, 15, missing), getModItem(Minecraft.ID, "bone", 1, 0, missing), diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang index 662fd5daf..9edcc9452 100644 --- a/src/main/resources/assets/dreamcraft/lang/en_US.lang +++ b/src/main/resources/assets/dreamcraft/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png new file mode 100644 index 000000000..bc8bc46fb Binary files /dev/null and b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png differ diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png new file mode 100644 index 000000000..c2ad65604 Binary files /dev/null and b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png differ diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png new file mode 100644 index 000000000..bd3a6c978 Binary files /dev/null and b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png differ