diff --git a/gradle.properties b/gradle.properties index 1dd97e308..23f13e4d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ minecraft_version_toml=15 forge_version=30.0.15 forge_version_toml=30 forge_group=net.minecraftforge -mappings_version=4-1.15.1 +mappings_version=5-1.15.1 diff --git a/mappings/build.gradle b/mappings/build.gradle index cc051890a..c8bd43b21 100644 --- a/mappings/build.gradle +++ b/mappings/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' apply plugin: 'maven' ext.channel = 'snapshot' -ext.dlVersion = '4' +ext.dlVersion = '5' ext.mcVersion = '1.15.1' group = 'de.oceanlabs.mcp' diff --git a/mappings/custom/fields.csv b/mappings/custom/fields.csv index 6e2cae171..9b271eec9 100644 --- a/mappings/custom/fields.csv +++ b/mappings/custom/fields.csv @@ -1,4 +1,5 @@ searge,name,side,desc +field_225311_b,coloringStates,0, field_226713_A_,PLAIN_FLOWER_CONFIG,2, field_226714_B_,FOREST_FLOWER_CONFIG,2, field_226715_C_,DEAD_BUSH_CONFIG,2, @@ -134,6 +135,12 @@ field_227262_d_,deserializer,2, field_227272_a_,capProvider,2, field_227273_b_,stemProivder,2, field_227274_c_,foliageRadius,2, +field_227275_a_,heightInterval,2, +field_227276_b_,crownHeight,2, +field_227278_c_,decorators,2, +field_227279_d_,baseHeight,2, +field_227280_e_,heightInterval,2, +field_227281_f_,crownHeight,2, field_227289_a_,stateProvider,2, field_227290_b_,blockPlacer,2, field_227291_c_,whitelist,2, @@ -156,6 +163,34 @@ field_227310_h_,zspread,2, field_227311_i_,canReplace,2, field_227312_j_,project,2, field_227313_k_,needWater,2, +field_227327_a_,foliagePlacer,2, +field_227328_b_,heightRandA,2, +field_227329_c_,heightRandB,2, +field_227330_d_,trunkHeight,2, +field_227331_f_,trunkHeightRandom,2, +field_227332_g_,trunkTopOffset,2, +field_227333_h_,trunkTopOffsetRandom,2, +field_227334_i_,foliageHeight,2, +field_227335_j_,foliageHeightRandom,2, +field_227336_k_,maxWaterDepth,2, +field_227337_l_,ignoreVines,2, +field_227339_c_,foliagePlacer,2, +field_227340_d_,decorators,2, +field_227341_e_,baseHeight,2, +field_227342_f_,heightRandA,2, +field_227343_g_,heightRandB,2, +field_227344_h_,trunkHeight,2, +field_227345_i_,trunkHeightRandom,2, +field_227346_j_,trunkTopOffset,2, +field_227347_k_,trunkTopOffsetRandom,2, +field_227348_l_,foliageHeight,2, +field_227349_m_,foliageHeightRandom,2, +field_227350_n_,maxWaterDepth,2, +field_227351_o_,ignoreVines,2, +field_227363_b_,requiresBlockBelow,2, +field_227364_c_,rockCount,2, +field_227365_d_,holeCount,2, +field_227366_f_,validBlocks,2, field_227368_m_,trunkProvider,2, field_227369_n_,leavesProvider,2, field_227370_o_,decorators,2, @@ -165,4 +200,13 @@ field_227377_a_,trunkProvider,2, field_227378_b_,leavesProvider,2, field_227379_c_,decorators,2, field_227380_d_,baseHeight,2, +field_227381_a_,radius,2, +field_227382_b_,radiusRandom,2, +field_227383_c_,type,2, +field_227386_a_,BLOB_FOLIAGE_PLACER,2, +field_227387_b_,SPRUCE_FOLIAGE_PLACER,2, +field_227388_c_,PINE_FOLIAGE_PLACER,2, +field_227389_d_,ACACIA_FOLIAGE_PLACER,2, +field_227390_e_,deserializer,2, field_227393_a_,type,2, +field_227406_b_,weightedList,2, diff --git a/mappings/custom/methods.csv b/mappings/custom/methods.csv index 5c9cbf155..645f02539 100644 --- a/mappings/custom/methods.csv +++ b/mappings/custom/methods.csv @@ -1,122 +1,152 @@ searge,name,side,desc -func_208521_b,setBlock,2 -func_214584_a,setDirtAt,2 -func_214587_a,isFree,2 -func_214840_a,deserialize,2 -func_222281_af,addDesertExtraDecoration,2 -func_222282_l,addDefaultSoftDisks,2 -func_222283_Y,addPlainGrass,2 -func_222284_F,addSnowyTrees,2 -func_222285_H,addGiantTrees,2 -func_222286_ab,addBadlandExtraVegetation,2 -func_222287_ah,addColdOceanExtraVegetation,2 -func_222288_h,addDefaultOres,2 -func_222289_r,addLightBambooVegetation,2 -func_222290_D,addJungleEdgeTrees,2 -func_222291_j,addExtraEmeralds,2 -func_222292_ad,addDesertExtraVegetation,2 -func_222293_t,addTaigaTrees,2 -func_222294_Q,addMushroomFieldVegetation,2 -func_222295_c,addStructureFeaturePlacement,2 -func_222296_u,addWaterTrees,2 -func_222297_ap,addSurfaceFreezing,2 -func_222298_O,addForestGrass,2 -func_222299_R,addPlainVegetation,2 -func_222300_a,addDefaultCarvers,2 -func_222301_e,addDesertLakes,2 -func_222302_w,addOtherBirchTrees,2 -func_222303_T,addGiantTaigaVegetation,2 -func_222304_B,addMountainEdgeTrees,2 -func_222305_an,addIcebergs,2 -func_222306_V,addWarmFlowers,2 -func_222307_p,addBerryBushes,2 -func_222308_M,addBadlandGrass,2 -func_222309_aj,addWarmSeagrass,2 -func_222310_y,addSavannaTrees,2 -func_222311_aa,addDefaultExtraVegetation,2 -func_222312_al,addLukeWarmKelp,2 -func_222313_n,addMossyStoneBlock,2 -func_222314_K,addShatteredSavannaGrass,2 -func_222315_Z,addDefaultMushrooms,2 -func_222316_G,addGiantSpruceTrees,2 -func_222317_ag,addSwampExtraDecoration,2 -func_222318_m,addSwampClayDisk,2 -func_222319_X,addTaigaGrass,2 -func_222320_ai,addDefaultSeagrass,2 -func_222321_I,addJungleGrass,2 -func_222322_k,addInfestedStone,2 -func_222323_C,addJungleTrees,2 -func_222324_ac,addJungleExtraVegetation,2 -func_222325_s,addBambooVegetation,2 -func_222326_g,addDefaultUndergroundVariety,2 -func_222327_E,addBadlandsTrees,2 -func_222328_i,addExtraGold,2 -func_222329_ae,addSwampExtraVegetation,2 -func_222330_v,addBirchTrees,2 -func_222331_P,addSwampVegetation,2 -func_222332_ao,addBlueIce,2 -func_222333_d,addDefaultLakes,2 -func_222334_S,addDesertVegetation,2 -func_222335_f,addDefaultMonsterRoom,2 -func_222336_x,addTallBirchTrees,2 -func_222337_am,addDefaultSprings,2 -func_222338_N,addForestFlowers,2 -func_222339_L,addSavannaExtraGrass,2 -func_222340_ak,addDeepWarmSeagrass,2 -func_222341_q,addSparseBerryBushes,2 -func_222342_U,addDefaultFlowers,2 -func_222343_A,addMountainTrees,2 -func_222344_J,addSavannaGrass,2 -func_222345_o,addFerns,2 -func_222346_b,addOceanCarvers,2 -func_222347_z,addShatteredSavannaTrees,2 -func_222348_W,addDefaultGrass,2 -func_222365_c,getHeightValue,2 -func_225489_aq,addEndCity,2 -func_225526_b_,getNoiseBiome,2 -func_225527_a_,getFoliageColor,0 -func_225528_a_,getGrassColor,0 -func_225530_a_,getBiomesWithin,2 -func_225531_a_,findBiomeHorizontal,2 -func_225532_a_,getBiome,2 -func_225557_a_,doPlace,2 -func_225559_a_,isValid,2 -func_225560_a_,getCount,2 -func_225561_a_,getPos,2 -func_225562_b_,getRandomFlower,2 -func_225566_b_,configured,2 -func_225567_a_,place,2 -func_225568_b_,build,2 -func_225569_d_,baseHeight,2 -func_225574_a_,getState,2 -func_226835_a_,withDifferentSource,2 -func_226836_a_,getBiome,2 -func_227214_a_,updateLeaves,2 -func_227216_a_,placeLog,2 -func_227217_a_,setBlock,2 -func_227219_b_,placeLeaf,2 -func_227222_d_,isVine,2 -func_227227_a_,weighted,2 -func_227228_a_,decorated,2 -func_227249_a_,isStone,2 -func_227250_b_,isDirt,2 -func_227263_a_,deserialize,2 -func_227264_a_,register,2 -func_227300_a_,deserialize,2 -func_227314_a_,canReplace,2 -func_227315_a_,tries,2 -func_227316_a_,whitelist,2 -func_227317_b_,noProjection,2 -func_227318_b_,xspread,2 -func_227319_b_,blacklist,2 -func_227320_c_,needWater,2 -func_227321_c_,yspread,2 -func_227322_d_,build,2 -func_227323_d_,zspread,2 -func_227373_a_,setFromSapling,2 -func_227376_b_,deserialize,2 -func_227446_a_,configured,2 -func_228358_a_,getAverageGrassColor,0 -func_228359_a_,getAverageColor,0 -func_228361_b_,getAverageFoliageColor,0 -func_228363_c_,getAverageWaterColor,0 +func_208521_b,setBlock,2, +func_214584_a,setDirtAt,2, +func_214587_a,isFree,2, +func_214840_a,deserialize,2, +func_222281_af,addDesertExtraDecoration,2, +func_222282_l,addDefaultSoftDisks,2, +func_222283_Y,addPlainGrass,2, +func_222284_F,addSnowyTrees,2, +func_222285_H,addGiantTrees,2, +func_222286_ab,addBadlandExtraVegetation,2, +func_222287_ah,addColdOceanExtraVegetation,2, +func_222288_h,addDefaultOres,2, +func_222289_r,addLightBambooVegetation,2, +func_222290_D,addJungleEdgeTrees,2, +func_222291_j,addExtraEmeralds,2, +func_222292_ad,addDesertExtraVegetation,2, +func_222293_t,addTaigaTrees,2, +func_222294_Q,addMushroomFieldVegetation,2, +func_222295_c,addStructureFeaturePlacement,2, +func_222296_u,addWaterTrees,2, +func_222297_ap,addSurfaceFreezing,2, +func_222298_O,addForestGrass,2, +func_222299_R,addPlainVegetation,2, +func_222300_a,addDefaultCarvers,2, +func_222301_e,addDesertLakes,2, +func_222302_w,addOtherBirchTrees,2, +func_222303_T,addGiantTaigaVegetation,2, +func_222304_B,addMountainEdgeTrees,2, +func_222305_an,addIcebergs,2, +func_222306_V,addWarmFlowers,2, +func_222307_p,addBerryBushes,2, +func_222308_M,addBadlandGrass,2, +func_222309_aj,addWarmSeagrass,2, +func_222310_y,addSavannaTrees,2, +func_222311_aa,addDefaultExtraVegetation,2, +func_222312_al,addLukeWarmKelp,2, +func_222313_n,addMossyStoneBlock,2, +func_222314_K,addShatteredSavannaGrass,2, +func_222315_Z,addDefaultMushrooms,2, +func_222316_G,addGiantSpruceTrees,2, +func_222317_ag,addSwampExtraDecoration,2, +func_222318_m,addSwampClayDisk,2, +func_222319_X,addTaigaGrass,2, +func_222320_ai,addDefaultSeagrass,2, +func_222321_I,addJungleGrass,2, +func_222322_k,addInfestedStone,2, +func_222323_C,addJungleTrees,2, +func_222324_ac,addJungleExtraVegetation,2, +func_222325_s,addBambooVegetation,2, +func_222326_g,addDefaultUndergroundVariety,2, +func_222327_E,addBadlandsTrees,2, +func_222328_i,addExtraGold,2, +func_222329_ae,addSwampExtraVegetation,2, +func_222330_v,addBirchTrees,2, +func_222331_P,addSwampVegetation,2, +func_222332_ao,addBlueIce,2, +func_222333_d,addDefaultLakes,2, +func_222334_S,addDesertVegetation,2, +func_222335_f,addDefaultMonsterRoom,2, +func_222336_x,addTallBirchTrees,2, +func_222337_am,addDefaultSprings,2, +func_222338_N,addForestFlowers,2, +func_222339_L,addSavannaExtraGrass,2, +func_222340_ak,addDeepWarmSeagrass,2, +func_222341_q,addSparseBerryBushes,2, +func_222342_U,addDefaultFlowers,2, +func_222343_A,addMountainTrees,2, +func_222344_J,addSavannaGrass,2, +func_222345_o,addFerns,2, +func_222346_b,addOceanCarvers,2, +func_222347_z,addShatteredSavannaTrees,2, +func_222348_W,addDefaultGrass,2, +func_222365_c,getHeightValue,2, +func_225308_a,addColoringState,0, +func_225309_a,addColoringStates,0, +func_225310_a,getColoringProperties,0, +func_225489_aq,addEndCity,2, +func_225526_b_,getNoiseBiome,2, +func_225527_a_,getFoliageColor,0, +func_225528_a_,getGrassColor,0, +func_225530_a_,getBiomesWithin,2, +func_225531_a_,findBiomeHorizontal,2, +func_225532_a_,getBiome,2, +func_225557_a_,doPlace,2, +func_225559_a_,isValid,2, +func_225560_a_,getCount,2, +func_225561_a_,getPos,2, +func_225562_b_,getRandomFlower,2, +func_225566_b_,configured,2, +func_225567_a_,place,2, +func_225568_b_,build,2, +func_225569_d_,baseHeight,2, +func_225570_a_,getTreeRadiusForHeight,2, +func_225571_a_,createFoliage,2, +func_225572_a_,shouldSkipLocation,2, +func_225573_a_,foliageRadius,2, +func_225574_a_,getState,2, +func_226835_a_,withDifferentSource,2, +func_226836_a_,getBiome,2, +func_227214_a_,updateLeaves,2, +func_227216_a_,placeLog,2, +func_227217_a_,setBlock,2, +func_227219_b_,placeLeaf,2, +func_227222_d_,isVine,2, +func_227227_a_,weighted,2, +func_227228_a_,decorated,2, +func_227249_a_,isStone,2, +func_227250_b_,isDirt,2, +func_227263_a_,deserialize,2, +func_227264_a_,register,2, +func_227269_a_,deserialize,2, +func_227277_a_,deserialize,2, +func_227282_a_,decorators,2, +func_227283_b_,heightInterval,2, +func_227284_c_,crownHeight,2, +func_227300_a_,deserialize,2, +func_227314_a_,canReplace,2, +func_227315_a_,tries,2, +func_227316_a_,whitelist,2, +func_227317_b_,noProjection,2, +func_227318_b_,xspread,2, +func_227319_b_,blacklist,2, +func_227320_c_,needWater,2, +func_227321_c_,yspread,2, +func_227322_d_,build,2, +func_227323_d_,zspread,2, +func_227338_a_,deserialize,2, +func_227352_a_,ignoreVines,2, +func_227353_a_,decorators,2, +func_227354_b_,heightRandA,2, +func_227355_c_,heightRandB,2, +func_227356_e_,trunkHeight,2, +func_227357_f_,trunkHeightRandom,2, +func_227358_g_,trunkTopOffset,2, +func_227359_h_,trunkTopOffsetRandom,2, +func_227360_i_,foliageHeight,2, +func_227361_j_,foliageHeightRandom,2, +func_227362_k_,maxWaterDepth,2, +func_227373_a_,setFromSapling,2, +func_227376_b_,deserialize,2, +func_227384_a_,placeLeavesRow,2, +func_227385_a_,placeLeaf,2, +func_227391_a_,deserialize,2, +func_227392_a_,register,2, +func_227407_a_,add,2, +func_227446_a_,configured,2, +func_228054_a_,getColor,0, +func_228358_a_,getAverageGrassColor,0, +func_228359_a_,getAverageColor,0, +func_228361_b_,getAverageFoliageColor,0, +func_228363_c_,getAverageWaterColor,0, diff --git a/src/main/java/biomesoplenty/core/ClientProxy.java b/src/main/java/biomesoplenty/core/ClientProxy.java index 1dbe02bab..e0db0073b 100644 --- a/src/main/java/biomesoplenty/core/ClientProxy.java +++ b/src/main/java/biomesoplenty/core/ClientProxy.java @@ -32,12 +32,12 @@ public class ClientProxy extends CommonProxy //Grass Coloring blockColors.register((state, world, pos, tintIndex) -> - world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.get(0.5D, 1.0D), + world != null && pos != null ? BiomeColors.getAverageGrassColor(world, pos) : GrassColors.get(0.5D, 1.0D), BOPBlocks.sprout, BOPBlocks.watergrass, BOPBlocks.potted_sprout); //Foliage Coloring blockColors.register((state, world, pos, tintIndex) -> - world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefault(), + world != null && pos != null ? BiomeColors.getAverageFoliageColor(world, pos) : FoliageColors.getDefault(), BOPBlocks.bush, BOPBlocks.flowering_oak_leaves, BOPBlocks.mahogany_leaves, BOPBlocks.palm_leaves, BOPBlocks.willow_leaves, BOPBlocks.willow_vine);