diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..ba6e3402 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +language: java +sudo: true +cache: + directories: + - "$HOME/.gradle/caches" + - "$HOME/.gradle/wrapper" +notifications: + email: false + irc: + channels: + secure: Rd4c9WhmrVR6PnvUlJG98iTwwPI7AskIfdfSmjiM5A2RlU1kMLhe8MzZsrDniJlWvG5FVJVnWKw5j2tLQXwwLfUj5LngVj3XKp62fuV7QT9RhfTSZ7piKWUtNHZz+zcujBf/AgONsHjMEJQ4/LDIwiQncPtaf8uDj9VEolvvUgJEuoy9gl+cARVqaD3C6v8/ZhoxcBsDfBDS0G+UBqDMzq/XuFnyQA5ztorXgryLFPpW2nHDjKlyNy/9SVx65Q84C+eblxovTf/PtAtZTPGEbEuc3Xuxbt+Oxcu1VPK4lVit3lgPxK8LeW4E9/naafjpjmUlVPaEdlWrqnYqY41HQShhyA0daTP6eBp8atPViyTVpo7+Vr2FoPWBulkJMHiP0TajBZSN++3D0EGCrzEKAyucYR2cetknkwIU35C19WqtaVFXQIZeeDyLDYdkAHXfacZ+cJLox1XoBxkbkmXXAu9WUEPLDptGv+7Po1ZiuVeybWeJD9B/a22hrDzYr2fsv5Z3XROapN670pHduNLqNBJl40Pob3+hZ5EHbRxrUWmJBFvewYZuSlatFWc/DHdT9pbph0b3LA/ImYE55K+o/Q3iVsPtXWvSKFkXz/E/o5F4x4NZGAVrwwT1UW1a9xdCvv+mAMoSTHHoknjDwgRjjODyEhV4tVUi4LMppMGF+0E= + nick: travis-ci + password: + secure: fejJ/2u4n5/yQXma+YG17fDrEfBb8ClP2+030Zbb6c5n/K9QK3iQcSMvBSSudQD4TMAzqraeblI/fsxuAAJA+bUTKwUbOG6APFL7uO/K8JBa/116Jlw55Ppcn7RVoih9h2xaEJhJlSGBTpsyYQ8nhNROP73zzOSbDowKXRwCzIeKP86cItkZT7LLhw3Q9XqDqRrNpoqu0UMOOzHcr2b7Qt6S2wntc7eRSIL9mJogEPJC+qVpqJHWybSM3Jy6/lrr7qwy/HbP3KWfXvaYTTy7gYKbf+Y0LMYhQwF8xV1JL9aK5CD+6/yZwVAWQ86QMyFqIEapwn/fp1bUQ/hiUTIap7Q1hYF63ckm/zu2Wfou3KYKlQx+PL0F4IU04F6eKJzWgWai6OE2hyiGs/UxQRMY1EoetoXow+fnFbpJPSjjbvpAKYAzzjdDS2QS42MjT1AeYDj2AhCP8WZZ6q2bRIoloMQTe9dimls7k0lTtddL1mW0516lPPL1gJjOMIbMSM/5CiMuAX7inn4HRy0nQYlvi3KyfC/8Ga6rwFQ2yPE6n8Sb2u4bNoU8QXgkEB4PyRzAs0/yOt3B4Vvj0+rrsHEOon5p0sFws1HfJYyw0pvHqjFuSlRZz6vCJ9THnkrItOlMzuOFR9DmEGtOe0/3T4nUkBFyGKKW7nqh+MJL82XRQQE= +before_install: +- sudo pip install codecov +after_success: +- sudo codecov +before_deploy: +- export RELEASE_JAR=$(ls build/libs/*.jar) +deploy: + provider: releases + api_key: + secure: BsWoyVEdvAeXOiiUDRNlSHwZyCFZiikz1sTQAv6zPRQSJxR9i3WTPm+tEH2LvpoQIiYi+6JQJHKQ50xbo9KZ7fuExslAiY9gyJ9qwYsQpwRrd6dqwhHh1jrHslizFB6IWRJbBhKhT88EZBZuk4mOtdTcAbh+/qadj/7TY52gLGeCxwAV3CtBU5b0jPCL+I12BJMdvXx36iKGAFD3uJoO0jXUeCwdVE6WH5RtQ19pYfSEfE1AR/p5+HkR9CK0ZvuTtf3DDTX6OUfbiOmNTHBcwkpbqilPf/8+estNNgnHLUa2H9GQUahwN8UnU2kkg429/4W0LbutAlWh9bLbgOKA3veq05wPyqdTDHqCS4gLaBLW2IvlxT7HpfrT0cnWwF7kHoV2dKsrbjkizED6ZFsTVDucllr5U78xodcjaUNnqrTUT3pw31tuYNxt+WjKHYyJnNJ1APS8g9AxHz5QiNpz95r4WL/MWpiXKAFQaCSltGaxuLZa68G2HGIyZcfBtVwkaE4LXZhUK1aTdeJG4jdC6f7n7oi5Dcdq/kBTrUhc7JlC2rDFqCgaPx6SoQSa51EwG99MHzJSAgq+KQOXUtjd3d4+lQ5yBpk0nq9TS7kzPfPw259W2xe3xGNqB/7r+zFjbNkJteu9nP1lr4rQzs1oBTOcCkM9+pZNkmVf50J4OhI= + file: "${RELEASE_JAR}" + file_glob: true + skip_cleanup: true + on: + repo: GTNewHorizons/TinkersConstruct + branch: 1.7.10 + tags: true diff --git a/build.properties b/build.properties index f496a88b..311b0a4d 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ mantle_version=0.3.2.jenkins187 CCLIB_version=1.1.3.136 NEI_version=1.0.4.106 ccc_version=1.0.6.43 -mod_version=1.8.8 +mod_version=1.8.9-GTNH waila_version=1.5.3_1.7.10 fmp_version=1.1.2.334 diff --git a/src/main/java/tconstruct/plugins/gears/TinkerGears.java b/src/main/java/tconstruct/plugins/gears/TinkerGears.java index 94b76d0d..838cec3d 100644 --- a/src/main/java/tconstruct/plugins/gears/TinkerGears.java +++ b/src/main/java/tconstruct/plugins/gears/TinkerGears.java @@ -17,6 +17,7 @@ import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.items.Pattern; +import tconstruct.util.config.PHConstruct; import java.util.LinkedList; import java.util.List; @@ -38,7 +39,8 @@ public class TinkerGears { public void postInit(FMLPostInitializationEvent event) { ItemStack cast = new ItemStack(gearCast); FluidStack aluCastLiquid = new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue); - FluidStack goldCastLiquid = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue*2); + if(!PHConstruct.removeGoldCastRecipes) + FluidStack goldCastLiquid = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue*2); // find all gears in the registry for(String oreName : OreDictionary.getOreNames()) { @@ -51,7 +53,8 @@ public class TinkerGears { if(!oreName.equals("gearWood")) { for(ItemStack g : gears) { TConstructRegistry.getTableCasting().addCastingRecipe(cast, aluCastLiquid, g, false, 50); - TConstructRegistry.getTableCasting().addCastingRecipe(cast, goldCastLiquid, g, false, 50); + if(!PHConstruct.removeGoldCastRecipes) + TConstructRegistry.getTableCasting().addCastingRecipe(cast, goldCastLiquid, g, false, 50); } } diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index 77079e5a..a7684567 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -592,9 +592,11 @@ public class TinkerSmeltery LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); // Blank tableCasting.addCastingRecipe(new ItemStack(TinkerTools.blankPattern, 1, 1), new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.blankPattern, 1, 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); tableCasting.addCastingRecipe(gemcast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Items.emerald), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Items.emerald), 80); + if (!PHConstruct.removeGoldCastRecipes) { + tableCasting.addCastingRecipe(new ItemStack(TinkerTools.blankPattern, 1, 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Items.emerald), 80); + } // Ingots tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 2), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); // stone @@ -643,7 +645,8 @@ public class TinkerSmeltery ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, iter + 1); tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { @@ -663,12 +666,14 @@ public class TinkerSmeltery for (int i = 0; i < ingotShapes.length; i++) { tableCasting.addCastingRecipe(ingotcast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50); - tableCasting.addCastingRecipe(ingotcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe(ingotcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); } ItemStack fullguardCast = new ItemStack(TinkerSmeltery.metalPattern, 1, 22); tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); // Golden Food Stuff // 9 gold nuggets @@ -926,7 +931,9 @@ public class TinkerSmeltery for (ItemStack ore : OreDictionary.getOres(name)) { tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); } } @@ -948,7 +955,9 @@ public class TinkerSmeltery continue; } tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.nuggetLiquidValue), pattern, 40); } } diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 7b2a2f1b..0af00bd8 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -60,6 +60,7 @@ public class PHConstruct craftMetalTools = config.get("Difficulty Changes", "Craft metals with Wood Patterns", false).getBoolean(false); vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true).getBoolean(true); lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true).getBoolean(true); + removeGoldCastRecipes = config.get("Difficulty Changes", "Remove Gold Cast Recipes", true).getBoolean(true); removeVanillaToolRecipes = config.get("Difficulty Changes", "Remove Vanilla Tool Recipes", false).getBoolean(false); labotimizeVanillaTools = config.get("Difficulty Changes", "Remove Vanilla Tool Effectiveness", false).getBoolean(false); miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); @@ -342,6 +343,7 @@ public class PHConstruct public static boolean craftMetalTools; public static boolean vanillaMetalBlocks; public static boolean removeVanillaToolRecipes; + public static boolean removeGoldCastRecipes; public static boolean labotimizeVanillaTools; public static boolean miningLevelIncrease; public static boolean denyMattock; diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index b4c8ccab..79f4443b 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -258,7 +258,8 @@ public class TinkerWeaponry { ItemStack cast = new ItemStack(metalPattern, 1, i); tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid(); @@ -271,7 +272,8 @@ public class TinkerWeaponry { ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, 25); tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid();