Skip to content

Commit cdc86e9

Browse files
LexManosLexManos
committed
Update mappoings snapshot to 20160518
1 parent b9ac73b commit cdc86e9

File tree

60 files changed

+514
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+514
-810
lines changed

‎build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ apply plugin: "net.minecraftforge.gradle.launch4j"
2727

2828
minecraft {
2929
version = "1.9.4"
30-
mappings = 'snapshot_nodoc_20160312'
31-
//mappings = "snapshot_nodoc_20151122"
30+
mappings = 'snapshot_nodoc_20160518'
3231
workspaceDir = "projects"
3332
versionJson = "jsons/1.9.4-dev.json"
3433
buildUserdev = true
@@ -377,6 +376,7 @@ task setupForge { dependsOn 'setup' }
377376
task buildPackages { dependsOn 'build' }
378377

379378
//Temporary hack to fix compile errors caused by mappings shading in Bootstrap
379+
/*
380380
task fixParams << {
381381
logger.lifecycle('Fixing param names!')
382382
def params = new File(extractMcpMappings.destinationDir, 'params.csv')
@@ -386,3 +386,4 @@ task fixParams << {
386386
}
387387
fixParams.dependsOn('extractMcpMappings')
388388
extractMcpMappings.finalizedBy('fixParams')
389+
*/

‎mdk/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
12+
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
1313
}
1414
}
1515
apply plugin: 'net.minecraftforge.gradle.forge'

‎patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,10 @@
162162
this.func_175552_ct();
163163
return p_180482_2_;
164164
}
165+
@@ -1030,4 +1077,6 @@
166+
return ((Integer)this.func_76341_a()).intValue() >= ((Integer)this.func_76340_b()).intValue() ? ((Integer)this.func_76341_a()).intValue() : ((Integer)this.func_76341_a()).intValue() + p_179412_1_.nextInt(((Integer)this.func_76340_b()).intValue() - ((Integer)this.func_76341_a()).intValue() + 1);
167+
}
168+
}
169+
+ //MODDERS DO NOT USE OR EDIT THIS IN ANY WAY IT WILL HAVE NO EFFECT, THIS IS JUST IN HERE TO ALLOW FORGE TO ACCESS IT
170+
+ public static ITradeList[][][][] GET_TRADES_DONT_USE(){ return field_175561_bA; }
171+
}

‎patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
+ if (p_180614_6_ == EnumFacing.UP && iblockstate.func_177230_c() instanceof BlockFence) //Forge: Fix Vanilla bug comparing state instead of block
99
{
1010
d0 = 0.5D;
11-
}
11+
}

‎patches/minecraft/net/minecraft/world/World.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@
585585
{
586586
j = 1;
587587
}
588-
@@ -2692,7 +2867,7 @@
588+
@@ -2691,7 +2866,7 @@
589589
int j4 = j2 + enumfacing.func_96559_d();
590590
int k4 = k2 + enumfacing.func_82599_e();
591591
blockpos$pooledmutableblockpos.func_185343_d(i4, j4, k4);

‎src/main/java/net/minecraftforge/client/ClientCommandHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public int executeCommand(ICommandSender sender, String message)
9999
private TextComponentTranslation format(TextFormatting color, String str, Object... args)
100100
{
101101
TextComponentTranslation ret = new TextComponentTranslation(str, args);
102-
ret.getChatStyle().setColor(color);
102+
ret.getStyle().setColor(color);
103103
return ret;
104104
}
105105

‎src/main/java/net/minecraftforge/client/GuiIngameForge.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void renderGameOverlay(float partialTicks)
113113

114114
if (renderHelmet) renderHelmet(res, partialTicks);
115115

116-
if (renderPortal && !mc.thePlayer.isPotionActive(MobEffects.confusion))
116+
if (renderPortal && !mc.thePlayer.isPotionActive(MobEffects.NAUSEA))
117117
{
118118
renderPortal(res, partialTicks);
119119
}
@@ -193,7 +193,7 @@ public ScaledResolution getResolution()
193193
protected void renderCrosshairs(float partialTicks)
194194
{
195195
if (pre(CROSSHAIRS)) return;
196-
bind(Gui.icons);
196+
bind(Gui.ICONS);
197197
GlStateManager.enableBlend();
198198
super.renderAttackIndicator(partialTicks, res);
199199
post(CROSSHAIRS);
@@ -217,7 +217,7 @@ protected void renderSubtitles(ScaledResolution resolution)
217217
protected void renderBossHealth()
218218
{
219219
if (pre(BOSSHEALTH)) return;
220-
bind(Gui.icons);
220+
bind(Gui.ICONS);
221221
GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
222222
mc.mcProfiler.startSection("bossHealth");
223223
GlStateManager.enableBlend();
@@ -235,7 +235,7 @@ private void renderHelmet(ScaledResolution res, float partialTicks)
235235

236236
if (this.mc.gameSettings.thirdPersonView == 0 && itemstack != null && itemstack.getItem() != null)
237237
{
238-
if (itemstack.getItem() == Item.getItemFromBlock(Blocks.pumpkin))
238+
if (itemstack.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN))
239239
{
240240
renderPumpkinOverlay(res);
241241
}
@@ -321,7 +321,7 @@ protected void renderAir(int width, int height)
321321
int left = width / 2 + 91;
322322
int top = height - right_height;
323323

324-
if (player.isInsideOfMaterial(Material.water))
324+
if (player.isInsideOfMaterial(Material.WATER))
325325
{
326326
int air = player.getAir();
327327
int full = MathHelper.ceiling_double_int((double)(air - 2) * 10.0D / 300.0D);
@@ -341,7 +341,7 @@ protected void renderAir(int width, int height)
341341

342342
public void renderHealth(int width, int height)
343343
{
344-
bind(icons);
344+
bind(ICONS);
345345
if (pre(HEALTH)) return;
346346
mc.mcProfiler.startSection("health");
347347
GlStateManager.enableBlend();
@@ -386,16 +386,16 @@ else if (health > this.playerHealth && player.hurtResistantTime > 0)
386386
if (rowHeight != 10) left_height += 10 - rowHeight;
387387

388388
int regen = -1;
389-
if (player.isPotionActive(MobEffects.regeneration))
389+
if (player.isPotionActive(MobEffects.REGENERATION))
390390
{
391391
regen = updateCounter % 25;
392392
}
393393

394394
final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0);
395395
final int BACKGROUND = (highlight ? 25 : 16);
396396
int MARGIN = 16;
397-
if (player.isPotionActive(MobEffects.poison)) MARGIN += 36;
398-
else if (player.isPotionActive(MobEffects.wither)) MARGIN += 72;
397+
if (player.isPotionActive(MobEffects.POISON)) MARGIN += 36;
398+
else if (player.isPotionActive(MobEffects.WITHER)) MARGIN += 72;
399399
float absorbRemaining = absorb;
400400

401401
for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i)
@@ -469,7 +469,7 @@ public void renderFood(int width, int height)
469469
int icon = 16;
470470
byte background = 0;
471471

472-
if (mc.thePlayer.isPotionActive(MobEffects.hunger))
472+
if (mc.thePlayer.isPotionActive(MobEffects.HUNGER))
473473
{
474474
icon += 36;
475475
background = 13;
@@ -526,7 +526,7 @@ protected void renderSleepFade(int width, int height)
526526

527527
protected void renderExperience(int width, int height)
528528
{
529-
bind(icons);
529+
bind(ICONS);
530530
if (pre(EXPERIENCE)) return;
531531
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
532532
GlStateManager.disableBlend();
@@ -577,7 +577,7 @@ protected void renderExperience(int width, int height)
577577

578578
protected void renderJumpBar(int width, int height)
579579
{
580-
bind(icons);
580+
bind(ICONS);
581581
if (pre(JUMPBAR)) return;
582582
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
583583
GlStateManager.disableBlend();
@@ -792,7 +792,7 @@ protected void renderChat(int width, int height)
792792
protected void renderPlayerList(int width, int height)
793793
{
794794
ScoreObjective scoreobjective = this.mc.theWorld.getScoreboard().getObjectiveInDisplaySlot(0);
795-
NetHandlerPlayClient handler = mc.thePlayer.sendQueue;
795+
NetHandlerPlayClient handler = mc.thePlayer.connection;
796796

797797
if (mc.gameSettings.keyBindPlayerList.isKeyDown() && (!mc.isIntegratedServerRunning() || handler.getPlayerInfoMap().size() > 1 || scoreobjective != null))
798798
{
@@ -813,7 +813,7 @@ protected void renderHealthMount(int width, int height)
813813
Entity tmp = player.getRidingEntity();
814814
if (!(tmp instanceof EntityLivingBase)) return;
815815

816-
bind(icons);
816+
bind(ICONS);
817817

818818
if (pre(HEALTHMOUNT)) return;
819819

‎src/main/java/net/minecraftforge/client/model/ModelLoader.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ protected void loadMultipartVariantModels() {}
182182
@Override
183183
protected void loadBlocks()
184184
{
185-
List<Block> blocks = Lists.newArrayList(Iterables.filter(Block.blockRegistry, new Predicate<Block>()
185+
List<Block> blocks = Lists.newArrayList(Iterables.filter(Block.REGISTRY, new Predicate<Block>()
186186
{
187187
public boolean apply(Block block)
188188
{
@@ -266,7 +266,7 @@ protected void loadItemModels()
266266

267267
registerVariantNames();
268268

269-
List<Item> items = Lists.newArrayList(Iterables.filter(Item.itemRegistry, new Predicate<Item>()
269+
List<Item> items = Lists.newArrayList(Iterables.filter(Item.REGISTRY, new Predicate<Item>()
270270
{
271271
public boolean apply(Item item)
272272
{
@@ -336,7 +336,7 @@ public int compare(Item i1, Item i2)
336336
}
337337

338338
// empty bucket
339-
for(String s : getVariantNames(Items.bucket))
339+
for(String s : getVariantNames(Items.BUCKET))
340340
{
341341
ModelResourceLocation memory = getInventoryVariant(s);
342342
IModel model = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forge", "item/bucket"));
@@ -347,23 +347,23 @@ public int compare(Item i1, Item i2)
347347
}
348348
}
349349

350-
setBucketModel(Items.water_bucket);
351-
setBucketModel(Items.lava_bucket);
350+
setBucketModel(Items.WATER_BUCKET);
351+
setBucketModel(Items.LAVA_BUCKET);
352352
// milk bucket only replaced if some mod adds milk
353353
if(FluidRegistry.isFluidRegistered("milk"))
354354
{
355355
// can the milk be put into a bucket?
356356
Fluid milk = FluidRegistry.getFluid("milk");
357357
FluidStack milkStack = new FluidStack(milk, FluidContainerRegistry.BUCKET_VOLUME);
358-
if(FluidContainerRegistry.getContainerCapacity(milkStack, new ItemStack(Items.bucket)) == FluidContainerRegistry.BUCKET_VOLUME)
358+
if(FluidContainerRegistry.getContainerCapacity(milkStack, new ItemStack(Items.BUCKET)) == FluidContainerRegistry.BUCKET_VOLUME)
359359
{
360-
setBucketModel(Items.milk_bucket);
360+
setBucketModel(Items.MILK_BUCKET);
361361
}
362362
}
363363
else
364364
{
365365
// milk bucket if no milk fluid is present
366-
for(String s : getVariantNames(Items.milk_bucket))
366+
for(String s : getVariantNames(Items.MILK_BUCKET))
367367
{
368368
ModelResourceLocation memory = getInventoryVariant(s);
369369
IModel model = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forge", "item/bucket_milk"));

‎src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void render(Entity entity, float limbSwing, float limbSwingSpeed, float t
7070

7171
lighter.setParent(new VertexBufferConsumer(VertexBuffer));
7272
lighter.setWorld(entity.worldObj);
73-
lighter.setState(Blocks.air.getDefaultState());
73+
lighter.setState(Blocks.AIR.getDefaultState());
7474
lighter.setBlockPos(pos);
7575
boolean empty = true;
7676
List<BakedQuad> quads = bakedModel.getQuads(null, null, 0);

‎src/main/java/net/minecraftforge/client/model/animation/FastTESR.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public final void renderTileEntityAt(T te, double x, double y, double z, float p
1919
{
2020
Tessellator tessellator = Tessellator.getInstance();
2121
VertexBuffer VertexBuffer = tessellator.getBuffer();
22-
this.bindTexture(TextureMap.locationBlocksTexture);
22+
this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
2323
RenderHelper.disableStandardItemLighting();
2424
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
2525
GlStateManager.enableBlend();

0 commit comments

Comments
 (0)