Update mappings and forge

This commit is contained in:
Bernhard Bonigl committed 2016-04-18 15:00:00 +02:00
1 parent c9d86495c3
commit f31538b2ab
8 files changed
+30 -30

No files matched your search

@@ -146,7 +146,7 @@ public class PageData implements IDataItem {
addSwap(DataLocation.class, new ValueHotswap<DataLocation>() {
@Override
public void swap(BookRepository source, DataLocation object) {
object.location = object.file == "$BLOCK_ATLAS" ? TextureMap.locationBlocksTexture : source
object.location = object.file == "$BLOCK_ATLAS" ? TextureMap.LOCATION_BLOCKS_TEXTURE : source
.getResourceLocation(object.file, true);
}
}.getClass());
@@ -66,19 +66,19 @@ public class ContentSmelting extends PageContent {
//TODO ask JEI for fuel list if it is present
ItemStack[] fuels = new ItemStack[13];
fuels[0] = new ItemStack(Blocks.wooden_slab);
fuels[1] = new ItemStack(Blocks.planks);
fuels[2] = new ItemStack(Blocks.coal_block);
fuels[3] = new ItemStack(Items.wooden_pickaxe);
fuels[4] = new ItemStack(Items.wooden_sword);
fuels[5] = new ItemStack(Items.wooden_hoe);
fuels[6] = new ItemStack(Items.stick);
fuels[7] = new ItemStack(Items.coal);
fuels[8] = new ItemStack(Items.lava_bucket);
fuels[9] = new ItemStack(Blocks.sapling);
fuels[10] = new ItemStack(Items.blaze_rod);
fuels[11] = new ItemStack(Items.wooden_shovel);
fuels[12] = new ItemStack(Items.wooden_axe);
fuels[0] = new ItemStack(Blocks.WOODEN_SLAB);
fuels[1] = new ItemStack(Blocks.PLANKS);
fuels[2] = new ItemStack(Blocks.COAL_BLOCK);
fuels[3] = new ItemStack(Items.WOODEN_PICKAXE);
fuels[4] = new ItemStack(Items.WOODEN_SWORD);
fuels[5] = new ItemStack(Items.WOODEN_HOE);
fuels[6] = new ItemStack(Items.STICK);
fuels[7] = new ItemStack(Items.COAL);
fuels[8] = new ItemStack(Items.LAVA_BUCKET);
fuels[9] = new ItemStack(Blocks.SAPLING);
fuels[10] = new ItemStack(Items.BLAZE_ROD);
fuels[11] = new ItemStack(Items.WOODEN_SHOVEL);
fuels[12] = new ItemStack(Items.WOODEN_AXE);
return fuels;
}
@@ -56,12 +56,12 @@ public class ItemStackData {
try {
item = CommandGive.getItemByText(null, id);
} catch(NumberInvalidException e) {
item = Item.getItemFromBlock(Blocks.barrier);
item = Item.getItemFromBlock(Blocks.BARRIER);
isMissingItem = true;
}
if(item == null) {
item = Item.getItemFromBlock(Blocks.barrier);
item = Item.getItemFromBlock(Blocks.BARRIER);
isMissingItem = true;
}
@@ -92,7 +92,7 @@ public class ItemStackData {
public static ItemStackData getItemStackData(ItemStack stack, boolean ignoreNbt) {
ItemStackData data = new ItemStackData();
data.id = Item.itemRegistry.getNameForObject(stack.getItem()).toString();
data.id = Item.REGISTRY.getNameForObject(stack.getItem()).toString();
data.amount = (byte) stack.stackSize;
data.damage = (short) stack.getItemDamage();
if(!ignoreNbt && stack.getTagCompound() != null) {
@@ -95,8 +95,8 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
this.drawCenteredString(this.fontRendererObj, I18n
.format("multiplayer.downloadingStats"), this.width / 2, this.height / 2, 16777215);
this.drawCenteredString(this.fontRendererObj, lanSearchStates[(int) (Minecraft
.getSystemTime() / 150L % (long) lanSearchStates.length)], this.width / 2, this.height / 2 + this.fontRendererObj.FONT_HEIGHT * 2, 16777215);
this.drawCenteredString(this.fontRendererObj, LOADING_STRINGS[(int) (Minecraft
.getSystemTime() / 150L % (long) LOADING_STRINGS.length)], this.width / 2, this.height / 2 + this.fontRendererObj.FONT_HEIGHT * 2, 16777215);
return;
}
@@ -121,14 +121,14 @@ public class ElementStructure extends SizedBookElement {
Block block = state.getBlock();
if(block == Blocks.air) {
if(block == Blocks.AIR) {
continue;
}
GlStateManager.pushMatrix();
GlStateManager.enableDepth();
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
if(block == null) {
return;
@@ -162,7 +162,7 @@ public class ElementStructure extends SizedBookElement {
GlStateManager.color(1F, 1F, 1F);
GlStateManager.popMatrix();
renderEngine.getTexture(TextureMap.locationBlocksTexture).restoreLastBlurMipmap();
renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).restoreLastBlurMipmap();
}
}
}
@@ -276,11 +276,11 @@ public class ElementStructure extends SizedBookElement {
@Override
public IBlockState getBlockState(BlockPos pos) {
if(!isValid(pos)) {
return Blocks.air.getDefaultState();
return Blocks.AIR.getDefaultState();
}
Block block = Block.getBlockById(blocks[pos.getX()][pos.getY()][pos.getZ()]);
if(block == null) {
return Blocks.air.getDefaultState();
return Blocks.AIR.getDefaultState();
}
return block.getActualState(block.getStateFromMeta(meta[pos.getX()][pos.getY()][pos.getZ()]), this, pos);
@@ -288,12 +288,12 @@ public class ElementStructure extends SizedBookElement {
@Override
public boolean isAirBlock(BlockPos pos) {
return !isValid(pos) || Block.getBlockById(blocks[pos.getX()][pos.getY()][pos.getZ()]) == Blocks.air;
return !isValid(pos) || Block.getBlockById(blocks[pos.getX()][pos.getY()][pos.getZ()]) == Blocks.AIR;
}
@Override
public BiomeGenBase getBiomeGenForCoords(BlockPos pos) {
return Biomes.jungle;
return Biomes.JUNGLE;
}
@Override
@@ -99,7 +99,7 @@ public abstract class BaseContainer<T extends TileEntity> extends Container {
public boolean canInteractWith(EntityPlayer playerIn) {
Block block = world.getBlockState(pos).getBlock();
// does the block we interacted with still exist?
if(block == Blocks.air || block != originalBlock) {
if(block == Blocks.AIR || block != originalBlock) {
return false;
}
@@ -183,7 +183,7 @@ public class TileInventory extends TileEntity implements IInventory {
@Override
public boolean isUseableByPlayer(EntityPlayer entityplayer) {
// block changed/got broken?
if(worldObj.getTileEntity(pos) != this || worldObj.getBlockState(pos).getBlock() == Blocks.air) {
if(worldObj.getTileEntity(pos) != this || worldObj.getBlockState(pos).getBlock() == Blocks.AIR) {
return false;
}