From 35d6c4867de224d30aa98c4ad2d86c2236e3b288 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 12 Sep 2020 16:20:47 +0100 Subject: [PATCH] Ported to 1.16.3 without JEI :cry: --- CHANGELOG.md | 9 +++ build.gradle | 4 +- gradle.properties | 4 +- .../client/MiningGadgetsJEI.java | 66 +++++++++---------- src/main/resources/META-INF/mods.toml | 6 +- 5 files changed, 49 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 346f0b43..0f3cfa81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Mining Gadgets Changelog The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +## 1.16.3 +### [1.6.0] - 2020-09-12 +> note: Lots has been ported up from `1.16.1` since our first `1.16.2 ` release see: +> https://github.com/Direwolf20-MC/MiningGadgets/blob/master/CHANGELOG.md#142---2020-09-12 and +> https://github.com/Direwolf20-MC/MiningGadgets/blob/master/CHANGELOG.md#141---2020-08-21 for more info + +#### Changed +- Ported to 1.16.3 + ## 1.16.2 ### [1.5.1] - 2020-09-12 > note: Lots has been ported up from `1.16.1` since our first `1.16.2 ` release see: diff --git a/build.gradle b/build.gradle index 1a6c2333..29bb8d2b 100644 --- a/build.gradle +++ b/build.gradle @@ -113,8 +113,8 @@ dependencies { minecraft "net.minecraftforge:forge:${forge_version}" //JEI - compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api") - runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}") +// compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api") +// runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}") // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" diff --git a/gradle.properties b/gradle.properties index 26722297..b5032eac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false #Mod Info -mod_version=1.5.1 +mod_version=1.16.3 #Dependencies -forge_version=1.16.2-33.0.61 +forge_version=1.16.3-34.0.1 mcp_version=20200820-1.16.1 jei_version=1.16.2:7.3.2.25 \ No newline at end of file diff --git a/src/main/java/com/direwolf20/mininggadgets/client/MiningGadgetsJEI.java b/src/main/java/com/direwolf20/mininggadgets/client/MiningGadgetsJEI.java index 9e4b78cf..1f662d1d 100644 --- a/src/main/java/com/direwolf20/mininggadgets/client/MiningGadgetsJEI.java +++ b/src/main/java/com/direwolf20/mininggadgets/client/MiningGadgetsJEI.java @@ -1,35 +1,35 @@ package com.direwolf20.mininggadgets.client; -import com.direwolf20.mininggadgets.common.Config; -import com.direwolf20.mininggadgets.common.MiningGadgets; -import com.direwolf20.mininggadgets.common.items.MiningGadget; -import com.direwolf20.mininggadgets.common.items.ModItems; -import mezz.jei.api.IModPlugin; -import mezz.jei.api.JeiPlugin; -import mezz.jei.api.ingredients.subtypes.ISubtypeInterpreter; -import mezz.jei.api.registration.ISubtypeRegistration; -import net.minecraft.util.ResourceLocation; - -@JeiPlugin -public class MiningGadgetsJEI implements IModPlugin { - @Override - public ResourceLocation getPluginUid() { - return new ResourceLocation(MiningGadgets.MOD_ID, "jei_plugin"); - } - - @Override - public void registerItemSubtypes(ISubtypeRegistration registration) { - registration.registerSubtypeInterpreter(ModItems.MININGGADGET.get(), itemStack -> { - if(!(itemStack.getItem() instanceof MiningGadget)) - return ISubtypeInterpreter.NONE; - - double energy = itemStack.getOrCreateTag().getDouble("energy"); - if (energy == 0) - return "empty"; - else if (energy == Config.MININGGADGET_MAXPOWER.get()) - return "charged"; - - return ISubtypeInterpreter.NONE; - }); - } -} +//import com.direwolf20.mininggadgets.common.Config; +//import com.direwolf20.mininggadgets.common.MiningGadgets; +//import com.direwolf20.mininggadgets.common.items.MiningGadget; +//import com.direwolf20.mininggadgets.common.items.ModItems; +//import mezz.jei.api.IModPlugin; +//import mezz.jei.api.JeiPlugin; +//import mezz.jei.api.ingredients.subtypes.ISubtypeInterpreter; +//import mezz.jei.api.registration.ISubtypeRegistration; +//import net.minecraft.util.ResourceLocation; +// +//@JeiPlugin +//public class MiningGadgetsJEI implements IModPlugin { +// @Override +// public ResourceLocation getPluginUid() { +// return new ResourceLocation(MiningGadgets.MOD_ID, "jei_plugin"); +// } +// +// @Override +// public void registerItemSubtypes(ISubtypeRegistration registration) { +// registration.registerSubtypeInterpreter(ModItems.MININGGADGET.get(), itemStack -> { +// if(!(itemStack.getItem() instanceof MiningGadget)) +// return ISubtypeInterpreter.NONE; +// +// double energy = itemStack.getOrCreateTag().getDouble("energy"); +// if (energy == 0) +// return "empty"; +// else if (energy == Config.MININGGADGET_MAXPOWER.get()) +// return "charged"; +// +// return ISubtypeInterpreter.NONE; +// }); +// } +//} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 0e3f963f..87b31023 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[33,)" +loaderVersion="[34,)" issueTrackerURL="https://github.com/Direwolf20-MC/MiningGadgets" license="MIT (https://github.com/Direwolf20-MC/MiningGadgets/blob/master/LICENSE.txt)" @@ -18,7 +18,7 @@ description='''Mining is better with lasers.''' [[dependencies.mininggadgets]] modId="forge" mandatory=true - versionRange="[33,)" + versionRange="[34,)" ordering="NONE" side="BOTH" @@ -26,6 +26,6 @@ description='''Mining is better with lasers.''' [[dependencies.mininggadgets]] modId="minecraft" mandatory=true - versionRange="[1.16.2]" + versionRange="[1.16.3]" ordering="NONE" side="BOTH"