Update mappoings snapshot to 20160518

This commit is contained in:
LexManos committed 2016-05-18 05:23:30 -07:00
1 parent b9ac73b0f1
commit cdc86e9af6
60 files changed
+514 -810

No files matched your search

@@ -147,7 +147,7 @@ public class BiomeDictionary
{
types = listSubTags(types);
if(Biome.biomeRegistry.getNameForObject(biome) != null)
if(Biome.REGISTRY.getNameForObject(biome) != null)
{
for(Type type : types)
{
@@ -161,7 +161,7 @@ public class BiomeDictionary
if(!isBiomeRegistered(biome))
{
ResourceLocation location = Biome.biomeRegistry.getNameForObject(biome);
ResourceLocation location = Biome.REGISTRY.getNameForObject(biome);
biomeInfoMap.put(location, new BiomeInfo(types));
}
else
@@ -249,7 +249,7 @@ public class BiomeDictionary
*/
public static boolean isBiomeRegistered(Biome biome)
{
return biomeInfoMap.containsKey(Biome.biomeRegistry.getNameForObject(biome));
return biomeInfoMap.containsKey(Biome.REGISTRY.getNameForObject(biome));
}
public static void registerAllBiomes()
@@ -265,9 +265,9 @@ public class BiomeDictionary
*/
public static void registerAllBiomesAndGenerateEvents()
{
for (ResourceLocation biomeResource : Biome.biomeRegistry.getKeys())
for (ResourceLocation biomeResource : Biome.REGISTRY.getKeys())
{
Biome biome = Biome.biomeRegistry.getObject(biomeResource);
Biome biome = Biome.REGISTRY.getObject(biomeResource);
if (biome.theBiomeDecorator instanceof DeferredBiomeDecorator)
{
@@ -373,20 +373,20 @@ public class BiomeDictionary
BiomeDictionary.registerBiomeType(biome, SNOWY);
}
if (biome.topBlock != Blocks.sand && biome.getTemperature() >= 1.0f && biome.getRainfall() < 0.2f)
if (biome.topBlock != Blocks.SAND && biome.getTemperature() >= 1.0f && biome.getRainfall() < 0.2f)
{
BiomeDictionary.registerBiomeType(biome, SAVANNA);
}
if (biome.topBlock == Blocks.sand )
if (biome.topBlock == Blocks.SAND)
{
BiomeDictionary.registerBiomeType(biome, SANDY);
}
else if (biome.topBlock == Blocks.mycelium)
else if (biome.topBlock == Blocks.MYCELIUM)
{
BiomeDictionary.registerBiomeType(biome, MUSHROOM);
}
if (biome.fillerBlock == Blocks.hardened_clay)
if (biome.fillerBlock == Blocks.HARDENED_CLAY)
{
BiomeDictionary.registerBiomeType(biome, MESA);
}
@@ -395,7 +395,7 @@ public class BiomeDictionary
//Internal implementation
private static BiomeInfo getBiomeInfo(Biome biome)
{
return biomeInfoMap.get(Biome.biomeRegistry.getNameForObject(biome));
return biomeInfoMap.get(Biome.REGISTRY.getNameForObject(biome));
}
private static void checkRegistration(Biome biome)
@@ -436,45 +436,45 @@ public class BiomeDictionary
private static void registerVanillaBiomes()
{
registerBiomeType(Biomes.ocean, OCEAN );
registerBiomeType(Biomes.plains, PLAINS );
registerBiomeType(Biomes.desert, HOT, DRY, SANDY );
registerBiomeType(Biomes.extremeHills, MOUNTAIN, HILLS );
registerBiomeType(Biomes.forest, FOREST );
registerBiomeType(Biomes.taiga, COLD, CONIFEROUS, FOREST );
registerBiomeType(Biomes.taigaHills, COLD, CONIFEROUS, FOREST, HILLS );
registerBiomeType(Biomes.swampland, WET, SWAMP );
registerBiomeType(Biomes.river, RIVER );
registerBiomeType(Biomes.frozenOcean, COLD, OCEAN, SNOWY );
registerBiomeType(Biomes.frozenRiver, COLD, RIVER, SNOWY );
registerBiomeType(Biomes.icePlains, COLD, SNOWY, WASTELAND );
registerBiomeType(Biomes.iceMountains, COLD, SNOWY, MOUNTAIN );
registerBiomeType(Biomes.beach, BEACH );
registerBiomeType(Biomes.desertHills, HOT, DRY, SANDY, HILLS );
registerBiomeType(Biomes.jungle, HOT, WET, DENSE, JUNGLE );
registerBiomeType(Biomes.jungleHills, HOT, WET, DENSE, JUNGLE, HILLS);
registerBiomeType(Biomes.forestHills, FOREST, HILLS );
registerBiomeType(Biomes.sky, COLD, DRY, END );
registerBiomeType(Biomes.hell, HOT, DRY, NETHER );
registerBiomeType(Biomes.mushroomIsland, MUSHROOM );
registerBiomeType(Biomes.extremeHillsEdge, MOUNTAIN );
registerBiomeType(Biomes.mushroomIslandShore, MUSHROOM, BEACH );
registerBiomeType(Biomes.jungleEdge, HOT, WET, JUNGLE, FOREST );
registerBiomeType(Biomes.deepOcean, OCEAN );
registerBiomeType(Biomes.stoneBeach, BEACH );
registerBiomeType(Biomes.coldBeach, COLD, BEACH, SNOWY );
registerBiomeType(Biomes.birchForest, FOREST );
registerBiomeType(Biomes.birchForestHills, FOREST, HILLS );
registerBiomeType(Biomes.roofedForest, SPOOKY, DENSE, FOREST );
registerBiomeType(Biomes.coldTaiga, COLD, CONIFEROUS, FOREST, SNOWY );
registerBiomeType(Biomes.coldTaigaHills, COLD, CONIFEROUS, FOREST, SNOWY, HILLS);
registerBiomeType(Biomes.megaTaiga, COLD, CONIFEROUS, FOREST );
registerBiomeType(Biomes.megaTaigaHills, COLD, CONIFEROUS, FOREST, HILLS );
registerBiomeType(Biomes.extremeHillsPlus, MOUNTAIN, FOREST, SPARSE );
registerBiomeType(Biomes.savanna, HOT, SAVANNA, PLAINS, SPARSE );
registerBiomeType(Biomes.savannaPlateau, HOT, SAVANNA, PLAINS, SPARSE );
registerBiomeType(Biomes.mesa, MESA, SANDY );
registerBiomeType(Biomes.mesaPlateau_F, MESA, SPARSE, SANDY );
registerBiomeType(Biomes.mesaPlateau, MESA, SANDY );
registerBiomeType(Biomes.OCEAN, OCEAN );
registerBiomeType(Biomes.PLAINS, PLAINS );
registerBiomeType(Biomes.DESERT, HOT, DRY, SANDY );
registerBiomeType(Biomes.EXTREME_HILLS, MOUNTAIN, HILLS );
registerBiomeType(Biomes.FOREST, FOREST );
registerBiomeType(Biomes.TAIGA, COLD, CONIFEROUS, FOREST );
registerBiomeType(Biomes.TAIGA_HILLS, COLD, CONIFEROUS, FOREST, HILLS );
registerBiomeType(Biomes.SWAMPLAND, WET, SWAMP );
registerBiomeType(Biomes.RIVER, RIVER );
registerBiomeType(Biomes.FROZEN_OCEAN, COLD, OCEAN, SNOWY );
registerBiomeType(Biomes.FROZEN_RIVER, COLD, RIVER, SNOWY );
registerBiomeType(Biomes.ICE_PLAINS, COLD, SNOWY, WASTELAND );
registerBiomeType(Biomes.ICE_MOUNTAINS, COLD, SNOWY, MOUNTAIN );
registerBiomeType(Biomes.BEACH, BEACH );
registerBiomeType(Biomes.DESERT_HILLS, HOT, DRY, SANDY, HILLS );
registerBiomeType(Biomes.JUNGLE, HOT, WET, DENSE, JUNGLE );
registerBiomeType(Biomes.JUNGLE_HILLS, HOT, WET, DENSE, JUNGLE, HILLS);
registerBiomeType(Biomes.FOREST_HILLS, FOREST, HILLS );
registerBiomeType(Biomes.SKY, COLD, DRY, END );
registerBiomeType(Biomes.HELL, HOT, DRY, NETHER );
registerBiomeType(Biomes.MUSHROOM_ISLAND, MUSHROOM );
registerBiomeType(Biomes.EXTREME_HILLS_EDGE, MOUNTAIN );
registerBiomeType(Biomes.MUSHROOM_ISLAND_SHORE, MUSHROOM, BEACH );
registerBiomeType(Biomes.JUNGLE_EDGE, HOT, WET, JUNGLE, FOREST );
registerBiomeType(Biomes.DEEP_OCEAN, OCEAN );
registerBiomeType(Biomes.STONE_BEACH, BEACH );
registerBiomeType(Biomes.COLD_BEACH, COLD, BEACH, SNOWY );
registerBiomeType(Biomes.BIRCH_FOREST, FOREST );
registerBiomeType(Biomes.BIRCH_FOREST_HILLS, FOREST, HILLS );
registerBiomeType(Biomes.ROOFED_FOREST, SPOOKY, DENSE, FOREST );
registerBiomeType(Biomes.COLD_TAIGA, COLD, CONIFEROUS, FOREST, SNOWY );
registerBiomeType(Biomes.COLD_TAIGA_HILLS, COLD, CONIFEROUS, FOREST, SNOWY, HILLS);
registerBiomeType(Biomes.REDWOOD_TAIGA, COLD, CONIFEROUS, FOREST );
registerBiomeType(Biomes.REDWOOD_TAIGA_HILLS, COLD, CONIFEROUS, FOREST, HILLS );
registerBiomeType(Biomes.EXTREME_HILLS_WITH_TREES, MOUNTAIN, FOREST, SPARSE );
registerBiomeType(Biomes.SAVANNA, HOT, SAVANNA, PLAINS, SPARSE );
registerBiomeType(Biomes.SAVANNA_PLATEAU, HOT, SAVANNA, PLAINS, SPARSE );
registerBiomeType(Biomes.MESA, MESA, SANDY );
registerBiomeType(Biomes.MESA_ROCK, MESA, SPARSE, SANDY );
registerBiomeType(Biomes.MESA_CLEAR_ROCK, MESA, SANDY );
}
}
@@ -25,9 +25,9 @@ public class BiomeManager
static
{
oceanBiomes.add(Biomes.ocean);
oceanBiomes.add(Biomes.deepOcean);
oceanBiomes.add(Biomes.frozenOcean);
oceanBiomes.add(Biomes.OCEAN);
oceanBiomes.add(Biomes.DEEP_OCEAN);
oceanBiomes.add(Biomes.FROZEN_OCEAN);
}
private static TrackedList<BiomeEntry>[] setupBiomes()
@@ -36,26 +36,26 @@ public class BiomeManager
TrackedList<BiomeEntry>[] currentBiomes = new TrackedList[BiomeType.values().length];
List<BiomeEntry> list = new ArrayList<BiomeEntry>();
list.add(new BiomeEntry(Biomes.forest, 10));
list.add(new BiomeEntry(Biomes.roofedForest, 10));
list.add(new BiomeEntry(Biomes.extremeHills, 10));
list.add(new BiomeEntry(Biomes.plains, 10));
list.add(new BiomeEntry(Biomes.birchForest, 10));
list.add(new BiomeEntry(Biomes.swampland, 10));
list.add(new BiomeEntry(Biomes.FOREST, 10));
list.add(new BiomeEntry(Biomes.ROOFED_FOREST, 10));
list.add(new BiomeEntry(Biomes.EXTREME_HILLS, 10));
list.add(new BiomeEntry(Biomes.PLAINS, 10));
list.add(new BiomeEntry(Biomes.BIRCH_FOREST, 10));
list.add(new BiomeEntry(Biomes.SWAMPLAND, 10));
currentBiomes[BiomeType.WARM.ordinal()] = new TrackedList<BiomeEntry>(list);
list.clear();
list.add(new BiomeEntry(Biomes.forest, 10));
list.add(new BiomeEntry(Biomes.extremeHills, 10));
list.add(new BiomeEntry(Biomes.taiga, 10));
list.add(new BiomeEntry(Biomes.plains, 10));
list.add(new BiomeEntry(Biomes.FOREST, 10));
list.add(new BiomeEntry(Biomes.EXTREME_HILLS, 10));
list.add(new BiomeEntry(Biomes.TAIGA, 10));
list.add(new BiomeEntry(Biomes.PLAINS, 10));
currentBiomes[BiomeType.COOL.ordinal()] = new TrackedList<BiomeEntry>(list);
list.clear();
list.add(new BiomeEntry(Biomes.icePlains, 30));
list.add(new BiomeEntry(Biomes.coldTaiga, 10));
list.add(new BiomeEntry(Biomes.ICE_PLAINS, 30));
list.add(new BiomeEntry(Biomes.COLD_TAIGA, 10));
currentBiomes[BiomeType.ICY.ordinal()] = new TrackedList<BiomeEntry>(list);
list.clear();
@@ -67,21 +67,21 @@ public class BiomeManager
public static void addVillageBiome(Biome biome, boolean canSpawn)
{
if (!MapGenVillage.villageSpawnBiomes.contains(biome))
if (!MapGenVillage.VILLAGE_SPAWN_BIOMES.contains(biome))
{
ArrayList<Biome> biomes = new ArrayList<Biome>(MapGenVillage.villageSpawnBiomes);
ArrayList<Biome> biomes = new ArrayList<Biome>(MapGenVillage.VILLAGE_SPAWN_BIOMES);
biomes.add(biome);
MapGenVillage.villageSpawnBiomes = biomes;
MapGenVillage.VILLAGE_SPAWN_BIOMES = biomes;
}
}
public static void removeVillageBiome(Biome biome)
{
if (MapGenVillage.villageSpawnBiomes.contains(biome))
if (MapGenVillage.VILLAGE_SPAWN_BIOMES.contains(biome))
{
ArrayList<Biome> biomes = new ArrayList<Biome>(MapGenVillage.villageSpawnBiomes);
ArrayList<Biome> biomes = new ArrayList<Biome>(MapGenVillage.VILLAGE_SPAWN_BIOMES);
biomes.remove(biome);
MapGenVillage.villageSpawnBiomes = biomes;
MapGenVillage.VILLAGE_SPAWN_BIOMES = biomes;
}
}
@@ -222,20 +222,20 @@ public class ForgeHooks
block.setHarvestLevel("axe", 0);
}
Blocks.obsidian.setHarvestLevel("pickaxe", 3);
Blocks.OBSIDIAN.setHarvestLevel("pickaxe", 3);
Block[] oreBlocks = new Block[] {
Blocks.emerald_ore, Blocks.emerald_block, Blocks.diamond_ore, Blocks.diamond_block,
Blocks.gold_ore, Blocks.gold_block, Blocks.redstone_ore, Blocks.lit_redstone_ore
Blocks.EMERALD_ORE, Blocks.EMERALD_BLOCK, Blocks.DIAMOND_ORE, Blocks.DIAMOND_BLOCK,
Blocks.GOLD_ORE, Blocks.GOLD_BLOCK, Blocks.REDSTONE_ORE, Blocks.LIT_REDSTONE_ORE
};
for (Block block : oreBlocks)
{
block.setHarvestLevel("pickaxe", 2);
}
Blocks.iron_ore.setHarvestLevel("pickaxe", 1);
Blocks.iron_block.setHarvestLevel("pickaxe", 1);
Blocks.lapis_ore.setHarvestLevel("pickaxe", 1);
Blocks.lapis_block.setHarvestLevel("pickaxe", 1);
Blocks.quartz_ore.setHarvestLevel("pickaxe", 0);
Blocks.IRON_ORE.setHarvestLevel("pickaxe", 1);
Blocks.IRON_BLOCK.setHarvestLevel("pickaxe", 1);
Blocks.LAPIS_ORE.setHarvestLevel("pickaxe", 1);
Blocks.LAPIS_BLOCK.setHarvestLevel("pickaxe", 1);
Blocks.QUARTZ_ORE.setHarvestLevel("pickaxe", 0);
}
public static int getTotalArmorValue(EntityPlayer player)
@@ -258,11 +258,11 @@ public class ForgeHooks
static
{
seedList.add(new SeedEntry(new ItemStack(Items.wheat_seeds), 10)
seedList.add(new SeedEntry(new ItemStack(Items.WHEAT_SEEDS), 10)
{
public ItemStack getStack(Random rand, int fortune)
{
return new ItemStack(Items.wheat_seeds, 1 + rand.nextInt(fortune * 2 + 1));
return new ItemStack(Items.WHEAT_SEEDS, 1 + rand.nextInt(fortune * 2 + 1));
}
});
initTools();
@@ -422,7 +422,7 @@ public class ForgeHooks
if (target.typeOfHit == RayTraceResult.Type.BLOCK)
{
s1 = Block.blockRegistry.getNameForObject(world.getBlockState(target.getBlockPos()).getBlock()).toString();
s1 = Block.REGISTRY.getNameForObject(world.getBlockState(target.getBlockPos()).getBlock()).toString();
}
else if (target.typeOfHit == RayTraceResult.Type.ENTITY)
{
@@ -440,7 +440,7 @@ public class ForgeHooks
if (isCreative)
{
player.inventory.func_184434_a(result);
player.inventory.setPickedItemStack(result);
Minecraft.getMinecraft().playerController.sendSlotPacket(player.getHeldItem(EnumHand.MAIN_HAND), 36 + player.inventory.currentItem);
return true;
}
@@ -636,9 +636,9 @@ public class ForgeHooks
// Set the click event and append the link.
ClickEvent click = new ClickEvent(ClickEvent.Action.OPEN_URL, url);
link.getChatStyle().setChatClickEvent(click);
link.getChatStyle().setUnderlined(true);
link.getChatStyle().setColor(TextFormatting.BLUE);
link.getStyle().setClickEvent(click);
link.getStyle().setUnderlined(true);
link.getStyle().setColor(TextFormatting.BLUE);
if (ichat == null)
ichat = link;
else
@@ -685,8 +685,8 @@ public class ForgeHooks
if (world.getTileEntity(pos) == null)
{
SPacketBlockChange packet = new SPacketBlockChange(world, pos);
packet.blockState = Blocks.air.getDefaultState();
entityPlayer.playerNetServerHandler.sendPacket(packet);
packet.blockState = Blocks.AIR.getDefaultState();
entityPlayer.connection.sendPacket(packet);
}
// Post the block break event
@@ -699,16 +699,16 @@ public class ForgeHooks
if (event.isCanceled())
{
// Let the client know the block still exists
entityPlayer.playerNetServerHandler.sendPacket(new SPacketBlockChange(world, pos));
entityPlayer.connection.sendPacket(new SPacketBlockChange(world, pos));
// Update any tile entity data for this block
TileEntity tileentity = world.getTileEntity(pos);
if (tileentity != null)
{
Packet<?> pkt = tileentity.func_189518_D_();
Packet<?> pkt = tileentity.getUpdatePacket();
if (pkt != null)
{
entityPlayer.playerNetServerHandler.sendPacket(pkt);
entityPlayer.connection.sendPacket(pkt);
}
}
}
@@ -798,7 +798,7 @@ public class ForgeHooks
world.markAndNotifyBlock(snap.getPos(), null, oldBlock, newBlock, updateFlag);
}
player.addStat(StatList.func_188060_a(itemstack.getItem()));
player.addStat(StatList.getCraftStats(itemstack.getItem()));
}
}
world.capturedBlockSnapshots.clear();
@@ -19,7 +19,7 @@ public class VanillaBrewingRecipe implements IBrewingRecipe {
public boolean isInput(ItemStack stack)
{
Item item = stack.getItem();
return item == Items.potionitem || item == Items.splash_potion || item == Items.lingering_potion || item == Items.glass_bottle;
return item == Items.POTIONITEM || item == Items.SPLASH_POTION || item == Items.LINGERING_POTION || item == Items.GLASS_BOTTLE;
}
/**
@@ -78,7 +78,7 @@ public class ExtendedBlockState extends BlockStateContainer
{
if (!property.getAllowedValues().contains(value))
{
throw new IllegalArgumentException("Cannot set property " + property + " to " + value + " on block " + Block.blockRegistry.getNameForObject(getBlock()) + ", it is not an allowed value");
throw new IllegalArgumentException("Cannot set property " + property + " to " + value + " on block " + Block.REGISTRY.getNameForObject(getBlock()) + ", it is not an allowed value");
} else
{
if (this.getProperties().get(property) == value)
@@ -106,7 +106,7 @@ public class ExtendedBlockState extends BlockStateContainer
}
if(!property.isValid(value))
{
throw new IllegalArgumentException("Cannot set unlisted property " + property + " to " + value + " on block " + Block.blockRegistry.getNameForObject(getBlock()) + ", it is not an allowed value");
throw new IllegalArgumentException("Cannot set unlisted property " + property + " to " + value + " on block " + Block.REGISTRY.getNameForObject(getBlock()) + ", it is not an allowed value");
}
Map<IUnlistedProperty<?>, Optional<?>> newMap = new HashMap<IUnlistedProperty<?>, Optional<?>>(unlistedProperties);
newMap.put(property, Optional.fromNullable(value));
@@ -45,7 +45,7 @@ public class BlockSnapshot implements Serializable
if (te != null)
{
nbt = new NBTTagCompound();
te.func_189515_b(getNbt());
te.writeToNBT(getNbt());
}
else nbt = null;
if (DEBUG)
@@ -139,7 +139,7 @@ public class BlockSnapshot implements Serializable
public TileEntity getTileEntity()
{
if (getNbt() != null)
return TileEntity.func_189514_c(getNbt());
return TileEntity.create(getNbt());
else return null;
}