keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Update mcp mappings to 20171003

Browse source
This commit is contained in:
mezz 2017-10-03 22:08:36 -07:00
parent f494117453
commit 083daeb5ed
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -30,7 +30,7 @@ apply plugin: "net.minecraftforge.gradle.launch4j"
minecraft.version = "1.12.2" minecraft.version = "1.12.2"
minecraft { minecraft {
mappings = 'snapshot_nodoc_20170624' mappings = 'snapshot_nodoc_20171003'
workspaceDir = "projects" workspaceDir = "projects"
versionJson = "jsons/${minecraft.version}-dev.json" versionJson = "jsons/${minecraft.version}-dev.json"
buildUserdev = true buildUserdev = true

2
src/main/java/net/minecraftforge/client/ForgeHooksClient.java
View file

@ -271,7 +271,7 @@ public class ForgeHooksClient
{ {
BlockPos pos = center.add(x, 0, z); BlockPos pos = center.add(x, 0, z);
Biome biome = world.getBiome(pos); Biome biome = world.getBiome(pos);
int colour = biome.getSkyColorByTemp(biome.getFloatTemperature(pos)); int colour = biome.getSkyColorByTemp(biome.getTemperature(pos));
r += (colour & 0xFF0000) >> 16; r += (colour & 0xFF0000) >> 16;
g += (colour & 0x00FF00) >> 8; g += (colour & 0x00FF00) >> 8;
b += colour & 0x0000FF; b += colour & 0x0000FF;

10
src/main/java/net/minecraftforge/common/BiomeDictionary.java
View file

@ -255,7 +255,7 @@ public class BiomeDictionary
{ {
if (biome.decorator.treesPerChunk >= 3) if (biome.decorator.treesPerChunk >= 3)
{ {
if (biome.isHighHumidity() && biome.getTemperature() >= 0.9F) if (biome.isHighHumidity() && biome.getDefaultTemperature() >= 0.9F)
{ {
BiomeDictionary.addTypes(biome, JUNGLE); BiomeDictionary.addTypes(biome, JUNGLE);
} }
@ -263,7 +263,7 @@ public class BiomeDictionary
{ {
BiomeDictionary.addTypes(biome, FOREST); BiomeDictionary.addTypes(biome, FOREST);
if (biome.getTemperature() <= 0.2f) if (biome.getDefaultTemperature() <= 0.2f)
{ {
BiomeDictionary.addTypes(biome, CONIFEROUS); BiomeDictionary.addTypes(biome, CONIFEROUS);
} }
@ -287,12 +287,12 @@ public class BiomeDictionary
BiomeDictionary.addTypes(biome, DRY); BiomeDictionary.addTypes(biome, DRY);
} }
if (biome.getTemperature() > 0.85f) if (biome.getDefaultTemperature() > 0.85f)
{ {
BiomeDictionary.addTypes(biome, HOT); BiomeDictionary.addTypes(biome, HOT);
} }
if (biome.getTemperature() < 0.15f) if (biome.getDefaultTemperature() < 0.15f)
{ {
BiomeDictionary.addTypes(biome, COLD); BiomeDictionary.addTypes(biome, COLD);
} }
@ -338,7 +338,7 @@ public class BiomeDictionary
BiomeDictionary.addTypes(biome, SNOWY); BiomeDictionary.addTypes(biome, SNOWY);
} }
if (biome.topBlock != Blocks.SAND && biome.getTemperature() >= 1.0f && biome.getRainfall() < 0.2f) if (biome.topBlock != Blocks.SAND && biome.getDefaultTemperature() >= 1.0f && biome.getRainfall() < 0.2f)
{ {
BiomeDictionary.addTypes(biome, SAVANNA); BiomeDictionary.addTypes(biome, SAVANNA);
} }

2
src/main/java/net/minecraftforge/common/ForgeHooks.java
View file

@ -780,7 +780,7 @@ public class ForgeHooks
&& !itemstack.getItem().canDestroyBlockInCreative(world, pos, itemstack, entityPlayer)) && !itemstack.getItem().canDestroyBlockInCreative(world, pos, itemstack, entityPlayer))
preCancelEvent = true; preCancelEvent = true;
if (gameType.isAdventure()) if (gameType.hasLimitedInteractions())
{ {
if (gameType == GameType.SPECTATOR) if (gameType == GameType.SPECTATOR)
preCancelEvent = true; preCancelEvent = true;

2
src/main/java/net/minecraftforge/registries/GameData.java
View file

@ -423,7 +423,7 @@ public class GameData
@Override public ItemStack getCraftingResult(InventoryCrafting inv) { return result; } @Override public ItemStack getCraftingResult(InventoryCrafting inv) { return result; }
@Override public boolean canFit(int width, int height) { return false; } @Override public boolean canFit(int width, int height) { return false; }
@Override public ItemStack getRecipeOutput() { return result; } @Override public ItemStack getRecipeOutput() { return result; }
@Override public boolean isHidden() { return true; } @Override public boolean isDynamic() { return true; }
} }
} }

2
src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java
View file

@ -93,7 +93,7 @@ public class ItemLayerModelDebug
} }
@Override @Override
public float getStrVsBlock(ItemStack stack, IBlockState state) public float getDestroySpeed(ItemStack stack, IBlockState state)
{ {
return 10f; return 10f;
} }