apply mipmap to gui blocks

Author: Mixces

src/main/java/io/github/axolotlclient/oldanimations/OldAnimations.java

@@ -40,14 +40,12 @@ blocks item positions (rotations) + fix trapdoors and pressure plates and other
 	MC-57895 - stairs are wrong direction
 
 	--- Textures/Models ---
-	fix weird fuzzy texture sizes of swords and stuff - THIS WAS MIP MAP
-	fast grass always shown in gui/dropped?
+	fast grass always shown in gui/dropped despite graphics option
 	held pressure plates look a bit different?? idk why. THEY'RE BIGGER THAT'S WHY
 	MC-262869 - top texture of blocks need to be rotated as noted above
 	MC-262173 - tripwire hook using wrong wood texture
-	MC-277768 && MC-57574 && MC-195505 - mipmap items/blocks
 	improve old skull stuff?
-	anisotrophic filtering on items in 1.7
+	short grass, oak door, and sponge block have different textures
 
 	--- World ---
 	figure out why hurtTime is off by 1 tick in 1.7... this might also impact other aspects of the game
@@ -70,6 +68,12 @@ figure out how to separate certain models (flowers from flower pot, etc)
 	framed items are not centered - MC-8662
 	mobentity blockentity? WHAT THE HELL IS THIS SUPPOSED TO MEAN RAHHH
 	MC-5270 - suffocation screen order (buggy lava)
+	3D anaglyph is different apparently
+
+	-- Difficult / Impossible --
+	anisotrophic filtering on items in 1.7 - optifine interheres here
+	MC-195505 - mipmap blocks - optifine interferes here
+	fix weird fuzzy texture sizes of swords and stuff - THIS WAS MIP MAP - optifine again
 
 	*/
 

src/main/java/io/github/axolotlclient/oldanimations/config/OldAnimationsConfig.java

@@ -161,6 +161,7 @@ public class OldAnimationsConfig {
 	public final BooleanOption itemModelSideQuadRendering = new BooleanOption("itemModelSideQuadRendering", true);
 	public final BooleanOption oldFastLeaves = new BooleanOption("oldFastLeaves", true);
 	public final BooleanOption opaqueLeavesTextures = new BooleanOption("opaqueLeavesTextures", true);
+	public final BooleanOption guiBlockItemsMipmap = new BooleanOption("guiBlockItemsMipmap", true);
 
 	private final BooleanSupplier[] suppliers = new BooleanSupplier[]{
 		enabled::get,
@@ -173,7 +174,8 @@ public class OldAnimationsConfig {
 		fenceGateItemModel::get,
 		fenceGateWallMode::get,
 		itemModelSideQuadRendering::get,
-		opaqueLeavesTextures::get
+		opaqueLeavesTextures::get,
+		guiBlockItemsMipmap::get
 	};
 	private final boolean[] previousStates = {
 		enabled.get(),
@@ -186,7 +188,8 @@ public class OldAnimationsConfig {
 		fenceGateItemModel.get(),
 		fenceGateWallMode.get(),
 		itemModelSideQuadRendering.get(),
-		opaqueLeavesTextures.get()
+		opaqueLeavesTextures.get(),
+		guiBlockItemsMipmap.get()
 	};
 
 	public static boolean isEnabled() {
@@ -236,7 +239,8 @@ public void initConfig() {
 			fenceGateItemModel,
 			itemModelSideQuadRendering,
 			oldFastLeaves,
-			opaqueLeavesTextures
+			opaqueLeavesTextures,
+			guiBlockItemsMipmap
 		);
 		category.add(categoryCombat);
 		categoryCombat.add(

src/main/java/io/github/axolotlclient/oldanimations/mixin/GameRendererMixin.java

@@ -59,12 +59,12 @@ public abstract class GameRendererMixin implements Sneaky {
 	@Shadow
 	private long lastWorldRenderTime;
 
-	@Shadow
-	private float lastFogBrightness;
 	@Shadow
 	private float fogBrightness;
+
 	@Shadow
 	private float renderDistance;
+
 	@Unique
 	private float lastCameraY;
 

src/main/java/io/github/axolotlclient/oldanimations/mixin/ItemRendererMixin.java

@@ -25,6 +25,7 @@
 import io.github.axolotlclient.oldanimations.util.GlintHandler;
 import io.github.axolotlclient.oldanimations.util.OpaqueLeavesHandler;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.render.entity.ItemRenderer;
 import net.minecraft.client.render.model.block.ModelTransformations;
 import net.minecraft.client.render.platform.GlStateManager;
@@ -266,4 +267,14 @@ public abstract class ItemRendererMixin {
 			axolotlclient$fastGraphics = false;
 		}
 	}
+
+	@ModifyArg(method = "renderGuiItemModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/texture/Texture;pushFilter(ZZ)V"), index = 1)
+	private boolean axolotlclient$guiItemsMipmap(boolean original) {
+		/* MC-57574 and MC-277768. idk why there was 2 bug reports */
+		/* in 1.7, the gui block items had mipmapping affect them since they were the same blocks used for world rendering */
+		/* in 1.8, there is a distinction between block items and actual world rendered blocks */
+		/* luckily it's easy to turn on mipmapping for rendered items */
+		return OldAnimationsConfig.isEnabled() && OldAnimationsConfig.instance.guiBlockItemsMipmap.get() ?
+			Minecraft.getInstance().options.mipmapLevels > 0 : original;
+	}
 }

src/main/java/io/github/axolotlclient/oldanimations/mixin/ModelBakeryMixin.java

@@ -72,8 +72,9 @@ public abstract class ModelBakeryMixin {
 
 
 		/* i really dont want to do this */
-		/* in order for 1.7 fast graphics leaves blocks, we need to have them on standby */
-		/* aka they need to actually exist as their own block*/
+		/* in order for 1.7 fast graphics leaves blocks to change on the fly, we need to have them on standby */
+		/* aka they need to actually exist as their own block */
+		/* if enough people complain ill change this system lol */
 		List<String> originalLeaves = itemVariants.get(Item.byBlock(Blocks.LEAVES));
 		List<String> opaqueLeaves = Arrays.asList("oak_leaves_opaque", "spruce_leaves_opaque", "birch_leaves_opaque", "jungle_leaves_opaque");
 		originalLeaves.addAll(opaqueLeaves);
@@ -212,7 +213,7 @@ public abstract class ModelBakeryMixin {
 			}
 		}
 
-		//todo: uhm..
+		//todo: dont delete this
 //		if (OldAnimationsConfig.instance.oldFastLeavesTextures.get()) {
 //			String search = "models/block/";
 //			String suffix = "_leaves.json";

src/main/resources/assets/axolotlclient-oldanimations/lang/en_us.json

@@ -228,5 +228,7 @@
 	"oldFastLeaves": "Old Fast Leaves",
 	"oldFastLeaves.tooltip": "Renders leaves block items as solid when graphics is set to fast. If \"Old Opaque Leaves Textures\" is enabled, this option will not do anything.",
 	"opaqueLeavesTextures": "Opaque Leaves Textures",
-	"opaqueLeavesTextures.tooltip": "Uses the old opaque leaves textures from 1.7 when graphics is set to fast."
+	"opaqueLeavesTextures.tooltip": "Uses the old opaque leaves textures from 1.7 when graphics is set to fast.",
+	"guiBlockItemsMipmap": "GUI Block Items Mipmap",
+	"guiBlockItemsMipmap.tooltip": "Allows block items rendered in GUIs to have mipmapping applied to them similar to 1.7. The level of mipmapping is controlled through the in-game option."
 }