From 940041e52c30e2d0249b1b0ffdeba9de12583878 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 31 May 2023 18:05:02 +0100 Subject: [PATCH] Remove JEI --- build.gradle | 8 ++++---- gradle.properties | 3 +-- .../com/minelittlepony/unicopia/client/URenderers.java | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index b00383e9..d72d2837 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,6 @@ repositories { maven { name 'minelp-snapshot'; url 'https://repo.minelittlepony-mod.com/maven/snapshot' } maven { name 'minelp-releases'; url 'https://repo.minelittlepony-mod.com/maven/release' } maven { name 'TerraformersMC'; url 'https://maven.terraformersmc.com/' } - maven { name 'JEI'; url 'https://maven.blamejared.com/' } } dependencies { @@ -73,12 +72,13 @@ dependencies { include "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraformer_api_version}" if (project.tmi_type == 'jei') { + // We don't use that garbage + } else if (project.tmi_type == 'emi') { + // Use EMI at runtime modCompileOnly "dev.emi:emi-fabric:${project.emi_version}" - modRuntimeOnly "mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}" } else { + // Use neither modCompileOnly "dev.emi:emi-fabric:${project.emi_version}" - modCompileOnly "mezz.jei:jei-${project.minecraft_version}-common-api:${project.jei_version}" - modCompileOnly "mezz.jei:jei-${project.minecraft_version}-fabric-api:${project.jei_version}" } } diff --git a/gradle.properties b/gradle.properties index 53a6779e..17dbf206 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.daemon=false minecraft_version=1.19.3 yarn_mappings=1.19.3+build.2 loader_version=0.14.11 - fabric_version=0.68.1+1.19.3 + fabric_version=0.69.1+1.19.3 # Mod Properties group=com.minelittlepony @@ -31,4 +31,3 @@ org.gradle.daemon=false # TMI Testing tmi_type=jei emi_version=1.0.0+1.19.3 - jei_version=12.4.0.22 \ No newline at end of file diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java index 254f6895..dcb7fb88 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java +++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java @@ -34,7 +34,6 @@ import net.minecraft.client.item.ModelPredicateProviderRegistry; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.render.*; -import net.minecraft.client.render.block.entity.BlockEntityRendererFactories; import net.minecraft.client.render.entity.FlyingItemEntityRenderer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.render.model.json.ModelTransformation; @@ -78,7 +77,7 @@ public interface URenderers { EntityRendererRegistry.register(UEntities.SPELLBOOK, SpellbookEntityRenderer::new); EntityRendererRegistry.register(UEntities.AIR_BALLOON, AirBalloonEntityRenderer::new); - BlockEntityRendererFactories.register(UBlockEntities.WEATHER_VANE, WeatherVaneBlockEntityRenderer::new); + BlockEntityRendererRegistry.register(UBlockEntities.WEATHER_VANE, WeatherVaneBlockEntityRenderer::new); ColorProviderRegistry.ITEM.register((stack, i) -> i > 0 ? -1 : ((DyeableItem)stack.getItem()).getColor(stack), UItems.FRIENDSHIP_BRACELET); BuiltinItemRendererRegistry.INSTANCE.register(UItems.FILLED_JAR, (stack, mode, matrices, vertexConsumers, light, overlay) -> {