From e0b781208b8601c16d08178c9d76c1db8f69ff5e Mon Sep 17 00:00:00 2001 From: basdxz Date: Thu, 28 Nov 2019 04:58:15 -0500 Subject: Dependency rework bois (#21) Moves most dependencies to load from maven repos, makes setting a new env up not an absolute nightmare. --- .gitignore | 2 +- build.gradle | 58 ++++++++++++++++----- build.properties | 15 ++++-- libs/ComputerCraft1.75.jar | Bin 1397415 -> 0 bytes libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar | Bin 506974 -> 0 bytes libs/OpenComputers-MC1.7.10-1.6.2.12-api.jar | Bin 268275 -> 0 bytes ...OpenComputers-MC1.7.10-1.7.4.1265-universal.jar | Bin 14990149 -> 0 bytes libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar | Bin 689285 -> 0 bytes libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar | Bin 1109820 -> 0 bytes libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jar | Bin 12573303 -> 0 bytes libs/forestry_1.7.10-4.2.10.58-api.jar | Bin 284651 -> 0 bytes 11 files changed, 56 insertions(+), 19 deletions(-) delete mode 100644 libs/ComputerCraft1.75.jar delete mode 100644 libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar delete mode 100644 libs/OpenComputers-MC1.7.10-1.6.2.12-api.jar delete mode 100644 libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar delete mode 100644 libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar delete mode 100644 libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar delete mode 100644 libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jar delete mode 100644 libs/forestry_1.7.10-4.2.10.58-api.jar diff --git a/.gitignore b/.gitignore index 2b05b0c5ea..e97facd823 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ eclipse/ .project bin/ out/ -libs/ +libs/gregtech* CREDITS-fml.txt LICENSE-fml.txt MinecraftForge-Credits.txt diff --git a/build.gradle b/build.gradle index be661517e1..a1e77b8b0e 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ group = "com.github.technus" archivesBaseName = "TecTech" minecraft { - version = "${config.forge.version}" + version = "${config.minecraft.version}-${config.forge.version}-${config.minecraft.version}" runDir = "eclipse" replaceIn "src/main/java/com/github/technus/tectech/auxiliary/Reference.java" @@ -64,34 +64,64 @@ configurations { } repositories { - maven { - name 'UsrvDE' + maven { //Computercraft + name = "GregTech maven" + url = "https://gregtech.overminddl1.com/" + } + maven { //YAMCore + name 'UsrvDE maven' url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/" } - maven { - name = "ic2" + maven { //IC2 + name = "IC2 maven" url = "http://maven.ic2.player.to/" } - - ivy { + maven { //NEI, chicken core and lib + name = "Chickenbones maven" + url = "http://chickenbones.net/maven/" + } + maven { // Baubles and Thaumcraft + name 'MC Mod Dev maven' + url 'https://maven.mcmoddev.com/' + } + maven { // OpenComputers + name "OpenComputers maven" + url "http://maven.cil.li/" + } + maven { // EnderIO + name "Tterrag maven" + url "https://maven.tterrag.com/" + } + ivy { //CoFHCore name 'gtnh_download_source' artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]" } - - maven { - name = "chickenbones" - url = "http://chickenbones.net/maven/" - } } dependencies { compile "eu.usrv:YAMCore:${config.minecraft.version}-${config.yamcore.version}:deobf" compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" - //provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' - provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' + compile "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:api" compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" + compile "com.azanor:Baubles:${config.minecraft.version}-${config.baubles.version}" + compile "com.azanor:Thaumcraft:${config.minecraft.version}-${config.thaumcraft.version}:deobf" + compile "li.cil.oc:OpenComputers:MC${config.minecraft.version}-${config.opencomputers.version}:dev" + compile "com.enderio.core:EnderCore:${config.minecraft.version}-${config.endercore.version}" + compile ("com.enderio:EnderIO:${config.minecraft.version}-${config.enderio.version}"){ + exclude module: 'Waila' + exclude module: 'EnderCore' + } + compile "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}" + //Greg + compile "dan200.computercraft:ComputerCraft:${config.computercraft.version}" + compile "micdoodle8.mods:MicdoodleCore:${config.galacticraft.version}:Dev" + compile "micdoodle8.mods:GalacticraftCore:${config.galacticraft.version}:Dev" + compile "micdoodle8.mods:Galacticraft-Planets:${config.galacticraft.version}:Dev" + compile "micdoodle8.mods:Galacticraft:${config.galacticraft.version}:API" + //Ivy + compile name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' } task getGregTech(type: Download) { diff --git a/build.properties b/build.properties index 01b451c567..2575144e52 100644 --- a/build.properties +++ b/build.properties @@ -1,14 +1,21 @@ minecraft.version=1.7.10 -forge.version=1.7.10-10.13.4.1614-1.7.10 +forge.version=10.13.4.1614 tectech.version=3.7.3 ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=345 +gregtech.jenkinsbuild=358 gregtech.version=5.09.33.23 cofhcore.version=[1.7.10]3.1.4-329-dev -cofhlib.version=[1.7.10]1.0.3-175-dev - yamcore.version=0.5.79 +baubles.version=1.0.1.10 +thaumcraft.version=4.2.3.5 +opencomputers.version=1.7.5.1291 +galacticraft.version=1.7-3.0.12.504 +computercraft.version=1.75 +forestry.version=4.2.16.64 +enderio.version=2.3.0.429_beta +endercore.version=0.2.0.39_beta +waila.version=1.5.10 \ No newline at end of file diff --git a/libs/ComputerCraft1.75.jar b/libs/ComputerCraft1.75.jar deleted file mode 100644 index 304bc9cc2f..0000000000 Binary files a/libs/ComputerCraft1.75.jar and /dev/null differ diff --git a/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar b/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar deleted file mode 100644 index 0bb0483e3b..0000000000 Binary files a/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar and /dev/null differ diff --git a/libs/OpenComputers-MC1.7.10-1.6.2.12-api.jar b/libs/OpenComputers-MC1.7.10-1.6.2.12-api.jar deleted file mode 100644 index 5777d1ffdb..0000000000 Binary files a/libs/OpenComputers-MC1.7.10-1.6.2.12-api.jar and /dev/null differ diff --git a/libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar b/libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar deleted file mode 100644 index 1faff073e0..0000000000 Binary files a/libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar and /dev/null differ diff --git a/libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar b/libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar deleted file mode 100644 index 64b9e9e0e6..0000000000 Binary files a/libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar and /dev/null differ diff --git a/libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar b/libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar deleted file mode 100644 index 8e4dbaeca9..0000000000 Binary files a/libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar and /dev/null differ diff --git a/libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jar b/libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jar deleted file mode 100644 index a1323237eb..0000000000 Binary files a/libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jar and /dev/null differ diff --git a/libs/forestry_1.7.10-4.2.10.58-api.jar b/libs/forestry_1.7.10-4.2.10.58-api.jar deleted file mode 100644 index e45cbd8ead..0000000000 Binary files a/libs/forestry_1.7.10-4.2.10.58-api.jar and /dev/null differ -- cgit From b6e12a2c46fba15f5205a1d0c2f85408d8e8b9be Mon Sep 17 00:00:00 2001 From: Спартак Date: Thu, 28 Nov 2019 17:24:09 +0600 Subject: Fix some recipes with molten materials --- .../dreamcraft/DreamCraftRecipeLoader.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 605ce17509..362c86ab08 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 @@ -258,17 +258,17 @@ public class DreamCraftRecipeLoader implements Runnable { //GT_Values.RA.ADD_ASSEMBLER_RECIPE(new ItemStack[]{com.dreammaster.gthandler.CustomItemList.WetTransformer_UMV_UIV.get(1), CustomItemList.eM_dynamoMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 6)}, Materials.Tungsten.getMolten(8000), CustomItemList.eM_dynamoMulti64_UIV.get(1), 400, 8000000); //Energy Hatches UV-UIV - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2)}, Materials.Silver.getMolten(1000), CustomItemList.eM_energyMulti4_UV.get(1), 100, 122880); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_MAX_UV.get(1), CustomItemList.eM_energyMulti4_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4)}, Materials.Electrum.getMolten(1000), CustomItemList.eM_energyMulti16_UV.get(1), 200, 122880); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UHV_UV").get(1), CustomItemList.eM_energyMulti16_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6)}, Materials.Tungsten.getMolten(1000), CustomItemList.eM_energyMulti64_UV.get(1), 400, 122880); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2)}, Materials.Silver.getMolten(1152), CustomItemList.eM_energyMulti4_UV.get(1), 100, 122880); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_MAX_UV.get(1), CustomItemList.eM_energyMulti4_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4)}, Materials.Electrum.getMolten(1152), CustomItemList.eM_energyMulti16_UV.get(1), 200, 122880); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UHV_UV").get(1), CustomItemList.eM_energyMulti16_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6)}, Materials.Tungsten.getMolten(1152), CustomItemList.eM_energyMulti64_UV.get(1), 400, 122880); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_MAX.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2)}, Materials.Silver.getMolten(2000), CustomItemList.eM_energyMulti4_UHV.get(1), 100, 500000); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UEV_UHV").get(1), CustomItemList.eM_energyMulti4_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4)}, Materials.Electrum.getMolten(2000), CustomItemList.eM_energyMulti16_UHV.get(1), 200, 500000); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UEV_UHV").get(1), CustomItemList.eM_energyMulti16_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6)}, Materials.Tungsten.getMolten(2000), CustomItemList.eM_energyMulti64_UHV.get(1), 400, 500000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_MAX.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2)}, Materials.Silver.getMolten(2304), CustomItemList.eM_energyMulti4_UHV.get(1), 100, 500000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UEV_UHV").get(1), CustomItemList.eM_energyMulti4_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4)}, Materials.Electrum.getMolten(2304), CustomItemList.eM_energyMulti16_UHV.get(1), 200, 500000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UEV_UHV").get(1), CustomItemList.eM_energyMulti16_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6)}, Materials.Tungsten.getMolten(2304), CustomItemList.eM_energyMulti64_UHV.get(1), 400, 500000); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Hatch_Energy_UEV").get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2)}, Materials.Silver.getMolten(4000), CustomItemList.eM_energyMulti4_UEV.get(1), 100, 2000000); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UIV_UEV").get(1), CustomItemList.eM_energyMulti4_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(4000), CustomItemList.eM_energyMulti16_UEV.get(1), 200, 2000000); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UIV_UEV").get(1), CustomItemList.eM_energyMulti16_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(4000), CustomItemList.eM_energyMulti64_UEV.get(1), 400, 2000000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Hatch_Energy_UEV").get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2)}, Materials.Silver.getMolten(4608), CustomItemList.eM_energyMulti4_UEV.get(1), 100, 2000000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UIV_UEV").get(1), CustomItemList.eM_energyMulti4_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(4608), CustomItemList.eM_energyMulti16_UEV.get(1), 200, 2000000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UIV_UEV").get(1), CustomItemList.eM_energyMulti16_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(4608), CustomItemList.eM_energyMulti64_UEV.get(1), 400, 2000000); //GT_Values.RA.ADD_ASSEMBLER_RECIPE(new ItemStack[]{com.dreammaster.gthandler.CustomItemList.Hatch_Energy_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 2)}, Materials.Silver.getMolten(8000), CustomItemList.eM_energyMulti4_UIV.get(1), 100, 8000000); //GT_Values.RA.ADD_ASSEMBLER_RECIPE(new ItemStack[]{com.dreammaster.gthandler.CustomItemList.Transformer_UMV_UIV.get(1), CustomItemList.eM_energyMulti4_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4)}, Materials.Electrum.getMolten(8000), CustomItemList.eM_energyMulti16_UIV.get(1), 200, 8000000); @@ -422,7 +422,7 @@ public class DreamCraftRecipeLoader implements Runnable { CustomItemList.DATApipe.get(2), }, new FluidStack[]{ Materials.UUMatter.getFluid(500), - Materials.Iridium.getMolten(1000), + Materials.Iridium.getMolten(1296), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000) }, CustomItemList.holder_Hatch.get(1), 1200, 100000); @@ -1158,7 +1158,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Neutronium, 64), }, new FluidStack[]{ Materials.SolderingAlloy.getMolten(3760), - Materials.Naquadria.getMolten(9000), + Materials.Naquadria.getMolten(9216), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000) }, ItemList.ZPM3.get(1), 4000, 1600000); } -- cgit