Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
58eacac28c | |||
![]() |
8c334a4cdd |
14
build.gradle
14
build.gradle
@@ -61,7 +61,7 @@ task buildInfo {
|
||||
version = project.buildInfo.revision
|
||||
|
||||
minecraft {
|
||||
version = "1.10.2-12.18.1.2011"
|
||||
version = "1.10.2-12.18.1.2079"
|
||||
runDir = "run"
|
||||
|
||||
// the mappings can be changed at any time, and must be in the following format.
|
||||
@@ -69,7 +69,7 @@ minecraft {
|
||||
// stable_# stables are built at the discretion of the MCP team.
|
||||
// Use non-default mappings at your own risk. they may not allways work.
|
||||
// simply re-run your setup task after changing the mappings to update your workspace.
|
||||
mappings = "snapshot_20160701"
|
||||
mappings = "snapshot_20160911"
|
||||
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
|
||||
|
||||
replace "${version}", project.version
|
||||
@@ -83,10 +83,10 @@ dependencies {
|
||||
//deobfCompile "codechicken:CodeChickenLib:1.9.4-2.0.2.39:deobf"
|
||||
//deobfCompile "codechicken:CodeChickenCore:1.9.4-2.0.3.65:deobf"
|
||||
//deobfCompile "codechicken:NotEnoughItems:1.9-${nei_version}:dev"
|
||||
deobfCompile "slimeknights.mantle:Mantle:1.10.2-0.10.3.jenkins161:deobf"
|
||||
deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170:deobf"
|
||||
//Old: deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132:deobf"
|
||||
deobfCompile "mezz.jei:jei_1.10.2:3.7.6.231"
|
||||
deobfCompile "slimeknights:TConstruct:1.10-2.3.3a.jenkins271:deobf"
|
||||
deobfCompile "mezz.jei:jei_1.10.2:3.9.3.252"
|
||||
deobfCompile "slimeknights:TConstruct:1.10.2-2.5.0.jenkins345:deobf"
|
||||
//compile files('libs/TConstruct-1.9-2.3.1.DEV.1d4c1de-deobf.jar')
|
||||
}
|
||||
|
||||
@@ -134,8 +134,8 @@ curseforge {
|
||||
id = '247661'
|
||||
changelog = project.buildInfo.changes // A file can also be set using: changelog = file('changelog.txt')
|
||||
releaseType = 'release'
|
||||
addGameVersion '1.10.2'
|
||||
addGameVersion '1.10.1'
|
||||
//addGameVersion '1.10.2'
|
||||
//addGameVersion '1.10.1'
|
||||
addArtifact deobfJar
|
||||
|
||||
mainArtifact(jar) {
|
||||
|
@@ -8,7 +8,7 @@ import slimeknights.tconstruct.library.materials.HeadMaterialStats;
|
||||
import slimeknights.tconstruct.library.materials.Material;
|
||||
import slimeknights.tconstruct.library.traits.AbstractTrait;
|
||||
|
||||
import static slimeknights.tconstruct.tools.TinkerMaterials.*;
|
||||
import static slimeknights.tconstruct.tools.TinkerTraits.*;
|
||||
|
||||
public class MaterialTraits {
|
||||
|
||||
|
@@ -130,11 +130,11 @@ public class TAIGA {
|
||||
private void registerTinkerMaterials() {
|
||||
|
||||
double d = durabilityFactorGeneral;
|
||||
System.out.println("DURABILITY FACTOR" + d);
|
||||
System.out.println("Durability=" + d);
|
||||
float s = (float) speedFactorGeneral;
|
||||
System.out.println("SPEED FACTOR" + s);
|
||||
System.out.println("Speed=" + s);
|
||||
float a = (float) attackFactorGeneral;
|
||||
System.out.println("ATTACK FACTOR" + a);
|
||||
System.out.println("Attack=" + a);
|
||||
|
||||
// ARCANE ORES
|
||||
registerTinkerMaterial("Tiberium", tiberium, tiberiumFluid, (int) (223 * d), 6.2f * s, 8.35f * a, 0.63f, 50, 50, OBSIDIAN, false, true);
|
||||
|
@@ -1,10 +1,14 @@
|
||||
package com.sosnitzka.taiga.recipes;
|
||||
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
|
||||
import static com.sosnitzka.taiga.Blocks.*;
|
||||
import static com.sosnitzka.taiga.Items.*;
|
||||
import static slimeknights.tconstruct.shared.TinkerCommons.matNecroticBone;
|
||||
|
||||
@@ -26,5 +30,47 @@ public class CraftingRegistry {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(nitro_brick), fuel_brick, Items.GUNPOWDER, Items.BLAZE_POWDER);
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(anthracite_dust), matNecroticBone, Items.COAL, Items.GUNPOWDER);
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(spectrum_dust), matNecroticBone, glimmerstone_dust);
|
||||
|
||||
registerMetalRecipes(arcaniteIngot, arcanite_nugget, arcaniteBlock);
|
||||
registerMetalRecipes(tiberiumIngot, tiberium_nugget, tiberiumBlock);
|
||||
registerMetalRecipes(prometheumIngot, prometheum_nugget, prometheumBlock);
|
||||
registerMetalRecipes(rubiumIngot, rubium_nugget, rubiumBlock);
|
||||
registerMetalRecipes(violiumIngot, violium_nugget, violiumBlock);
|
||||
registerMetalRecipes(bismuthIngot, bismuth_nugget, bismuthBlock);
|
||||
registerMetalRecipes(karmesineIngot, karmesine_nugget, karmesineBlock);
|
||||
registerMetalRecipes(mindoriteIngot, mindorite_nugget, mindoriteBlock);
|
||||
registerMetalRecipes(titaniteIngot, titanite_nugget, titaniteBlock);
|
||||
registerMetalRecipes(meteoriteIngot, meteorite_nugget, meteoriteBlock);
|
||||
registerMetalRecipes(adamantiteIngot, adamantite_nugget, adamantiteBlock);
|
||||
registerMetalRecipes(vibraniumIngot, vibranium_nugget, vibraniumBlock);
|
||||
registerMetalRecipes(ignititeIngot, ignitite_nugget, ignititeBlock);
|
||||
registerMetalRecipes(palladiumIngot, palladium_nugget, palladiumBlock);
|
||||
registerMetalRecipes(eterniteIngot, eternite_nugget, eterniteBlock);
|
||||
registerMetalRecipes(mythrilIngot, mythril_nugget, mythrilBlock);
|
||||
registerMetalRecipes(imperomiteIngot, imperomite_nugget, imperomiteBlock);
|
||||
registerMetalRecipes(fractoryteIngot, fractoryte_nugget, fractoryteBlock);
|
||||
registerMetalRecipes(noctunyxIngot, noctunyx_nugget, noctunyxBlock);
|
||||
registerMetalRecipes(nitroniteIngot, nitronite_nugget, nitroniteBlock);
|
||||
registerMetalRecipes(cryptogenIngot, cryptogen_nugget, cryptogenBlock);
|
||||
registerMetalRecipes(seismodiumIngot, seismodium_nugget, seismodiumBlock);
|
||||
registerMetalRecipes(aegisaltIngot, aegisalt_nugget, aegisaltBlock);
|
||||
registerMetalRecipes(ultraniteIngot, ultranite_nugget, ultraniteBlock);
|
||||
registerMetalRecipes(bysmuidIngot, bysmuid_nugget, bysmuidBlock);
|
||||
registerMetalRecipes(nucleumIngot, nucleum_nugget, nucleumBlock);
|
||||
registerMetalRecipes(lumixylIngot, lumixyl_nugget, lumixylBlock);
|
||||
registerMetalRecipes(dyoniteIngot, dyonite_nugget, dyoniteBlock);
|
||||
registerMetalRecipes(terramiteIngot, terramite_nugget, terramiteBlock);
|
||||
registerMetalRecipes(solariumIngot, solarium_nugget, solariumBlock);
|
||||
registerMetalRecipes(astriumIngot, astrium_nugget, astriumBlock);
|
||||
registerMetalRecipes(proxideumIngot, proxideum_nugget, proxideumBlock);
|
||||
}
|
||||
|
||||
private static void registerMetalRecipes(Item ingot, Item nugget, Block block) {
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(nugget, 9), new ItemStack(ingot));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ingot, 9), new ItemStack(block));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(block), "###", "###", "###", '#', new ItemStack(ingot)));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ingot), "###", "###", "###", '#', new ItemStack(nugget)));
|
||||
}
|
||||
}
|
||||
|
32
src/main/resources/materials.txt
Normal file
32
src/main/resources/materials.txt
Normal file
@@ -0,0 +1,32 @@
|
||||
arcanite
|
||||
tiberium
|
||||
prometheum
|
||||
rubium
|
||||
violium
|
||||
bismuth
|
||||
karmesine
|
||||
mindorite
|
||||
titanite
|
||||
meteorite
|
||||
adamantite
|
||||
vibranium
|
||||
ignitite
|
||||
palladium
|
||||
eternite
|
||||
mythril
|
||||
imperomite
|
||||
fractoryte
|
||||
noctunyx
|
||||
nitronite
|
||||
cryptogen
|
||||
seismodium
|
||||
aegisalt
|
||||
ultranite
|
||||
bysmuid
|
||||
nucleum
|
||||
lumixyl
|
||||
dyonite
|
||||
terramite
|
||||
solarium
|
||||
astrium
|
||||
proxideum
|
Reference in New Issue
Block a user