forked from TAIGA/TAIGA
[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
This commit is contained in:
Giovanni Harting
@@ -4,276 +4,241 @@
|
||||
"model": "forge:fluid"
|
||||
},
|
||||
"variants": {
|
||||
"arcanite": [
|
||||
"triberium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "arcanite"
|
||||
"fluid": "triberium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"tiberium": [
|
||||
"meteorite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "tiberium"
|
||||
"fluid": "meteorite_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"prometheum": [
|
||||
"basalt_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "prometheum"
|
||||
"fluid": "basalt_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"rubium": [
|
||||
"tiberium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "rubium"
|
||||
"fluid": "tiberium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"violium": [
|
||||
"aurorium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "violium"
|
||||
"fluid": "aurorium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"bismuth": [
|
||||
"prometheum_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "bismuth"
|
||||
"fluid": "prometheum_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"karmesine": [
|
||||
"duranite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "karmesine"
|
||||
"fluid": "duranite_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"mindorite": [
|
||||
"valyrium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "mindorite"
|
||||
"fluid": "valyrium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"titanite": [
|
||||
"vibranium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "titanite"
|
||||
"fluid": "vibranium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"meteorite": [
|
||||
"karmesine_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "meteorite"
|
||||
"fluid": "karmesine_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"adamantite": [
|
||||
"palladium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "adamantite"
|
||||
"fluid": "palladium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"vibranium": [
|
||||
"uru_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "vibranium"
|
||||
"fluid": "uru_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"ignitite": [
|
||||
"osram_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "ignitite"
|
||||
"fluid": "osram_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"palladium": [
|
||||
"abyssum_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "palladium"
|
||||
"fluid": "abyssum_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"eternite": [
|
||||
"eezo_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "eternite"
|
||||
"fluid": "eezo_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"mythril": [
|
||||
"tiberiumX_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "mythril"
|
||||
"fluid": "tiberiumX_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"astrium": [
|
||||
"fractum_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "astrium"
|
||||
"fluid": "fractum_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"nitronite": [
|
||||
"violium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "nitronite"
|
||||
"fluid": "violium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"proxideum": [
|
||||
"proxii_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "proxideum"
|
||||
"fluid": "proxii_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"noctunyx": [
|
||||
"tritonite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "noctunyx"
|
||||
"fluid": "tritonite_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"imperomite": [
|
||||
"ignitz_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "imperomite"
|
||||
"fluid": "ignitz_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"cryptogen": [
|
||||
"imperomite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "cryptogen"
|
||||
"fluid": "imperomite_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"fractoryte": [
|
||||
"solarium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "fractoryte"
|
||||
"fluid": "solarium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"seismodium": [
|
||||
"nihilite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "seismodium"
|
||||
"fluid": "nihilite_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"terramite": [
|
||||
"adamant_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "terramite"
|
||||
"fluid": "adamant_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"lumixyl": [
|
||||
"dyonite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "lumixyl"
|
||||
"fluid": "dyonite_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"solarium": [
|
||||
"nucleum_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "solarium"
|
||||
"fluid": "nucleum_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"dyonite": [
|
||||
"lumix_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "dyonite"
|
||||
"fluid": "lumix_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"ultranite": [
|
||||
"seismum_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "ultranite"
|
||||
"fluid": "seismum_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"nucleum": [
|
||||
"astrium_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "nucleum"
|
||||
"fluid": "astrium_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"aegisalt": [
|
||||
"niob_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "aegisalt"
|
||||
"fluid": "niob_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"bysmuid": [
|
||||
"yrdeen_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "bysmuid"
|
||||
"fluid": "yrdeen_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"radiant_enderium": [
|
||||
"iox_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "radiant_enderium"
|
||||
"fluid": "iox_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"glimming_enderium": [
|
||||
"obsidiorite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "glimming_enderium"
|
||||
}
|
||||
}
|
||||
],
|
||||
"energy_enderium": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "energy_enderium"
|
||||
}
|
||||
}
|
||||
],
|
||||
"glimmercoal_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "glimmercoal_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"nitro_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "nitro_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"anthracite_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "anthracite_fluid"
|
||||
}
|
||||
}
|
||||
],
|
||||
"spectrum_fluid": [
|
||||
{
|
||||
"custom": {
|
||||
"fluid": "spectrum_fluid"
|
||||
"fluid": "obsidiorite_fluid"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user