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

@@ -99,7 +99,7 @@ public class ClientCommandHandler extends CommandHandler
private TextComponentTranslation format(TextFormatting color, String str, Object... args)
{
TextComponentTranslation ret = new TextComponentTranslation(str, args);
ret.getChatStyle().setColor(color);
ret.getStyle().setColor(color);
return ret;
}
@@ -113,7 +113,7 @@ public class GuiIngameForge extends GuiIngame
if (renderHelmet) renderHelmet(res, partialTicks);
if (renderPortal && !mc.thePlayer.isPotionActive(MobEffects.confusion))
if (renderPortal && !mc.thePlayer.isPotionActive(MobEffects.NAUSEA))
{
renderPortal(res, partialTicks);
}
@@ -193,7 +193,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderCrosshairs(float partialTicks)
{
if (pre(CROSSHAIRS)) return;
bind(Gui.icons);
bind(Gui.ICONS);
GlStateManager.enableBlend();
super.renderAttackIndicator(partialTicks, res);
post(CROSSHAIRS);
@@ -217,7 +217,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderBossHealth()
{
if (pre(BOSSHEALTH)) return;
bind(Gui.icons);
bind(Gui.ICONS);
GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
mc.mcProfiler.startSection("bossHealth");
GlStateManager.enableBlend();
@@ -235,7 +235,7 @@ public class GuiIngameForge extends GuiIngame
if (this.mc.gameSettings.thirdPersonView == 0 && itemstack != null && itemstack.getItem() != null)
{
if (itemstack.getItem() == Item.getItemFromBlock(Blocks.pumpkin))
if (itemstack.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN))
{
renderPumpkinOverlay(res);
}
@@ -321,7 +321,7 @@ public class GuiIngameForge extends GuiIngame
int left = width / 2 + 91;
int top = height - right_height;
if (player.isInsideOfMaterial(Material.water))
if (player.isInsideOfMaterial(Material.WATER))
{
int air = player.getAir();
int full = MathHelper.ceiling_double_int((double)(air - 2) * 10.0D / 300.0D);
@@ -341,7 +341,7 @@ public class GuiIngameForge extends GuiIngame
public void renderHealth(int width, int height)
{
bind(icons);
bind(ICONS);
if (pre(HEALTH)) return;
mc.mcProfiler.startSection("health");
GlStateManager.enableBlend();
@@ -386,7 +386,7 @@ public class GuiIngameForge extends GuiIngame
if (rowHeight != 10) left_height += 10 - rowHeight;
int regen = -1;
if (player.isPotionActive(MobEffects.regeneration))
if (player.isPotionActive(MobEffects.REGENERATION))
{
regen = updateCounter % 25;
}
@@ -394,8 +394,8 @@ public class GuiIngameForge extends GuiIngame
final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0);
final int BACKGROUND = (highlight ? 25 : 16);
int MARGIN = 16;
if (player.isPotionActive(MobEffects.poison)) MARGIN += 36;
else if (player.isPotionActive(MobEffects.wither)) MARGIN += 72;
if (player.isPotionActive(MobEffects.POISON)) MARGIN += 36;
else if (player.isPotionActive(MobEffects.WITHER)) MARGIN += 72;
float absorbRemaining = absorb;
for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i)
@@ -469,7 +469,7 @@ public class GuiIngameForge extends GuiIngame
int icon = 16;
byte background = 0;
if (mc.thePlayer.isPotionActive(MobEffects.hunger))
if (mc.thePlayer.isPotionActive(MobEffects.HUNGER))
{
icon += 36;
background = 13;
@@ -526,7 +526,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderExperience(int width, int height)
{
bind(icons);
bind(ICONS);
if (pre(EXPERIENCE)) return;
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.disableBlend();
@@ -577,7 +577,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderJumpBar(int width, int height)
{
bind(icons);
bind(ICONS);
if (pre(JUMPBAR)) return;
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.disableBlend();
@@ -792,7 +792,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderPlayerList(int width, int height)
{
ScoreObjective scoreobjective = this.mc.theWorld.getScoreboard().getObjectiveInDisplaySlot(0);
NetHandlerPlayClient handler = mc.thePlayer.sendQueue;
NetHandlerPlayClient handler = mc.thePlayer.connection;
if (mc.gameSettings.keyBindPlayerList.isKeyDown() && (!mc.isIntegratedServerRunning() || handler.getPlayerInfoMap().size() > 1 || scoreobjective != null))
{
@@ -813,7 +813,7 @@ public class GuiIngameForge extends GuiIngame
Entity tmp = player.getRidingEntity();
if (!(tmp instanceof EntityLivingBase)) return;
bind(icons);
bind(ICONS);
if (pre(HEALTHMOUNT)) return;
@@ -182,7 +182,7 @@ public final class ModelLoader extends ModelBakery
@Override
protected void loadBlocks()
{
List<Block> blocks = Lists.newArrayList(Iterables.filter(Block.blockRegistry, new Predicate<Block>()
List<Block> blocks = Lists.newArrayList(Iterables.filter(Block.REGISTRY, new Predicate<Block>()
{
public boolean apply(Block block)
{
@@ -266,7 +266,7 @@ public final class ModelLoader extends ModelBakery
registerVariantNames();
List<Item> items = Lists.newArrayList(Iterables.filter(Item.itemRegistry, new Predicate<Item>()
List<Item> items = Lists.newArrayList(Iterables.filter(Item.REGISTRY, new Predicate<Item>()
{
public boolean apply(Item item)
{
@@ -336,7 +336,7 @@ public final class ModelLoader extends ModelBakery
}
// empty bucket
for(String s : getVariantNames(Items.bucket))
for(String s : getVariantNames(Items.BUCKET))
{
ModelResourceLocation memory = getInventoryVariant(s);
IModel model = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forge", "item/bucket"));
@@ -347,23 +347,23 @@ public final class ModelLoader extends ModelBakery
}
}
setBucketModel(Items.water_bucket);
setBucketModel(Items.lava_bucket);
setBucketModel(Items.WATER_BUCKET);
setBucketModel(Items.LAVA_BUCKET);
// milk bucket only replaced if some mod adds milk
if(FluidRegistry.isFluidRegistered("milk"))
{
// can the milk be put into a bucket?
Fluid milk = FluidRegistry.getFluid("milk");
FluidStack milkStack = new FluidStack(milk, FluidContainerRegistry.BUCKET_VOLUME);
if(FluidContainerRegistry.getContainerCapacity(milkStack, new ItemStack(Items.bucket)) == FluidContainerRegistry.BUCKET_VOLUME)
if(FluidContainerRegistry.getContainerCapacity(milkStack, new ItemStack(Items.BUCKET)) == FluidContainerRegistry.BUCKET_VOLUME)
{
setBucketModel(Items.milk_bucket);
setBucketModel(Items.MILK_BUCKET);
}
}
else
{
// milk bucket if no milk fluid is present
for(String s : getVariantNames(Items.milk_bucket))
for(String s : getVariantNames(Items.MILK_BUCKET))
{
ModelResourceLocation memory = getInventoryVariant(s);
IModel model = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forge", "item/bucket_milk"));
@@ -70,7 +70,7 @@ public class AnimationModelBase<T extends Entity> extends ModelBase implements I
lighter.setParent(new VertexBufferConsumer(VertexBuffer));
lighter.setWorld(entity.worldObj);
lighter.setState(Blocks.air.getDefaultState());
lighter.setState(Blocks.AIR.getDefaultState());
lighter.setBlockPos(pos);
boolean empty = true;
List<BakedQuad> quads = bakedModel.getQuads(null, null, 0);
@@ -19,7 +19,7 @@ public abstract class FastTESR<T extends TileEntity> extends TileEntitySpecialRe
{
Tessellator tessellator = Tessellator.getInstance();
VertexBuffer VertexBuffer = tessellator.getBuffer();
this.bindTexture(TextureMap.locationBlocksTexture);
this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
RenderHelper.disableStandardItemLighting();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.enableBlend();
@@ -11,7 +11,7 @@ public enum KeyModifier {
@Override
public boolean matches(int keyCode)
{
if (Minecraft.isRunningOnMac)
if (Minecraft.IS_RUNNING_ON_MAC)
{
return keyCode == Keyboard.KEY_LMETA || keyCode == Keyboard.KEY_RMETA;
}
@@ -31,7 +31,7 @@ public enum KeyModifier {
public String getLocalizedComboName(int keyCode)
{
String keyName = GameSettings.getKeyDisplayString(keyCode);
String localizationFormatKey = Minecraft.isRunningOnMac ? "forge.controlsgui.control.mac" : "forge.controlsgui.control";
String localizationFormatKey = Minecraft.IS_RUNNING_ON_MAC ? "forge.controlsgui.control.mac" : "forge.controlsgui.control";
return I18n.format(localizationFormatKey, keyName);
}
},