You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

138 lines
3.5 KiB

5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
5 years ago
[1.2] Material rework (#60) * Developement tests for nbt data in traits * Lot of trait changes and better balancing * Traits reworked a bit, new traits added. * First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections. * Few fixes in traits and new trait "catcher" * Small fix, needs workaround * fixed some catch issues * Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version. * Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids * Some minor changes in Traits, Registry and Utils. * Iron_nugget is replaced with oreDict Item when not loaded via TAIGA. * Beginning of new material integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now. * Some Small changes in names, registry and recipes * Some weird stuff I don't remember :D * fixed some things I missed while merging * Rollback to something * More Stuff * fixed some merging stuff * Fixed some misspelled names. Actually working with lots of restrictions. * Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work. * Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget... * Fixed integration of materials without tools. * changed IMC to direct lib calls * removed more IMC, removed redundant code * some reformatting * Alloy integration reworked, needs to be balanced. * updated deps, renamed some func's, added duplicate material check * some more renaming * some reformatting, fixed wrong import, fixed string cmp's * Added images for blocks, ingots, nuggets and dust. Json changes do not work yet. * some reformatting * Removed old json files. Placeholder needed. * Fixed block json, items not working yet. * Fixed my own derp (missing json files) * Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP * Changed some generator stuff, not working properly right now! * rewrote offset generation, added some debug command, fixed some stuff * fixed on-surface-generation, made dependencies more flexible * reverted gen-weight back to its normal value * Meteor generator implemented. * fixed generating on ground * optimized a thing * Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy. * Some changes in generation of ores, not ready yet. * Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing. * Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant. * some cleanup in Generator class, added meteor world save handler * Added Textures. Added blockstates and item models. Fixed fluid rendering. * renamed world save data file to be little more specific, removed a unused method * some preps for the upcoming release * First attempt of well balancing material stats. Renamed TiberiumX to Triberium. * Final changes... ready for beta testing * Added missing alloys. * Corrected balancing of ore generation. Still WIP * removed some last debug out * one last reformat
4 years ago
  1. buildscript {
  2. repositories {
  3. jcenter()
  4. maven {
  5. name = "forge"
  6. url = "http://files.minecraftforge.net/maven"
  7. }
  8. maven {
  9. url "https://plugins.gradle.org/m2/"
  10. }
  11. }
  12. dependencies {
  13. classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
  14. classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.1.0'
  15. }
  16. }
  17. apply plugin: 'net.minecraftforge.gradle.forge'
  18. apply plugin: "com.matthewprenger.cursegradle"
  19. repositories {
  20. mavenLocal()
  21. mavenCentral()
  22. maven {
  23. name = "chickenbones"
  24. url = "http://chickenbones.net/maven/"
  25. }
  26. maven {
  27. name 'DVS1 Maven FS'
  28. url 'http://dvs1.progwml6.com/files/maven'
  29. }
  30. }
  31. group = "com.sosnitzka" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
  32. archivesBaseName = "taiga"
  33. sourceCompatibility = JavaVersion.VERSION_1_8
  34. targetCompatibility = JavaVersion.VERSION_1_8
  35. task buildInfo {
  36. if (System.getenv().TAIGA_TAG != null) {
  37. ext.revision = System.getenv().TAIGA_TAG
  38. } else {
  39. ext.revision = "snapshot"
  40. }
  41. if (System.getenv().BUILD_NUMBER != null) {
  42. ext.buildNum = System.getenv().BUILD_NUMBER
  43. }
  44. def cmd = "git log \$(git tag --sort=-refname | sed -n '2p')..\$(git tag --sort=-refname | sed -n '1p') --oneline"
  45. def proc = cmd.execute()
  46. proc.waitFor()
  47. if (proc.exitValue() == 0) {
  48. ext.changes = proc.text.trim()
  49. } else {
  50. ext.changes = "N/A"
  51. }
  52. }
  53. version = project.buildInfo.revision
  54. minecraft {
  55. version = "1.12.2-14.23.5.2768"
  56. runDir = "run"
  57. mappings = "snapshot_20170801"
  58. replace '@VERSION@', project.version
  59. }
  60. //noinspection GroovyAssignabilityCheck
  61. ext.mc_version = project.minecraft.version.split('-')[0]
  62. version = "${mc_version}-${project.buildInfo.revision}"
  63. dependencies {
  64. deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.+:deobf"
  65. deobfCompile "mezz.jei:jei_1.12.2:4.+"
  66. deobfCompile "slimeknights:TConstruct:1.12.2-2.10.+:deobf"
  67. }
  68. sourceSets {
  69. main {
  70. resources {
  71. srcDir 'resources'
  72. }
  73. }
  74. }
  75. //noinspection GroovyAssignabilityCheck
  76. processResources {
  77. // this will ensure that this task is redone when the versions change.
  78. inputs.property "version", project.version
  79. inputs.property "mcversion", project.minecraft.version
  80. // replace stuff in mcmod.info, nothing else
  81. from(sourceSets.main.resources.srcDirs) {
  82. include 'mcmod.info'
  83. // replace version and mcversion
  84. expand 'version': project.version, 'mcversion': project.minecraft.version
  85. }
  86. // copy everything else, thats not the mcmod.info
  87. from(sourceSets.main.resources.srcDirs) {
  88. exclude 'mcmod.info'
  89. }
  90. }
  91. task deobfJar(type: Jar) {
  92. //noinspection GroovyAssignabilityCheck
  93. from sourceSets.main.output
  94. classifier = 'deobf'
  95. }
  96. artifacts {
  97. archives deobfJar
  98. }
  99. curseforge {
  100. apiKey = System.getenv().CURSE_API_KEY ? System.getenv().CURSE_API_KEY : "devBuild"
  101. //noinspection GroovyAssignabilityCheck
  102. project {
  103. id = '247661'
  104. changelog = project.buildInfo.changes // A file can also be set using: changelog = file('changelog.txt')
  105. releaseType = 'release'
  106. //addGameVersion '1.10.2'
  107. //addGameVersion '1.10.1'
  108. addArtifact deobfJar
  109. mainArtifact(jar) {
  110. displayName = "taiga-${project.buildInfo.revision}"
  111. }
  112. relations {
  113. requiredDependency 'tinkers-construct'
  114. }
  115. }
  116. }