From 3673e75363c4589b01376776e7862a028cfd9ae4 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 30 May 2023 22:52:02 +0100 Subject: [PATCH] Update dependencies, add JEI --- build.gradle | 15 +++++++++++---- gradle.properties | 6 +++++- ...omanizer-1.0.0.jar => Romanizer-1.0.1.jar} | Bin 12248 -> 12629 bytes .../unicopia/client/URenderers.java | 3 ++- .../unicopia/compat/emi/Main.java | 5 ++--- .../compat/emi/SpellbookEmiRecipe.java | 2 +- 6 files changed, 21 insertions(+), 10 deletions(-) rename lib/{Romanizer-1.0.0.jar => Romanizer-1.0.1.jar} (95%) diff --git a/build.gradle b/build.gradle index e519e3a7..b00383e9 100644 --- a/build.gradle +++ b/build.gradle @@ -43,6 +43,7 @@ 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 { @@ -62,8 +63,8 @@ dependencies { modApi "com.sollace:fabwork:${project.fabwork_version}" include "com.sollace:fabwork:${project.fabwork_version}" - compileOnly files('lib/Romanizer-1.0.0.jar') - include files('lib/Romanizer-1.0.0.jar') + compileOnly files('lib/Romanizer-1.0.1.jar') + include files('lib/Romanizer-1.0.1.jar') modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" modCompileOnly "dev.emi:trinkets:${project.trinkets_version}" @@ -71,8 +72,14 @@ dependencies { modImplementation "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraformer_api_version}" include "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraformer_api_version}" - //modCompileOnly "dev.emi:emi:${project.emi_version}:api" - modCompileOnly "dev.emi:emi:${project.emi_version}" + if (project.tmi_type == 'jei') { + modCompileOnly "dev.emi:emi-fabric:${project.emi_version}" + modRuntimeOnly "mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}" + } else { + 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}" + } } processResources { diff --git a/gradle.properties b/gradle.properties index d2c2c918..53a6779e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,5 +26,9 @@ org.gradle.daemon=false kirin_version=1.13.2 reach_attributes_version=2.3.1 trinkets_version=3.5.0 - emi_version=0.7.3+1.19.3 terraformer_api_version=5.0.0 + +# 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/lib/Romanizer-1.0.0.jar b/lib/Romanizer-1.0.1.jar similarity index 95% rename from lib/Romanizer-1.0.0.jar rename to lib/Romanizer-1.0.1.jar index fea9f62c65fb5af25a826e1d352296da282f4ed2..6f5c66ea27d26ceed4a0ec5257701b0a947dc0d7 100644 GIT binary patch delta 445 zcmcZ+e>I6Wz?+$ci-CcIgW<>0eH(d0wd!H~&rA1(`FOB~2{SS<2s1G-@G~$lq$MU5 zWhU$8=BMao73b&mPB`dy#DK@;{cq90K91a*um3T!tFUx%Kbo*?+14vZroIi)S^dx2 zGfM2+G2PmEGy7`qNhTlV7r3LnLBX}!r2V$j#?$_%MPiQVCqzH25xjZ$UtWDgeP#(G zSJf`Da)o(?m(G4TVUnD7EclG&ti@;8H?G`oV91(a-gWWd%9#?Kfq`K=&-ZgEWv}zL z67W7(WBhIAv5S=(p6xxiDPrz*8|&xiH_51e3pi31F!#v~6Wdo4ZtY!uA?Mw*U6nWE zRQ}$-n)B&RY*uf>e2MJCTd#Gqg#CEnY?@5oWl^=Jnd4tRk#z3_u_Vgh{Ln3<+8w F9srW;3P%6{ diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java index dcb7fb88..254f6895 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java +++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java @@ -34,6 +34,7 @@ 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; @@ -77,7 +78,7 @@ public interface URenderers { EntityRendererRegistry.register(UEntities.SPELLBOOK, SpellbookEntityRenderer::new); EntityRendererRegistry.register(UEntities.AIR_BALLOON, AirBalloonEntityRenderer::new); - BlockEntityRendererRegistry.register(UBlockEntities.WEATHER_VANE, WeatherVaneBlockEntityRenderer::new); + BlockEntityRendererFactories.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) -> { diff --git a/src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java b/src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java index 806730c6..91cb4a0e 100644 --- a/src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java @@ -29,7 +29,6 @@ import net.minecraft.util.Identifier; public class Main implements EmiPlugin { static final EmiStack SPELL_BOOK_STATION = EmiStack.of(UItems.SPELLBOOK); static final EmiRecipeCategory SPELL_BOOK_CATEGORY = new EmiRecipeCategory(Unicopia.id("spellbook"), SPELL_BOOK_STATION, SPELL_BOOK_STATION); - static final Comparison COMPARING_BOTH = Comparison.builder().nbt(true).build(); static final Identifier WIDGETS = Unicopia.id("textures/gui/widgets.png"); static final EmiTexture EMPTY_ARROW = new EmiTexture(WIDGETS, 44, 0, 24, 17); @@ -52,7 +51,7 @@ public class Main implements EmiPlugin { input(trait); this.getOutputs().addAll( Arrays.stream(enhancingRecipe.getBaseMaterial().getMatchingStacks()) - .map(stack -> EmiStack.of(SpellTraits.of(stack).add(new SpellTraits.Builder().with(trait, 1).build()).applyTo(stack)).comparison(c -> Comparison.builder().nbt(false).build())) + .map(stack -> EmiStack.of(SpellTraits.of(stack).add(new SpellTraits.Builder().with(trait, 1).build()).applyTo(stack)).comparison(c -> Comparison.DEFAULT_COMPARISON)) .toList() ); } @@ -70,7 +69,7 @@ public class Main implements EmiPlugin { }); Stream.of(UItems.GEMSTONE, UItems.BOTCHED_GEM, UItems.MAGIC_STAFF, UItems.FILLED_JAR).forEach(item -> { - registry.setDefaultComparison(item, comparison -> COMPARING_BOTH); + registry.setDefaultComparison(item, comparison -> Comparison.compareNbt()); }); registry.getRecipeManager().listAllOfType(RecipeType.CRAFTING).stream() diff --git a/src/main/java/com/minelittlepony/unicopia/compat/emi/SpellbookEmiRecipe.java b/src/main/java/com/minelittlepony/unicopia/compat/emi/SpellbookEmiRecipe.java index a3d1b02b..58b10365 100644 --- a/src/main/java/com/minelittlepony/unicopia/compat/emi/SpellbookEmiRecipe.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/emi/SpellbookEmiRecipe.java @@ -86,7 +86,7 @@ class SpellbookEmiRecipe implements EmiRecipe, SpellbookRecipe.CraftingTreeBuild } } widgets.addSlot(inputs.get(0), gem.get(0).left(), gem.get(0).top()).drawBack(false); - widgets.addSlot(getOutput(), 190, 60).output(true).recipeContext(this); + widgets.addSlot(getOutput(), 190, 60).large(true).recipeContext(this); } protected EmiIngredient getOutput() {