diff --git a/README.md b/README.md index 36ba1b8..555ff8a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,32 @@ +This is a fork of ProfMobius' mod [Opis](http://minecraft.curseforge.com/projects/opis). +Opis is an important tool for profiling the client and server using a user-friendly GUI. +The main changes of this fork are: + +* Removal of the integrated [MapWriter](minecraft.curseforge.com/projects/mapwriter-2) mod +* Removal of overlays that required MapWriter +* Integration of MobiusCore as opposed to building it as an external mod +* Fix for client profiling data "" strings + +# Rationale + +This fork was undertaken as an emergency fix for FTB Infinity, after Opis was removed +in 2.1.2 [for compatibility reasons](http://www.feed-the-beast.com/projects/ftb-infinity-evolved/files/2265972). +The incompatibility arises from a [MapWriter bug](https://bitbucket.org/ProfMobius/opis/issues/125/client-crash). + +## Why remove MapWriter? + +This is a personal choice. In a pack such as Infinity, mapping is already provided by +another mod such as JourneyMap. Subjectively, MapWriter is a less useful minimap. It +became an annoyance to attempt to disable it every pack (re)installation. I thought it OK +as I did not find any use for overlay functionality. + +## Why integrate MobiusCore? + +Subjectively, I found it too cumbersome in development to work with MobiusCore as a +separate mod and codebase whilst attempting to update Opis. I found that MobiusCore is +[not depended upon by any other mods](http://minecraft.curseforge.com/projects/mobiuscore/relations/dependents?filter-related-dependents=3), +so I thought it OK to integrate as a git submodule instead. + # Building ## Requirements diff --git a/build.gradle b/build.gradle index e10ef36..27b17e0 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { apply plugin: 'forge' // Gradle project metadata -version = "1.2.5_1.7.10" +version = "1.3.0-MAPLESS_1.7.10" group = "mcp.mobius.opis" minecraft { @@ -30,6 +30,12 @@ minecraft { version = "1.7.10-10.13.1.1217" runDir = "debug" + // Replace MOD_VERSION token with one specified in Gradle + // From https://github.com/GoryMoon/MoarSigns/blob/master/build.gradle#L46 + replaceIn "CoreContainer.java" + replaceIn "modOpis.java" + replace "@MOD_VERSION@", project.version + // Shading - https://forgegradle.readthedocs.org/en/latest/user-guide/shading/ // math3 is shaded in case another mod decides to use a differing version srgExtra "PK: org/apache/commons/math3 opisapache/math3" diff --git a/lib/MobiusCore b/lib/MobiusCore index 9d3fc5a..e279819 160000 --- a/lib/MobiusCore +++ b/lib/MobiusCore @@ -1 +1 @@ -Subproject commit 9d3fc5affab5dadbd7f81f50a25d671bbd6430e8 +Subproject commit e2798191fad3ae85a51456281e32a9572ae2824d diff --git a/src/main/java/mcp/mobius/opis/modOpis.java b/src/main/java/mcp/mobius/opis/modOpis.java index 18e2e57..42ec308 100644 --- a/src/main/java/mcp/mobius/opis/modOpis.java +++ b/src/main/java/mcp/mobius/opis/modOpis.java @@ -32,7 +32,7 @@ import net.minecraftforge.common.config.Configuration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@Mod(modid="Opis", name="Opis", version="1.2.4", dependencies="required-after:MobiusCore@[1.2.4]", acceptableRemoteVersions="*") +@Mod(modid="Opis", name="Opis", version="@MOD_VERSION@", acceptableRemoteVersions="*") //@Mod(modid="Opis", name="Opis", version="1.3.0", dependencies="required-after:MobiusCore@[1.2.4]", acceptableRemoteVersions="*") diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 013f99b..3b83bde 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -7,7 +7,7 @@ "mcversion": "${mcversion}", "url": "", "updateUrl": "", - "authors": ["ProfMobius"], + "authors": ["ProfMobius", "RoyCurtis"], "credits": "", "logoFile": "", "screenshots": [],