quickly update deps oopsies

Author: Mixces

gradle.properties

@@ -15,7 +15,7 @@ mappings_18=1.8.9+build.28
 fabric_loader=0.17.2
 
 osl=0.16.3
-config=3.0.20-beta.1
-client=3.1.5
+config=3.0.22
+client=3.1.6
 
-legacy_lwjgl3=1.2.9
+legacy_lwjgl3=1.2.10

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

@@ -42,7 +42,7 @@ 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
+	fix weird fuzzy texture sizes of swords and stuff - THIS WAS MIP MAP
 	fast grass always shown in gui/dropped?
 	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

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

@@ -158,6 +158,7 @@ public class OldAnimationsConfig {
 	public final BooleanOption fenceGateItemModel = new BooleanOption("fenceGateItemModel", true);
 	public final BooleanOption fenceGateWallMode = new BooleanOption("fenceGateWallMode", true);
 	public final BooleanOption defaultWolfCollarColor = new BooleanOption("defaultWolfCollarColor", true);
+	public final BooleanOption itemModelSideQuadRendering = new BooleanOption("itemModelSideQuadRendering", true);
 
 	private final Supplier<Boolean>[] suppliers = new Supplier[] {
 		enabled::get,
@@ -168,7 +169,8 @@ public class OldAnimationsConfig {
 		fastSmoothLighting::get,
 		modelShadeAndAmbientOcclusion::get,
 		fenceGateItemModel::get,
-		fenceGateWallMode::get
+		fenceGateWallMode::get,
+		itemModelSideQuadRendering::get
 	};
 	private final boolean[] previousStates = {
 		enabled.get(),
@@ -179,7 +181,8 @@ public class OldAnimationsConfig {
 		fastSmoothLighting.get(),
 		modelShadeAndAmbientOcclusion.get(),
 		fenceGateItemModel.get(),
-		fenceGateWallMode.get()
+		fenceGateWallMode.get(),
+		itemModelSideQuadRendering.get()
 	};
 
 	public static boolean isEnabled() {
@@ -226,7 +229,8 @@ public void initConfig() {
 			skullModel,
 			fastGrass,
 			fire,
-			fenceGateItemModel
+			fenceGateItemModel,
+			itemModelSideQuadRendering
 		);
 		category.add(categoryCombat);
 		categoryCombat.add(

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

@@ -18,10 +18,103 @@
 
 package io.github.axolotlclient.oldanimations.mixin;
 
+import com.google.common.collect.Lists;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.axolotlclient.oldanimations.config.OldAnimationsConfig;
+import net.minecraft.client.render.model.block.BlockElement;
+import net.minecraft.client.render.model.block.BlockElementFace;
+import net.minecraft.client.render.model.block.BlockElementTexture;
 import net.minecraft.client.render.model.block.ItemModelGenerator;
+import net.minecraft.client.render.texture.TextureAtlasSprite;
+import net.minecraft.util.math.Direction;
+import org.lwjgl.util.vector.Vector3f;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.util.Collections;
+import java.util.List;
 
 @Mixin(ItemModelGenerator.class /* unmapped - C_4311621 */)
 public abstract class ItemModelGeneratorMixin {
 
+	@Shadow
+	protected abstract List<BlockElement> addSideElements(TextureAtlasSprite textureAtlasSprite, String string, int i);
+
+	@WrapOperation(method = "processFrames", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/model/block/ItemModelGenerator;addSideElements(Lnet/minecraft/client/render/texture/TextureAtlasSprite;Ljava/lang/String;I)Ljava/util/List;"))
+	private List<BlockElement> axolotlclient$itemModelSideQuadRendering(ItemModelGenerator instance, TextureAtlasSprite textureAtlasSprite, String string, int i, Operation<List<BlockElement>> original) {
+		if (OldAnimationsConfig.isEnabled() && OldAnimationsConfig.instance.itemModelSideQuadRendering.get()) {
+			return axolotlclient$oldAddSideElements(textureAtlasSprite, string, i);
+		}
+		return addSideElements(textureAtlasSprite, string, i);
+	}
+
+	@Unique
+	private List<BlockElement> axolotlclient$oldAddSideElements(TextureAtlasSprite textureAtlasSprite, String string, int i) {
+		List<BlockElement> list = Lists.newArrayList();
+
+		int width = textureAtlasSprite.getWidth();
+		int height = textureAtlasSprite.getHeight();
+		float uMin = 0.0F;
+		float vMin = 0.0F;
+		float uMax = 16.0F;
+		float vMax = 16.0F;
+
+		float f = 0.5F * (uMin - uMax) / width;
+		float g = 0.5F * (vMax - vMin) / height;
+
+		for (int i10 = 0; i10 < width; i10++) {
+			float h = (float) i10 / width;
+			float l = uMin + (uMax - uMin) * ((float) i10 / width) - f;
+			list.add(new BlockElement(
+				new Vector3f(h * 16.0F, 0.0F, 7.5F), new Vector3f(h * 16.0F, 16.0F, 8.5F),
+				Collections.singletonMap(
+					Direction.WEST,
+					new BlockElementFace(null, i, string, new BlockElementTexture(new float[]{l, vMin, l, vMax}, 0))
+				), null, true
+			));
+		}
+
+		for (int var14 = 0; var14 < width; var14++) {
+			float i12 = (float) var14 / width;
+			float m = uMin + (uMax - uMin) * i12 - f;
+			float q = i12 + 1.0F / width;
+			list.add(new BlockElement(
+				new Vector3f(q * 16.0F, 0.0F, 7.5F), new Vector3f(q * 16.0F, 16.0F, 8.5F),
+				Collections.singletonMap(
+					Direction.EAST,
+					new BlockElementFace(null, i, string, new BlockElementTexture(new float[]{m, vMin, m, vMax}, 0))
+				), null, true
+			));
+		}
+
+		for (int var15 = 0; var15 < height; var15++) {
+			float j = (float) var15 / height;
+			float n = vMax + (vMin - vMax) * j - g;
+			float r = j + 1.0F / height;
+			list.add(new BlockElement(
+				new Vector3f(0.0F, r * 16.0F, 7.5F), new Vector3f(16.0F, r * 16.0F, 8.5F),
+				Collections.singletonMap(
+					Direction.UP,
+					new BlockElementFace(null, i, string, new BlockElementTexture(new float[]{uMin, n, uMax, n}, 0))
+				), null, true
+			));
+		}
+
+		for (int var16 = 0; var16 < height; var16++) {
+			float k = (float) var16 / height;
+			float o = vMax + (vMin - vMax) * ((float) var16 / height) - g;
+			list.add(new BlockElement(
+				new Vector3f(0.0F, k * 16.0F, 7.5F), new Vector3f(16.0F, k * 16.0F, 8.5F),
+				Collections.singletonMap(
+					Direction.DOWN,
+					new BlockElementFace(null, i, string, new BlockElementTexture(new float[]{uMin, o, uMax, o}, 0))
+				), null, true
+			));
+		}
+
+		return list;
+	}
 }

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

@@ -21,16 +21,13 @@
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.axolotlclient.oldanimations.config.OldAnimationsConfig;
-import io.github.axolotlclient.oldanimations.util.OldItemModelGenerator;
 import net.minecraft.client.render.model.block.*;
-import net.minecraft.client.render.texture.TextureAtlas;
 import net.minecraft.client.resource.model.ModelBakery;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.resource.Identifier;
 import net.minecraft.util.math.Direction;
 import org.lwjgl.util.vector.Vector3f;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -52,10 +49,6 @@ public abstract class ModelBakeryMixin {
 	@Shadow
 	protected abstract Identifier getModelsJsonLocation(Identifier identifier);
 
-	@Shadow
-	@Final
-	private TextureAtlas blockAtlas;
-
 	@Unique
 	private static final Map<String, String> SKULL_TEXTURES = Map.of(
 		"char", "items/skull_steve",
@@ -68,14 +61,6 @@ public abstract class ModelBakeryMixin {
 	@Unique
 	private static final Identifier BUILTIN_GENERATED = new Identifier("minecraft:builtin/generated");
 
-	@Unique
-	private final OldItemModelGenerator oldItemModelGenerator = new OldItemModelGenerator();
-
-	@ModifyReturnValue(method = "generateItemModels(Lnet/minecraft/client/render/model/block/BlockModel;)Lnet/minecraft/client/render/model/block/BlockModel;", at = @At(value = "RETURN"))
-	private BlockModel axolotlclient$useOurItemModelGenerator(BlockModel original, @Local(argsOnly = true) BlockModel blockModel) {
-		return oldItemModelGenerator.generate(blockAtlas, blockModel);
-	}
-
     @Inject(method = "registerItemVariants", at = @At("TAIL"))
     private void axolotlclient$registerCustomModels(CallbackInfo ci) {
 		//TODO: There HAS to be a better way of doing this T_T

src/main/java/io/github/axolotlclient/oldanimations/util/OldItemModelGenerator.java

@@ -222,5 +222,7 @@
 	"fenceGateWallMode": "Fence Gate Wall Connection",
 	"fenceGateWallMode.tooltip": "Fixes a bug introduced in 1.8 where the fence gate will prematurely enter \"wall\" mode.",
 	"defaultWolfCollarColor": "Default Wolf Collar Color",
-	"defaultWolfCollarColor.tooltip": "Changes the default wolf collar color from orange to red like in 1.7 and 1.9+. Only works in singleplayer!"
+	"defaultWolfCollarColor.tooltip": "Changes the default wolf collar color from orange to red like in 1.7 and 1.9+. Only works in singleplayer!",
+	"itemModelSideQuadRendering": "Item Model Side Rendering",
+	"itemModelSideQuadRendering.tooltip": "Renders the side elements of an item using 1.7's rendering logic."
 }