Переглянути джерело

v2.3.1.53

- Removed 19w08a-b ram fix
- Fixed version checker
Unknown 6 роки тому
батько
коміт
c59b9031b6

+ 0 - 8
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
-}

+ 0 - 1
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);
     

+ 0 - 29
src/main/java/me/shedaniel/rei/mixin/MixinTextureManager.java

@@ -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;
-    }
-    
-}

+ 2 - 1
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();

+ 2 - 2
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"

+ 1 - 2
src/main/resources/roughlyenoughitems.client.json

@@ -10,8 +10,7 @@
     "MixinCraftingTableScreen",
     "MixinCreativePlayerInventoryScreen",
     "MixinBrewingRecipeRegistry",
-    "MixinRecipeBookGui",
-    "MixinTextureManager"
+    "MixinRecipeBookGui"
   ],
   "injectors": {
     "defaultRequire": 1