diff options
| author | Martin Robertz <dream-master@gmx.net> | 2023-02-12 14:19:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-12 14:19:21 +0100 |
| commit | 8d05d21684467424c0d21fce1df0ac45064333aa (patch) | |
| tree | d2795ada06ffe19582a1a1a4bcec2d87d73910e7 | |
| parent | 3fe689f805dcff42d5768bbcaa0fff26e0499745 (diff) | |
| parent | cb45cf8da9ba6dc2bf92c03705db15bb29033073 (diff) | |
| download | GT5-Unofficial-8d05d21684467424c0d21fce1df0ac45064333aa.tar.gz GT5-Unofficial-8d05d21684467424c0d21fce1df0ac45064333aa.tar.bz2 GT5-Unofficial-8d05d21684467424c0d21fce1df0ac45064333aa.zip | |
Merge pull request #151 from GTNewHorizons/FixEOH
Fix EOH Recipe
| -rw-r--r-- | dependencies.gradle | 6 | ||||
| -rw-r--r-- | repositories.gradle | 5 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 9 |
3 files changed, 12 insertions, 8 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 284dbae9e0..fe620f19c1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,9 +12,9 @@ dependencies { compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compile('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.26:dev') - // todo To remove, for testing only. - compile('com.github.GTNewHorizons:ExtraCells2:2.5.31:dev') - compile('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.0.60-gtnh:dev') + compileOnly("com.github.GTNewHorizons:TinkersGregworks:master-SNAPSHOT:dev") { + transitive = false + } compileOnly('com.github.GTNewHorizons:OpenModularTurrets:2.2.11-247:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.9-GTNH:dev') {transitive=false} diff --git a/repositories.gradle b/repositories.gradle index f1347fd90f..e1d2ecc2fb 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -34,4 +34,9 @@ repositories { includeGroup 'curse.maven' } } + + maven { + url = "https://jitpack.io" + mavenContent { includeGroup "com.github.GTNewHorizons" } + } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index c889c6626a..ee7e902f46 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -8,11 +8,13 @@ import java.lang.reflect.Method; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import vexatos.tgregworks.reference.PartTypes; +import vexatos.tgregworks.util.TGregUtils; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import com.github.technus.tectech.recipe.TT_recipeAdder; @@ -5020,10 +5022,7 @@ public class DreamCraftRecipeLoader { ? FluidRegistry.getFluid("molten.mutatedlivingsolder") : FluidRegistry.getFluid("molten.solderingalloy"); - ItemStack largeShirabonPlate = getModItem("TGregworks", "tGregToolPartLargePlate", 1, 1735); - NBTTagCompound tag = new NBTTagCompound(); - tag.setString("material", "Shirabon"); - largeShirabonPlate.stackTagCompound = tag; + ItemStack largeShirabonPlate = TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1); final FluidStack[] specialFluid = new FluidStack[] { FluidUtils.getFluidStack("molten.shirabon", 1_440), Materials.WhiteDwarfMatter.getMolten(1_440), Materials.WhiteDwarfMatter.getMolten(1_440 * 4), |