diff --git a/CHANGELOG.md b/CHANGELOG.md index b63748f..867957c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog of JEI LOTR +## 1.3.1-BETA +* Updated to LOTR Renewed-2.2 +* Fixed that the transfer/click handlers didn't work anymore + ## 1.3.0-BETA ### New features: * Updated to LOTR Renewed-1.7.1 (added keg support) diff --git a/README.md b/README.md index 1411b88..2f7580b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The plugin adds JEI support for all devices and recipes added by the LOTR Mod. ## Dependencies JEI LOTR has the following dependencies: -- [The Lord of the Rings Mod Renewed v1.7.1](https://www.mediafire.com/file/nos4bbaml6c2tpz/) +- [The Lord of the Rings Mod Renewed v2.2](https://www.curseforge.com/minecraft/mc-mods/the-lord-of-the-rings-mod-renewed/files) - [JEI 1.15.2-6.0.3.15](https://www.curseforge.com/minecraft/mc-mods/jei/files/all) The plugin was created with the MinecraftForge version "1.15.2-31.2.31". diff --git a/build.gradle b/build.gradle index 5d644e5..6c6257a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: "net.minecrell.licenser" -version = '1.3.0-BETA' +version = '1.3.1-BETA' group = 'craftedMods.jeiLotr' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'jeilotr' diff --git a/gradle.properties b/gradle.properties index b307712..604e4ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false jei_mc_version=1.15.2 jei_version=6.0.3.15 -lotr_version=1.7.1 +lotr_version=2.2 diff --git a/src/main/java/craftedMods/jeiLotr/JEIPlugin.java b/src/main/java/craftedMods/jeiLotr/JEIPlugin.java index d6cd42e..343011a 100644 --- a/src/main/java/craftedMods/jeiLotr/JEIPlugin.java +++ b/src/main/java/craftedMods/jeiLotr/JEIPlugin.java @@ -113,12 +113,12 @@ public void initDevices () types.add (type); types.addAll (type.getMultiTableTypes ()); - RegistryObject> container = null; + RegistryObject> container = null; try { Field containerField = LOTRContainers.class.getDeclaredField (field.getName ()); - container = (RegistryObject>) containerField + container = (RegistryObject>) containerField .get (null); } catch (NoSuchFieldException e) @@ -248,22 +248,24 @@ public void registerGuiHandlers (IGuiHandlerRegistration registration) registration.addRecipeClickArea (KegScreen.class, 71, 48, 28, 23, new ResourceLocation ("lotr", "keg")); - registration.addGuiContainerHandler (LOTRGuiCrafting.class, new IGuiContainerHandler () - { - - @Override - public Collection getGuiClickableAreas (LOTRGuiCrafting containerScreen, double mouseX, - double mouseY) + registration.addGuiContainerHandler (FactionCraftingScreen.class, + new IGuiContainerHandler () { - ResourceLocation uid = containerScreen.getContainer ().isStandardCraftingActive () - ? VanillaRecipeCategoryUid.CRAFTING - : devicesByBlock.get (containerScreen.getContainer ().getCraftingBlock ()).uid; - IGuiClickableArea clickableArea = IGuiClickableArea.createBasic (88, 32, 28, 23, - uid); - return Collections.singleton (clickableArea); - } - }); + @Override + public Collection getGuiClickableAreas (FactionCraftingScreen containerScreen, + double mouseX, + double mouseY) + { + ResourceLocation uid = containerScreen.getContainer ().isStandardCraftingActive () + ? VanillaRecipeCategoryUid.CRAFTING + : devicesByBlock.get (containerScreen.getContainer ().getCraftingBlock ()).uid; + + IGuiClickableArea clickableArea = IGuiClickableArea.createBasic (88, 32, 28, 23, + uid); + return Collections.singleton (clickableArea); + } + }); if (theForgeField != null) { @@ -414,10 +416,10 @@ public void registerTransferHandlers (IRecipeTransferRegistration registration) private class LOTRCraftingTable extends LOTRDevice { - private final RegistryObject> container; + private final RegistryObject> container; public LOTRCraftingTable (ResourceLocation uid, ItemStack icon, Collection> recipeTypes, - RegistryObject> container) + RegistryObject> container) { super (uid, icon, recipeTypes); this.container = container; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index a5d4d2b..90417b4 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -3,7 +3,7 @@ loaderVersion="[27,)" issueTrackerURL="http:/github.com/CraftedMods/jei-lotr/issues" [[mods]] modId="jeilotr" -version="1.3.0-BETA" +version="1.3.1-BETA" displayName="JEI LOTR" updateJSONURL="https://raw.githubusercontent.com/CraftedMods/jei-lotr/master/versions.json" displayURL="http://github.com/CraftedMods/jei-lotr" @@ -33,7 +33,7 @@ A JEI-Plugin for the "The Lord of the Rings" Minecraft Mod. [[dependencies.jeilotr]] modId="lotr" mandatory=true - versionRange="[Renewed-1.7.1,)" + versionRange="[Renewed-2.2,)" ordering="NONE" side="BOTH" [[dependencies.jeilotr]] diff --git a/versions.json b/versions.json index 4bf50c1..321ee28 100644 --- a/versions.json +++ b/versions.json @@ -5,10 +5,11 @@ "1.0.0-BETA": "Updated to LOTR Renewed-1.1", "1.1.0-BETA": "Fixed that some faction crafting table recipes were not shown", "1.2.0-BETA": "Updated to LOTR Renewed-1.3", - "1.3.0-BETA": "Updated to LOTR Renewed-1.7.1 and fixed some alloy forge related bugs" + "1.3.0-BETA": "Updated to LOTR Renewed-1.7.1 and fixed some alloy forge related bugs", + "1.3.1-BETA": "Updated to LOTR Renewed-2.2" }, "promos": { - "1.15.2-latest": "1.3.0-BETA", - "1.15.2-recommended": "1.3.0-BETA" + "1.15.2-latest": "1.3.1-BETA", + "1.15.2-recommended": "1.3.1-BETA" } }