diff options
| author | Unknown <shekwancheung0528@gmail.com> | 2019-02-28 17:29:49 +0800 |
|---|---|---|
| committer | Unknown <shekwancheung0528@gmail.com> | 2019-02-28 17:29:49 +0800 |
| commit | 0924138bc88c1cfa8a3cee5089dc8792555e70fa (patch) | |
| tree | bd0d2c5eda1239fe078f5271b07ca87c0c7fe67d | |
| parent | 04f96f866d09002808c2bf6ab1f252f781751617 (diff) | |
| download | RoughlyEnoughItems-0924138bc88c1cfa8a3cee5089dc8792555e70fa.tar.gz RoughlyEnoughItems-0924138bc88c1cfa8a3cee5089dc8792555e70fa.tar.bz2 RoughlyEnoughItems-0924138bc88c1cfa8a3cee5089dc8792555e70fa.zip | |
v2.3.1.53
- Removed 19w08a-b ram fix
- Fixed version checker
| -rwxr-xr-x | build.gradle | 8 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/client/REIConfig.java | 1 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/mixin/MixinTextureManager.java | 29 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/update/UpdateChecker.java | 3 | ||||
| -rwxr-xr-x | src/main/resources/fabric.mod.json | 4 | ||||
| -rwxr-xr-x | src/main/resources/roughlyenoughitems.client.json | 3 |
6 files changed, 5 insertions, 43 deletions
diff --git a/build.gradle b/build.gradle index 38e09c590..3c1b8065e 100755 --- a/build.gradle +++ b/build.gradle @@ -37,11 +37,3 @@ dependencies { modCompile "info.tehnut.pluginloader:plugin-loader:${pluginLoaderVersion}" } - -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} diff --git a/src/main/java/me/shedaniel/rei/client/REIConfig.java b/src/main/java/me/shedaniel/rei/client/REIConfig.java index 6307fae2d..d1af5e9c2 100644 --- a/src/main/java/me/shedaniel/rei/client/REIConfig.java +++ b/src/main/java/me/shedaniel/rei/client/REIConfig.java @@ -21,7 +21,6 @@ public class REIConfig { public boolean loadDefaultPlugin = true; public boolean disableCreditsButton = false; public int maxRecipePerPage = 3; - public boolean fixRamUsage = false; public boolean showUtilsButtons = false; public RelativePoint choosePageDialogPoint = new RelativePoint(.5, .5); diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinTextureManager.java b/src/main/java/me/shedaniel/rei/mixin/MixinTextureManager.java deleted file mode 100644 index 25ee1eb9d..000000000 --- a/src/main/java/me/shedaniel/rei/mixin/MixinTextureManager.java +++ /dev/null @@ -1,29 +0,0 @@ -package me.shedaniel.rei.mixin; - -import me.shedaniel.rei.RoughlyEnoughItemsCore; -import net.minecraft.client.texture.Texture; -import net.minecraft.client.texture.TextureManager; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -/* This should not be used by the public, just useful for me, enable in config file */ -@Mixin(TextureManager.class) -public abstract class MixinTextureManager { - - private boolean rei_already = false; - - @Inject(method = "registerTexture", at = @At("HEAD"), cancellable = true) - private void registerTexture(Identifier identifier_1, Texture texture_1, final CallbackInfoReturnable<Boolean> cir) { - if (!RoughlyEnoughItemsCore.getConfigHelper().getConfig().fixRamUsage) - return; - if (identifier_1.equals(new Identifier("textures/gui/title/mojang.png"))) - if (rei_already) - cir.setReturnValue(false); - else - rei_already = true; - } - -} diff --git a/src/main/java/me/shedaniel/rei/update/UpdateChecker.java b/src/main/java/me/shedaniel/rei/update/UpdateChecker.java index 843541690..effa75ab3 100644 --- a/src/main/java/me/shedaniel/rei/update/UpdateChecker.java +++ b/src/main/java/me/shedaniel/rei/update/UpdateChecker.java @@ -113,8 +113,9 @@ public class UpdateChecker implements ClientModInitializer { FabricLoader.INSTANCE.getMods().stream().map(ModContainer::getInfo).forEach(modInfo -> { if (modInfo.getId().equals("roughlyenoughitems")) try { - currentVersion = new Version(modInfo.getVersionString()); + currentVersion = new Version(modInfo.getDescription().substring(53)); } catch (Exception e) { + RoughlyEnoughItemsCore.LOGGER.warn("Can't load REI version, report if this is not in development environment!"); } }); InputStream downloadedStream = downloadVersionString(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2844d1b72..ffc0d37e3 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "id": "roughlyenoughitems", "name": "RoughlyEnoughItems", - "description": "To allow players to view items and recipes.", + "description": "To allow players to view items and recipes. Version: ${version}", "version": "2.3.1", "side": "client", "authors": [ @@ -12,7 +12,7 @@ "me.shedaniel.rei.client.ClientHelper" ], "requires": { - "fabric": "0.2.2" + "fabric": "0.2.3" }, "recommended": { "pluginloader": "1.0.6" diff --git a/src/main/resources/roughlyenoughitems.client.json b/src/main/resources/roughlyenoughitems.client.json index 83080b10f..59788fa07 100755 --- a/src/main/resources/roughlyenoughitems.client.json +++ b/src/main/resources/roughlyenoughitems.client.json @@ -10,8 +10,7 @@ "MixinCraftingTableScreen", "MixinCreativePlayerInventoryScreen", "MixinBrewingRecipeRegistry", - "MixinRecipeBookGui", - "MixinTextureManager" + "MixinRecipeBookGui" ], "injectors": { "defaultRequire": 1 |
