update to 1.20.4 and port back to fabric

build.gradle

@@ -1,32 +1,30 @@
 plugins {
-	id "maven-publish"
-	id "org.quiltmc.loom" version "1.+"
+	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'maven-publish'
 }
 
 base.archivesName = project.archives_base_name
-version = "${project.version}+${project.minecraft}"
+version = "${project.version}+${project.minecraft_version}"
 group = project.maven_group
 
 repositories {
-	maven {
-		name 'Quilt'
-		url 'https://maven.quiltmc.org/repository/release'
-	}
 }
 
+
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft}"
-	mappings "org.quiltmc:quilt-mappings:${project.minecraft}+build.${project.mappings}:intermediary-v2"
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	//minecraft "com.mojang:minecraft:1.20.1"
+	//mappings "org.quiltmc:quilt-mappings:1.20.1+build.23:intermediary-v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modImplementation "org.quiltmc:quilt-loader:${project.loader}"
-	//modImplementation "org.quiltmc:qsl:${project.qsl}+${project.minecraft}"
-	modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${project.qfapi}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 }
 
 processResources {
 	inputs.property 'version', version
 
-	filesMatching('quilt.mod.json') {
+	filesMatching('fabric.mod.json') {
 		expand "version": version
 	}
 }
@@ -41,7 +39,6 @@ java {
 	targetCompatibility = JavaVersion.VERSION_17
 
 	withSourcesJar()
-	//withJavadocJar()
 }
 
 jar {

gradle.properties

@@ -3,19 +3,14 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 1.0.4
+version = 1.0.5
 maven_group = gay.debuggy
 archives_base_name = SuspiciousShapes
 
-# Dependencies
-#minecraft = 1.20.1
-#mappings = 1
-#loader = 0.19.0
-#qsl = 6.0.3
-#qfapi = 7.0.3+0.83.1-1.20.1
+#Loader Dependencies
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.2
 
-minecraft = 1.20.1
-mappings = 23
-loader = 0.20.0-beta.11
-qsl = 6.1.1
-qfapi = 7.1.0+0.86.1-1.20.1
+#Fabric api
+fabric_version=0.91.2+1.20.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -4,11 +4,11 @@ pluginManagement {
 			name = 'Quilt'
 			url = 'https://maven.quiltmc.org/repository/release'
 		}
-		// Currently needed for Intermediary and other temporary dependencies
 		maven {
 			name = 'Fabric'
 			url = 'https://maven.fabricmc.net/'
 		}
+		mavenCentral()
 		gradlePluginPortal()
 	}
 }

src/main/java/gay/debuggy/shapes/client/BakedMeshModel.java

@@ -8,7 +8,6 @@
 import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
 import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
-import net.fabricmc.fabric.api.renderer.v1.render.RenderContext.QuadTransform;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedQuad;
@@ -18,7 +17,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.util.random.RandomGenerator;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.BlockRenderView;
 
 public class BakedMeshModel implements BakedModel, FabricBakedModel {
@@ -35,7 +34,7 @@ public BakedMeshModel(Sprite particleSprite, ModelTransformation transform, Mesh
 	//implements BakedModel {
 
 		@Override
-		public List<BakedQuad> getQuads(BlockState state, Direction face, RandomGenerator random) {
+		public List<BakedQuad> getQuads(BlockState state, Direction face, Random random) {
 			return ImmutableList.of();
 		}
 
@@ -84,16 +83,16 @@ public boolean isVanillaAdapter() {
 		}
 
 		@Override
-		public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier<RandomGenerator> randomSupplier, RenderContext context) {
+		public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier<Random> randomSupplier, RenderContext context) {
 			for(Mesh mesh : meshes) {
-				context.meshConsumer().accept(mesh);
+				mesh.outputTo(context.getEmitter());
 			}
 		}
 
 		@Override
-		public void emitItemQuads(ItemStack stack, Supplier<RandomGenerator> randomSupplier, RenderContext context) {
+		public void emitItemQuads(ItemStack stack, Supplier<Random> randomSupplier, RenderContext context) {
 			for(Mesh mesh : meshes) {
-				context.meshConsumer().accept(mesh);
+				mesh.outputTo(context.getEmitter());
 			}
 		}
 

src/main/java/gay/debuggy/shapes/client/Config.java

@@ -5,11 +5,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.loader.api.QuiltLoader;
-
 import com.google.gson.GsonBuilder;
 
+import net.fabricmc.loader.api.FabricLoader;
+
 public class Config {
 	public static transient Config instance = new Config();
 
@@ -31,8 +30,8 @@ public int value() {
 		}
 	}
 
-	public static Config init(ModContainer mod) {
-		Path configPath = QuiltLoader.getConfigDir().resolve(SuspiciousShapesClient.MODID+".json");
+	public static Config init() {
+		Path configPath = FabricLoader.getInstance().getConfigDir().resolve(SuspiciousShapesClient.MODID+".json");
 
 		if (!Files.exists(configPath)) {
 			return instance;

src/main/java/gay/debuggy/shapes/client/GlowUnbakedModel.java

@@ -30,15 +30,15 @@
 import net.fabricmc.fabric.api.renderer.v1.model.ModelHelper;
 import net.fabricmc.fabric.impl.client.indigo.renderer.IndigoRenderer;
 import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.Baker;
 import net.minecraft.client.render.model.ModelBakeSettings;
-import net.minecraft.client.render.model.ModelBaker;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.render.model.json.Transformation;
-import net.minecraft.client.resource.Material;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.texture.TextureManager;
+import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.screen.PlayerScreenHandler;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
@@ -72,7 +72,7 @@ public Collection<Identifier> getModelDependencies() {
 	}
 
 	@Override
-	public BakedModel bake(ModelBaker modelBaker, Function<Material, Sprite> textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) {
+	public BakedModel bake(Baker modelBaker, Function<SpriteIdentifier, Sprite> textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) {
 
 		sprites.clear();
 		Sprite particleSprite = null;
@@ -234,15 +234,15 @@ public Direction directionFromVector(Vector3d vec) {
 	}
 
 	private static Sprite missingno = null;
-	public static Sprite resolveMissingno(Function<Material, Sprite> textureGetter) {
+	public static Sprite resolveMissingno(Function<SpriteIdentifier, Sprite> textureGetter) {
 		if (missingno == null) {
-			missingno = textureGetter.apply(new Material(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, TextureManager.MISSING_IDENTIFIER));
+			missingno = textureGetter.apply(new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, TextureManager.MISSING_IDENTIFIER));
 		}
 
 		return missingno;
 	}
 
-	public static @Nullable Sprite resolveSprite(String id, Function<Material, Sprite> textureGetter) {
+	public static @Nullable Sprite resolveSprite(String id, Function<SpriteIdentifier, Sprite> textureGetter) {
 		String namespace = "minecraft";
 		String path = "";
 
@@ -256,7 +256,7 @@ public static Sprite resolveMissingno(Function<Material, Sprite> textureGetter)
 		}
 
 		try {
-			Sprite sprite = textureGetter.apply(new Material(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, new Identifier(namespace, path)));
+			Sprite sprite = textureGetter.apply(new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, new Identifier(namespace, path)));
 			if (sprite == null) {
 				return resolveMissingno(textureGetter);
 			} else {
@@ -267,7 +267,7 @@ public static Sprite resolveMissingno(Function<Material, Sprite> textureGetter)
 		}
 	}
 
-	public static @Nullable Sprite resolveSprite(String id, Function<Material, Sprite> textureGetter, Map<String, Sprite> dest) {
+	public static @Nullable Sprite resolveSprite(String id, Function<SpriteIdentifier, Sprite> textureGetter, Map<String, Sprite> dest) {
 		String namespace = "minecraft";
 		String path = "";
 
@@ -299,7 +299,7 @@ public static Sprite resolveMissingno(Function<Material, Sprite> textureGetter)
 			}*/
 		} else {
 			try {
-				Sprite sprite = textureGetter.apply(new Material(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, new Identifier(namespace, path)));
+				Sprite sprite = textureGetter.apply(new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, new Identifier(namespace, path)));
 				if (sprite == null) {
 					SuspiciousShapesClient.LOGGER.warn("Can't find texture "+new Identifier(id)+" referenced from model "+id);
 					dest.put(id, resolveMissingno(textureGetter));
@@ -331,7 +331,7 @@ private static void emit(Mesh.Vertex v, QuadEmitter emitter, int index) {
 	}
 
 	@Override
-	public void resolveParents(Function<Identifier, UnbakedModel> models) {
+	public void setParents(Function<Identifier, UnbakedModel> models) {
 		// TODO: Actually resolve the parents!
 
 	}

src/main/java/gay/debuggy/shapes/client/SuspiciousShapesClient.java

@@ -1,19 +1,18 @@
 package gay.debuggy.shapes.client;
 
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.model.loading.v1.PreparableModelLoadingPlugin;
 
 public class SuspiciousShapesClient implements ClientModInitializer {
 	public static final String MODID = "suspicious_shapes";
 	public static final Logger LOGGER = LoggerFactory.getLogger("Suspicious Shapes");
 
 	@Override
-	public void onInitializeClient(ModContainer mod) {
-		Config.init(mod);
+	public void onInitializeClient() {
+		Config.init();
 
 		PreparableModelLoadingPlugin.register(SuspiciousShapesModelLoadingPlugin::loadData, new SuspiciousShapesModelLoadingPlugin());
 	}

src/main/java/gay/debuggy/shapes/client/SuspiciousShapesModelLoadingPlugin.java

@@ -192,7 +192,7 @@ public static CompletableFuture<UnprocessedModelData> loadData(ResourceManager l
 
 			Map<Identifier, Resource> blockModelResources = loader.findResources("models/block", (it) -> it.getPath().endsWith(".json") || it.getPath().endsWith(".gltf"));
 			for(Map.Entry<Identifier, Resource> entry : blockModelResources.entrySet()) {
-				try (InputStream in = entry.getValue().open()) {
+				try (InputStream in = entry.getValue().getInputStream()) {
 					String value = new String(in.readAllBytes(), StandardCharsets.UTF_8);
 					result.resources.add(new UnprocessedModelData.Node(entry.getKey(), value));
 				} catch (IOException e) {
@@ -203,7 +203,7 @@ public static CompletableFuture<UnprocessedModelData> loadData(ResourceManager l
 
 			Map<Identifier, Resource> itemModelResources = loader.findResources("models/item", (it) -> it.getPath().endsWith(".json") || it.getPath().endsWith(".gltf"));
 			for(Map.Entry<Identifier, Resource> entry : itemModelResources.entrySet()) {
-				try (InputStream in = entry.getValue().open()) {
+				try (InputStream in = entry.getValue().getInputStream()) {
 					String value = new String(in.readAllBytes(), StandardCharsets.UTF_8);
 					result.resources.add(new UnprocessedModelData.Node(entry.getKey(), value));
 				} catch (IOException e) {
@@ -228,7 +228,7 @@ public GLTFModelResolver(ProcessedModelData data) {
 		}
 
 		@Override
-		public @Nullable UnbakedModel resolveModel(Context context) {
+		public @Nullable UnbakedModel resolveModel(net.fabricmc.fabric.api.client.model.loading.v1.ModelResolver.Context context) {
 			ProcessedModelData.Node node = data.byId.get(context.id());
 
 			if (node != null) {

src/main/resources/fabric.mod.json

@@ -0,0 +1,27 @@
+{
+	"schemaVersion": 1,
+	"id": "suspicious_shapes",
+	"version": "${version}",
+	"name": "Suspicious Shapes",
+	"description": "glTF block models",
+	"authors": [
+		"Falkreon"
+	],
+	"contact": {
+		"homepage": "https://github.com/DebuggyTeam/SuspiciousShapes",
+		"issues": "https://github.com/DebuggyTeam/SuspiciousShapes/issues",
+		"sources": "https://github.com/DebuggyTeam/SuspiciousShapes"
+	},
+	"license": "MIT",
+	"icon": "assets/suspicious_shapes/icon.png",
+	"environment": "client",
+	"entrypoints": {
+		"client": [ "gay.debuggy.shapes.client.SuspiciousShapesClient" ]
+	},
+	"depends": {
+		"fabricloader": ">=0.15.0",
+		"minecraft": "~1.20.4",
+		"java": ">=17",
+		"fabric-api": "*"
+	}
+}