Update mappings to snapshot-20180908

Author: InsomniaKitten

build.gradle

@@ -44,7 +44,7 @@ dependencies {
 
 minecraft {
     version = '1.13'
-    mappings = 'snapshot_20180823'
+    mappings = 'snapshot_20180908'
     runDir = 'run'
     tweakClass = 'org.dimdev.riftloader.launch.RiftLoaderClientTweaker'
     makeObfSourceJar = false

src/main/java/org/dimdev/rift/mixin/core/client/MixinLavaFluid.java

@@ -14,12 +14,12 @@
 public class MixinLavaFluid implements RiftFluid {
     @Override
     public TextureAtlasSprite getStillTexture() {
-        return Minecraft.getMinecraft().getModelManager().getBlockModelShapes().getModelForState(Blocks.LAVA.getDefaultState()).getParticleTexture();
+        return Minecraft.getInstance().getModelManager().getBlockModelShapes().getModel(Blocks.LAVA.getDefaultState()).getParticleTexture();
     }
 
     @Override
     public TextureAtlasSprite getFlowingTexture() {
-        return Minecraft.getMinecraft().getTextureMapBlocks().getSprite(ModelBakery.LOCATION_LAVA_FLOW);
+        return Minecraft.getInstance().getTextureMap().getSprite(ModelBakery.LOCATION_LAVA_FLOW);
     }
 
     @Override

src/main/java/org/dimdev/rift/mixin/core/client/MixinWaterFluid.java

@@ -15,16 +15,16 @@
 public class MixinWaterFluid implements RiftFluid {
     @Override
     public TextureAtlasSprite getStillTexture() {
-        return Minecraft.getMinecraft().getModelManager().getBlockModelShapes().getModelForState(Blocks.WATER.getDefaultState()).getParticleTexture();
+        return Minecraft.getInstance().getModelManager().getBlockModelShapes().getModel(Blocks.WATER.getDefaultState()).getParticleTexture();
     }
 
     @Override
     public TextureAtlasSprite getFlowingTexture() {
-        return Minecraft.getMinecraft().getTextureMapBlocks().getSprite(ModelBakery.LOCATION_WATER_FLOW);
+        return Minecraft.getInstance().getTextureMap().getSprite(ModelBakery.LOCATION_WATER_FLOW);
     }
 
     @Override
     public int getColorMultiplier(IWorldReader world, BlockPos pos) {
-        return BiomeColorHelper.getWaterColorAtPos(world, pos);
+        return BiomeColorHelper.getWaterColor(world, pos);
     }
 }

src/main/java/org/dimdev/rift/network/Message.java

@@ -88,6 +88,6 @@ public final void sendToAll(WorldServer world) {
     }
 
     public void sendToServer() {
-        Minecraft.getMinecraft().player.connection.sendPacket(toPacket(EnumPacketDirection.SERVERBOUND));
+        Minecraft.getInstance().player.connection.sendPacket(toPacket(EnumPacketDirection.SERVERBOUND));
     }
 }

src/main/java/org/dimdev/rift/resources/ModPackFinder.java

@@ -25,7 +25,7 @@ public <T extends ResourcePackInfo> void addPackInfosToMap(Map<String, T> nameTo
             URL root = getRootUrl(mod);
 
             try (ModPack pack = new ModPack(mod.name != null ? mod.name : mod.id, root)) {
-                PackMetadataSection meta = pack.getMetadata(PackMetadataSection.field_198964_a);
+                PackMetadataSection meta = pack.getMetadata(PackMetadataSection.SERIALIZER);
                 if (meta != null && !pack.getResourceNamespaces(type).isEmpty()) {
                     nameToPackMap.put(mod.id, packInfoFactory.create(mod.id, type == ResourcePackType.CLIENT_RESOURCES, () -> pack, pack, meta, ResourcePackInfo.Priority.TOP));
                 }

src/main/java/org/dimdev/rift/util/ArmorMaterialImpl.java

@@ -29,13 +29,13 @@ public ArmorMaterialImpl(String name, int maxDamageFactor, int[] damageReduction
     }
 
     @Override
-    public int func_200896_a(EntityEquipmentSlot slot) {
+    public int getDurability(EntityEquipmentSlot slot) {
         return ArmorMaterial.MAX_DAMAGE_ARRAY[slot.getIndex()] * maxDamageFactor;
     }
 
     @Override
-    public int func_200902_b(EntityEquipmentSlot p_200902_1_) {
-        return damageReductionAmountArray[p_200902_1_.getIndex()];
+    public int getDamageReductionAmount(EntityEquipmentSlot slot) {
+        return damageReductionAmountArray[slot.getIndex()];
     }
 
     @Override
@@ -49,7 +49,7 @@ public SoundEvent getSoundEvent() {
     }
 
     @Override
-    public Ingredient func_200898_c() {
+    public Ingredient getRepairMaterial() {
         return ingredient.getValue();
     }
 

src/main/java/org/dimdev/rift/util/ItemTierImpl.java

@@ -49,7 +49,7 @@ public int getEnchantability() {
     }
 
     @Override
-    public Ingredient func_200924_f() {
+    public Ingredient getRepairMaterial() {
         return ingredient.getValue();
     }
 }