Highly incomplete code. First work on porting to 1.12. Still need to rework a LOT of things.

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -36,6 +36,8 @@ import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 
 import mezz.jei.api.IRecipesGui;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.vertex.VertexBuffer;
 import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import org.lwjgl.input.Keyboard;
@@ -48,7 +50,6 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ClickType;
@@ -766,7 +767,7 @@ public abstract class AEBaseGui extends GuiContainer
 							final float par4 = uv_y * 16;
 
 							final Tessellator tessellator = Tessellator.getInstance();
-							final VertexBuffer vb = tessellator.getBuffer();
+							final BufferBuilder vb = tessellator.getBuffer();
 
 							vb.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR );
 

src/main/java/appeng/client/gui/AEBaseMEGui.java

@@ -23,6 +23,7 @@ import java.text.NumberFormat;
 import java.util.List;
 import java.util.Locale;
 
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -116,10 +117,11 @@ public abstract class AEBaseMEGui extends AEBaseGui
 			{
 			}
 
+			ITooltipFlag.TooltipFlags tooltipFlag = this.mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL;
 			if( myStack != null )
 			{
 				@SuppressWarnings( "unchecked" )
-				final List<String> currentToolTip = stack.getTooltip( this.mc.player, this.mc.gameSettings.advancedItemTooltips );
+				final List<String> currentToolTip = stack.getTooltip( this.mc.player, tooltipFlag );
 
 				if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
 				{
@@ -136,7 +138,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
 			}
 			else if( stack.getCount() > BigNumber )
 			{
-				List<String> var4 = stack.getTooltip( this.mc.player, this.mc.gameSettings.advancedItemTooltips );
+				List<String> var4 = stack.getTooltip( this.mc.player, tooltipFlag );
 				var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.getCount() ) );
 				this.drawTooltip( x, y, var4 );
 				return;

src/main/java/appeng/client/gui/Size1Slot.java

@@ -1,6 +1,7 @@
 package appeng.client.gui;
 
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -28,8 +29,8 @@ class Size1Slot extends Slot
 		this.delegate = delegate;
 	}
 
-	@Nullable
 	@Override
+	@Nonnull
 	public ItemStack getStack()
 	{
 		ItemStack orgStack = delegate.getStack();

src/main/java/appeng/client/gui/config/AEConfigGuiFactory.java

@@ -67,13 +67,7 @@ public class AEConfigGuiFactory implements IModGuiFactory
 	 */
 	@Override
 	public GuiScreen createConfigGui(GuiScreen parentScreen) {
-		return null;
-	}
-
-	@Override
-	public Class<? extends GuiScreen> mainConfigGuiClass()
-	{
-		return AEConfigGui.class;
+		return new AEConfigGui(parentScreen);
 	}
 
 	@Override
@@ -82,9 +76,4 @@ public class AEConfigGuiFactory implements IModGuiFactory
 		return null;
 	}
 
-	@Override
-	public RuntimeOptionGuiHandler getHandlerFor( final RuntimeOptionCategoryElement element )
-	{
-		return null;
-	}
 }

src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java

@@ -22,6 +22,8 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 import java.util.List;
 
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraftforge.fml.client.FMLClientHandler;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
@@ -253,7 +255,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
 
 			if( myStack != null )
 			{
-				List<String> currentToolTip = stack.getTooltip( this.mc.player, this.mc.gameSettings.advancedItemTooltips );
+				ITooltipFlag.TooltipFlags tooltipFlag = this.mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL;
+				List<String> currentToolTip = stack.getTooltip( this.mc.player, tooltipFlag );
 
 				while( currentToolTip.size() > 1 )
 				{

src/main/java/appeng/client/gui/widgets/GuiImgButton.java

@@ -181,7 +181,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
 	}
 
 	@Override
-	public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3 )
+	public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3, float partial )
 	{
 		if( this.visible )
 		{

src/main/java/appeng/client/gui/widgets/GuiProgressBar.java

@@ -59,7 +59,7 @@ public class GuiProgressBar extends GuiButton implements ITooltip
 	}
 
 	@Override
-	public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3 )
+	public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3, final float partial )
 	{
 		if( this.visible )
 		{

src/main/java/appeng/client/gui/widgets/GuiTabButton.java

@@ -71,7 +71,7 @@ public class GuiTabButton extends GuiButton implements ITooltip
 	}
 
 	@Override
-	public void drawButton( final Minecraft minecraft, final int x, final int y )
+	public void drawButton( final Minecraft minecraft, final int x, final int y, float partial )
 	{
 		if( this.visible )
 		{

src/main/java/appeng/client/gui/widgets/GuiToggleButton.java

@@ -58,7 +58,7 @@ public class GuiToggleButton extends GuiButton implements ITooltip
 	}
 
 	@Override
-	public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3 )
+	public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3, final float partial )
 	{
 		if( this.visible )
 		{

src/main/java/appeng/client/gui/widgets/MEGuiTextField.java

@@ -61,13 +61,14 @@ public class MEGuiTextField extends GuiTextField
 	}
 
 	@Override
-	public void mouseClicked( final int xPos, final int yPos, final int button )
+	public boolean mouseClicked( final int xPos, final int yPos, final int button )
 	{
 		super.mouseClicked( xPos, yPos, button );
 
 		final boolean requiresFocus = this.isMouseIn( xPos, yPos );
 
 		this.setFocused( requiresFocus );
+		return true;
 	}
 
 	/**

src/main/java/appeng/client/render/FacadeItemModel.java

@@ -21,8 +21,7 @@ package appeng.client.render;
 
 import java.util.Collection;
 import java.util.Collections;
-
-import com.google.common.base.Function;
+import java.util.function.Function;
 
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;

src/main/java/appeng/client/render/SpatialSkyRender.java

@@ -21,6 +21,7 @@ package appeng.client.render;
 
 import java.util.Random;
 
+import net.minecraft.client.renderer.BufferBuilder;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
@@ -30,7 +31,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraftforge.client.IRenderHandler;
 
@@ -77,7 +77,7 @@ public class SpatialSkyRender extends IRenderHandler
 		GlStateManager.depthMask( false );
 		GlStateManager.color( 0.0f, 0.0f, 0.0f, 1.0f );
 		final Tessellator tessellator = Tessellator.getInstance();
-		final VertexBuffer VertexBuffer = tessellator.getBuffer();
+		final BufferBuilder VertexBuffer = tessellator.getBuffer();
 
 		// This renders a skybox around the player at a far, fixed distance from them.
 		// The skybox is pitch black and untextured
@@ -150,7 +150,7 @@ public class SpatialSkyRender extends IRenderHandler
 	private void renderTwinkles()
 	{
 		final Tessellator tessellator = Tessellator.getInstance();
-		final VertexBuffer VertexBuffer = tessellator.getBuffer();
+		final BufferBuilder VertexBuffer = tessellator.getBuffer();
 		VertexBuffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION );
 
 		for( int i = 0; i < 50; ++i )

src/main/java/appeng/client/render/cablebus/CableBuilder.java

@@ -24,8 +24,7 @@ import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.List;
-
-import com.google.common.base.Function;
+import java.util.function.Function;
 
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;

src/main/java/appeng/client/render/cablebus/CableBusModel.java

@@ -21,8 +21,8 @@ package appeng.client.render.cablebus;
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 

src/main/java/appeng/client/render/cablebus/FacadeBuilder.java

@@ -26,12 +26,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 
 import javax.annotation.Nullable;
 import javax.vecmath.Vector3f;
 
-import com.google.common.base.Function;
-
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockRendererDispatcher;

src/main/java/appeng/client/render/cablebus/SmartCableTextures.java

@@ -20,8 +20,7 @@ package appeng.client.render.cablebus;
 
 
 import java.util.Arrays;
-
-import com.google.common.base.Function;
+import java.util.function.Function;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.ResourceLocation;

src/main/java/appeng/client/render/crafting/CraftingCubeModel.java

@@ -21,8 +21,8 @@ package appeng.client.render.crafting;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.client.renderer.block.model.IBakedModel;

src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java

@@ -38,7 +38,7 @@ public class CraftingMonitorTESR extends TileEntitySpecialRenderer<TileCraftingM
 {
 
 	@Override
-	public void renderTileEntityAt( TileCraftingMonitorTile te, double x, double y, double z, float partialTicks, int destroyStage )
+	public void render( TileCraftingMonitorTile te, double x, double y, double z, float partialTicks, int destroyStage, float p_render_10_ )
 	{
 		if( te == null )
 		{

src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java

@@ -8,6 +8,8 @@ import javax.vecmath.Matrix4f;
 
 import com.google.common.collect.ImmutableMap;
 
+import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.input.Keyboard;
 
@@ -23,7 +25,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraftforge.client.model.IPerspectiveAwareModel;
 import net.minecraftforge.common.model.TRSRTransformation;
 
 import appeng.items.misc.ItemEncodedPattern;
@@ -34,7 +35,7 @@ import appeng.items.misc.ItemEncodedPattern;
  * showing the encoded pattern itself. Matters are further complicated by only wanting to show the crafting output when the pattern is being
  * rendered in the GUI, and not anywhere else.
  */
-class ItemEncodedPatternBakedModel implements IPerspectiveAwareModel
+class ItemEncodedPatternBakedModel implements IBakedModel
 {
 	private final IBakedModel baseModel;
 
@@ -95,12 +96,12 @@ class ItemEncodedPatternBakedModel implements IPerspectiveAwareModel
 	@Override
 	public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType cameraTransformType )
 	{
-		if( baseModel instanceof IPerspectiveAwareModel )
+		if( baseModel instanceof IBakedModel )
 		{
-			return ( (IPerspectiveAwareModel) baseModel ).handlePerspective( cameraTransformType );
+			return ( (IBakedModel) baseModel ).handlePerspective( cameraTransformType );
 		}
 
-		return IPerspectiveAwareModel.MapWrapper.handlePerspective( this, transforms, cameraTransformType );
+		return PerspectiveMapWrapper.handlePerspective( this, transforms, cameraTransformType );
 	}
 
 	/**
@@ -110,7 +111,7 @@ class ItemEncodedPatternBakedModel implements IPerspectiveAwareModel
 	 * Usually those methods only matter for rendering on the ground and other cases, where we wouldn't render the crafting output model anyway,
 	 * so in those cases we delegate to the model of the encoded pattern.
 	 */
-	private class ShiftHoldingModelWrapper implements IPerspectiveAwareModel
+	private class ShiftHoldingModelWrapper implements IBakedModel
 	{
 
 		private final IBakedModel outputModel;
@@ -141,12 +142,12 @@ class ItemEncodedPatternBakedModel implements IPerspectiveAwareModel
 				GlStateManager.enableLighting();
 			}
 
-			if( selectedModel instanceof IPerspectiveAwareModel )
+			if( selectedModel instanceof IBakedModel )
 			{
-				return ( (IPerspectiveAwareModel) selectedModel ).handlePerspective( cameraTransformType );
+				return ( (IBakedModel) selectedModel ).handlePerspective( cameraTransformType );
 			}
 
-			return IPerspectiveAwareModel.MapWrapper.handlePerspective( this, transforms, cameraTransformType );
+			return PerspectiveMapWrapper.handlePerspective( this, transforms, cameraTransformType );
 		}
 
 		@Override

src/main/java/appeng/client/render/crafting/ItemEncodedPatternModel.java

@@ -3,8 +3,8 @@ package appeng.client.render.crafting;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableMap;
 
 import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -13,8 +13,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.client.model.IPerspectiveAwareModel;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import net.minecraftforge.common.model.IModelState;
 import net.minecraftforge.common.model.TRSRTransformation;
 
@@ -54,7 +54,7 @@ class ItemEncodedPatternModel implements IModel
 			throw new RuntimeException( e );
 		}
 
-		ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms = IPerspectiveAwareModel.MapWrapper.getTransforms(state);
+		ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms = PerspectiveMapWrapper.getTransforms(state);
 
 		return new ItemEncodedPatternBakedModel( baseModel, transforms );
 	}

src/main/java/appeng/client/render/effects/AssemblerFX.java

@@ -20,7 +20,7 @@ package appeng.client.render.effects;
 
 
 import net.minecraft.client.particle.Particle;
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.entity.Entity;
 import net.minecraft.world.World;
 
@@ -93,7 +93,7 @@ public class AssemblerFX extends Particle implements ICanDie
 	}
 
 	@Override
-	public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
+	public void renderParticle( final BufferBuilder par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
 	{
 		this.time += l;
 		if( this.time > 4.0 )

src/main/java/appeng/client/render/effects/CraftingFx.java

@@ -20,7 +20,7 @@ package appeng.client.render.effects;
 
 
 import net.minecraft.client.particle.ParticleBreaking;
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -67,7 +67,7 @@ public class CraftingFx extends ParticleBreaking
 	}
 
 	@Override
-	public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz )
+	public void renderParticle( final BufferBuilder par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz )
 	{
 		if( partialTick < 0 || partialTick > 1 )
 		{

src/main/java/appeng/client/render/effects/EnergyFx.java

@@ -20,7 +20,7 @@ package appeng.client.render.effects;
 
 
 import net.minecraft.client.particle.ParticleBreaking;
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -66,7 +66,7 @@ public class EnergyFx extends ParticleBreaking
 	}
 
 	@Override
-	public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float partialTicks, final float par3, final float par4, final float par5, final float par6, final float par7 )
+	public void renderParticle( final BufferBuilder par1Tessellator, final Entity p_180434_2_, final float partialTicks, final float par3, final float par4, final float par5, final float par6, final float par7 )
 	{
 		final float f6 = this.particleTextureIndex.getMinU();
 		final float f7 = this.particleTextureIndex.getMaxU();

src/main/java/appeng/client/render/effects/LightningFX.java

@@ -23,7 +23,7 @@ import java.util.Random;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.Particle;
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.MathHelper;
@@ -96,7 +96,7 @@ public class LightningFX extends Particle
 	}
 
 	@Override
-	public void renderParticle( final VertexBuffer tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
+	public void renderParticle( final BufferBuilder tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
 	{
 		final float j = 1.0f;
 		float red = this.particleRed * j * 0.9f;
@@ -222,7 +222,7 @@ public class LightningFX extends Particle
 		this.hasData = false;
 	}
 
-	private void draw( float red, float green, float blue, final VertexBuffer tess, final double[] a, final double[] b, final double f6, final double f8 )
+	private void draw( float red, float green, float blue, final BufferBuilder tess, final double[] a, final double[] b, final double f6, final double f8 )
 	{
 		if( this.hasData )
 		{

src/main/java/appeng/client/render/effects/MatterCannonFX.java

@@ -20,7 +20,7 @@ package appeng.client.render.effects;
 
 
 import net.minecraft.client.particle.ParticleBreaking;
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -84,7 +84,7 @@ public class MatterCannonFX extends ParticleBreaking
 	}
 
 	@Override
-	public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 )
+	public void renderParticle( final BufferBuilder par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 )
 	{
 		final float f6 = this.particleTextureIndex.getMinU();
 		final float f7 = this.particleTextureIndex.getMaxU();

src/main/java/appeng/client/render/model/BiometricCardBakedModel.java

@@ -14,6 +14,7 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableList;
 import com.mojang.authlib.GameProfile;
 
+import net.minecraftforge.client.model.IModel;
 import org.apache.commons.lang3.tuple.Pair;
 
 import net.minecraft.block.state.IBlockState;
@@ -27,7 +28,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraftforge.client.model.IPerspectiveAwareModel;
 import net.minecraftforge.common.model.TRSRTransformation;
 
 import appeng.api.implementations.items.IBiometricCard;
@@ -36,7 +36,7 @@ import appeng.client.render.cablebus.CubeBuilder;
 import appeng.core.AELog;
 
 
-class BiometricCardBakedModel implements IPerspectiveAwareModel
+class BiometricCardBakedModel implements IBakedModel
 {
 
 	private final VertexFormat format;
@@ -212,9 +212,9 @@ class BiometricCardBakedModel implements IPerspectiveAwareModel
 	public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType type )
 	{
 		// Delegate to the base model if possible
-		if( baseModel instanceof IPerspectiveAwareModel )
+		if( baseModel instanceof IModel )
 		{
-			IPerspectiveAwareModel pam = (IPerspectiveAwareModel) baseModel;
+			IBakedModel pam = (IBakedModel) baseModel;
 			Pair<? extends IBakedModel, Matrix4f> pair = pam.handlePerspective( type );
 			return Pair.of( this, pair.getValue() );
 		}

src/main/java/appeng/client/render/model/BiometricCardModel.java

@@ -3,8 +3,7 @@ package appeng.client.render.model;
 
 import java.util.Collection;
 import java.util.Collections;
-
-import com.google.common.base.Function;
+import java.util.function.Function;
 
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;

src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java

@@ -10,6 +10,7 @@ import javax.vecmath.Matrix4f;
 
 import com.google.common.collect.ImmutableMap;
 
+import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import org.apache.commons.lang3.tuple.Pair;
 
 import net.minecraft.block.state.IBlockState;
@@ -19,11 +20,10 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.EnumFacing;
-import net.minecraftforge.client.model.IPerspectiveAwareModel;
 import net.minecraftforge.common.model.TRSRTransformation;
 
 
-class ColorApplicatorBakedModel implements IPerspectiveAwareModel
+class ColorApplicatorBakedModel implements IBakedModel
 {
 
 	private final IBakedModel baseModel;
@@ -138,6 +138,6 @@ class ColorApplicatorBakedModel implements IPerspectiveAwareModel
 	@Override
 	public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType type )
 	{
-		return MapWrapper.handlePerspective( this, transforms, type );
+		return PerspectiveMapWrapper.handlePerspective( this, transforms, type );
 	}
 }

src/main/java/appeng/client/render/model/ColorApplicatorModel.java

@@ -3,8 +3,8 @@ package appeng.client.render.model;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
@@ -14,8 +14,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.client.model.IPerspectiveAwareModel;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import net.minecraftforge.common.model.IModelState;
 import net.minecraftforge.common.model.TRSRTransformation;
 
@@ -59,7 +59,7 @@ public class ColorApplicatorModel implements IModel
 		TextureAtlasSprite texMedium = bakedTextureGetter.apply( TEXTURE_MEDIUM );
 		TextureAtlasSprite texBright = bakedTextureGetter.apply( TEXTURE_BRIGHT );
 
-		ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> map = IPerspectiveAwareModel.MapWrapper.getTransforms( state );
+		ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> map = PerspectiveMapWrapper.getTransforms( state );
 
 		return new ColorApplicatorBakedModel( baseModel, map, texDark, texMedium, texBright );
 	}

src/main/java/appeng/client/render/model/DriveModel.java

@@ -22,8 +22,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
@@ -37,6 +38,7 @@ import net.minecraftforge.common.model.IModelState;
 import net.minecraftforge.common.model.TRSRTransformation;
 
 import appeng.block.storage.DriveSlotState;
+import net.minecraftforge.common.model.animation.IClip;
 
 
 public class DriveModel implements IModel
@@ -94,4 +96,34 @@ public class DriveModel implements IModel
 	{
 		return TRSRTransformation.identity();
 	}
+
+	@Override
+	public Optional<? extends IClip> getClip(String name) {
+		return Optional.empty();
+	}
+
+	@Override
+	public IModel process(ImmutableMap<String, String> customData) {
+		return null;
+	}
+
+	@Override
+	public IModel smoothLighting(boolean value) {
+		return null;
+	}
+
+	@Override
+	public IModel gui3d(boolean value) {
+		return null;
+	}
+
+	@Override
+	public IModel uvlock(boolean value) {
+		return null;
+	}
+
+	@Override
+	public IModel retexture(ImmutableMap<String, String> textures) {
+		return null;
+	}
 }

src/main/java/appeng/client/render/model/GlassBakedModel.java

@@ -23,11 +23,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
+import java.util.function.Function;
 import java.util.stream.IntStream;
 
 import javax.annotation.Nullable;
 
-import com.google.common.base.Function;
 import com.google.common.base.Strings;
 
 import net.minecraft.block.state.IBlockState;

src/main/java/appeng/client/render/model/GlassModel.java

@@ -21,8 +21,8 @@ package appeng.client.render.model;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 
 import net.minecraft.client.renderer.block.model.IBakedModel;

src/main/java/appeng/client/render/model/SkyCompassModel.java

@@ -22,8 +22,8 @@ package appeng.client.render.model;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.client.renderer.block.model.IBakedModel;

src/main/java/appeng/client/render/model/UVLModelLoader.java

@@ -32,11 +32,11 @@ import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 import javax.annotation.Nullable;
 
 import com.google.common.base.Charsets;
-import com.google.common.base.Function;
 import com.google.common.base.Throwables;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

src/main/java/appeng/client/render/renderable/ItemRenderable.java

@@ -22,13 +22,13 @@ package appeng.client.render.renderable;
 import java.nio.FloatBuffer;
 import java.util.function.Function;
 
+import net.minecraft.client.renderer.BufferBuilder;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.util.vector.Matrix4f;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -64,7 +64,7 @@ public class ItemRenderable<T extends TileEntity> implements Renderable<T>
 	}
 
 	@Override
-	public void renderTileEntityFast( T te, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer buffer )
+	public void renderTileEntityFast( T te, double x, double y, double z, float partialTicks, int destroyStage, BufferBuilder buffer )
 	{
 
 	}

src/main/java/appeng/client/render/renderable/Renderable.java

@@ -18,8 +18,7 @@
 
 package appeng.client.render.renderable;
 
-
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.tileentity.TileEntity;
 
 
@@ -28,6 +27,6 @@ public interface Renderable<T extends TileEntity>
 
 	public void renderTileEntityAt( T te, double x, double y, double z, float partialTicks, int destroyStage );
 
-	public void renderTileEntityFast( T te, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer buffer );
+	public void renderTileEntityFast( T te, double x, double y, double z, float partialTicks, int destroyStage, BufferBuilder buffer );
 
 }

src/main/java/appeng/client/render/spatial/SpatialPylonModel.java

@@ -24,10 +24,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Function;
-
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;

src/main/java/appeng/client/render/tesr/CrankTESR.java

@@ -19,6 +19,7 @@
 package appeng.client.render.tesr;
 
 
+import net.minecraft.client.renderer.BufferBuilder;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.block.state.IBlockState;
@@ -27,7 +28,6 @@ import net.minecraft.client.renderer.BlockRendererDispatcher;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -47,7 +47,7 @@ public class CrankTESR extends TileEntitySpecialRenderer<TileCrank>
 {
 
 	@Override
-	public void renderTileEntityAt( TileCrank te, double x, double y, double z, float partialTicks, int destroyStage )
+	public void render( TileCrank te, double x, double y, double z, float partialTicks, int destroyStage, float p_render_10_ )
 	{
 		// Most of this is blatantly copied from FastTESR
 		Tessellator tessellator = Tessellator.getInstance();
@@ -71,7 +71,7 @@ public class CrankTESR extends TileEntitySpecialRenderer<TileCrank>
 		BlockRendererDispatcher dispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
 		IBakedModel model = dispatcher.getModelForState( blockState );
 
-		VertexBuffer buffer = tessellator.getBuffer();
+		BufferBuilder buffer = tessellator.getBuffer();
 		buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.BLOCK );
 
 		// The translation ensures the vertex buffer positions are relative to 0,0,0 instead of the block pos

src/main/java/appeng/client/render/tesr/InscriberTESR.java

@@ -1,8 +1,8 @@
 package appeng.client.render.tesr;
 
 
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.block.Block;
@@ -10,7 +10,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
@@ -41,7 +40,7 @@ public class InscriberTESR extends TileEntitySpecialRenderer<TileInscriber>
 	private static TextureAtlasSprite textureInside;
 
 	@Override
-	public void renderTileEntityAt( TileInscriber tile, double x, double y, double z, float partialTicks, int destroyStage )
+	public void render( TileInscriber tile, double x, double y, double z, float partialTicks, int destroyStage, float p_render_10_ )
 	{
 		// render inscriber
 
@@ -89,7 +88,7 @@ public class InscriberTESR extends TileEntitySpecialRenderer<TileInscriber>
 		float press = 0.2f;
 		press -= progress / 5.0f;
 
-		VertexBuffer buffer = Tessellator.getInstance().getBuffer();
+		BufferBuilder buffer = Tessellator.getInstance().getBuffer();
 		buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX );
 
 		float middle = 0.5f;
@@ -177,7 +176,7 @@ public class InscriberTESR extends TileEntitySpecialRenderer<TileInscriber>
 		GlStateManager.enableRescaleNormal();
 	}
 
-	private void renderItem( ItemStack sis, final float o, final AEBaseTile tile, final VertexBuffer tess, final double x, final double y, final double z )
+	private void renderItem( ItemStack sis, final float o, final AEBaseTile tile, final BufferBuilder tess, final double x, final double y, final double z )
 	{
 		if( !sis.isEmpty() )
 		{

src/main/java/appeng/client/render/tesr/ModularTESR.java

@@ -19,8 +19,8 @@
 package appeng.client.render.tesr;
 
 
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -42,7 +42,7 @@ public class ModularTESR<T extends AEBaseTile> extends TileEntitySpecialRenderer
 	}
 
 	@Override
-	public void renderTileEntityAt( T te, double x, double y, double z, float partialTicks, int destroyStage )
+	public void render( T te, double x, double y, double z, float partialTicks, int destroyStage, float p_render_10_ )
 	{
 		GlStateManager.pushMatrix();
 		GlStateManager.translate( x, y, z );
@@ -57,7 +57,7 @@ public class ModularTESR<T extends AEBaseTile> extends TileEntitySpecialRenderer
 	}
 
 	@Override
-	public void renderTileEntityFast( T te, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer buffer )
+	public void renderTileEntityFast( T te, double x, double y, double z, float partialTicks, int destroyStage, float p_render_10_, BufferBuilder buffer )
 	{
 		GlStateManager.pushMatrix();
 		GlStateManager.translate( x, y, z );

src/main/java/appeng/client/render/tesr/SkyChestTESR.java

@@ -50,7 +50,7 @@ public class SkyChestTESR extends TileEntitySpecialRenderer<TileSkyChest>
 	}
 
 	@Override
-	public void renderTileEntityAt( TileSkyChest te, double x, double y, double z, float partialTicks, int destroyStage )
+	public void render( TileSkyChest te, double x, double y, double z, float partialTicks, int destroyStage, float p_render_10_ )
 	{
 		GlStateManager.enableDepth();
 		GlStateManager.depthFunc( 515 );

src/main/java/appeng/client/render/tesr/SkyCompassTESR.java

@@ -22,7 +22,7 @@ package appeng.client.render.tesr;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
@@ -47,7 +47,7 @@ public class SkyCompassTESR extends FastTESR<TileSkyCompass>
 	private static BlockRendererDispatcher blockRenderer;
 
 	@Override
-	public void renderTileEntityFast( TileSkyCompass te, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer buffer )
+	public void renderTileEntityFast( TileSkyCompass te, double x, double y, double z, float partialTicks, int destroyStage, float var10, BufferBuilder buffer )
 	{
 
 		if( !te.hasWorld() )