1.13 Portlegacy/2.x-1.13-rift

11 files changed, 29 insertions, 52 deletions

diff --git a/build.gradle b/build.gradle
index b455b1b17..790ed78f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven { url 'https://www.jitpack.io' }
+        maven { url 'https://www.dimdev.org/maven/' }
         maven { url 'https://files.minecraftforge.net/maven' }
         maven { url 'http://repo.spongepowered.org/maven' }
     }
     dependencies {
-        classpath 'com.github.Chocohead:ForgeGradle:jitpack-SNAPSHOT'
+        classpath 'org.dimdev:ForgeGradle:2.3-SNAPSHOT'
         classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
     }
 }
@@ -25,13 +25,12 @@ targetCompatibility = 1.8
 repositories {
     mavenCentral()
     maven { url 'https://www.dimdev.org/maven/' }
-    maven { url 'https://www.jitpack.io' }
     maven { url 'https://repo.spongepowered.org/maven/' }
     maven { url "http://repo.strezz.org/artifactory/list/Strezz-Central" }
 }
 
 dependencies {
-    implementation 'com.github.Chocohead:Rift:jitpack-SNAPSHOT:dev'
+    implementation 'org.dimdev:rift:1.0.4-87:dev'
     implementation 'com.google.code.gson:gson:2.8.5'
 }
 
@@ -48,8 +47,8 @@ mixin {
 }
 
 minecraft {
-    version = '1.13.2'
-    mappings = 'snapshot_20181130'
+    version = '1.13'
+    mappings = 'snapshot_20180908'
     runDir = 'run'
     tweakClass = 'org.dimdev.riftloader.launch.RiftLoaderClientTweaker'
 }
diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelper.java b/src/main/java/me/shedaniel/rei/client/ClientHelper.java
index 87e438ab3..21008d5bb 100644
--- a/src/main/java/me/shedaniel/rei/client/ClientHelper.java
+++ b/src/main/java/me/shedaniel/rei/client/ClientHelper.java
@@ -19,7 +19,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
 import org.dimdev.riftloader.RiftLoader;
 
 import java.awt.*;
@@ -39,7 +38,7 @@ public class ClientHelper {
     
     public static String getModFromItemStack(ItemStack stack) {
         if (!stack.isEmpty()) {
-            ResourceLocation location = IRegistry.ITEM.getKey(stack.getItem());
+            ResourceLocation location = Item.REGISTRY.getKey(stack.getItem());
             assert location != null;
             String modid = location.getNamespace();
             if (modid.equalsIgnoreCase("minecraft"))
@@ -92,7 +91,7 @@ public class ClientHelper {
                 return false;
             }
         } else {
-            ResourceLocation location = IRegistry.ITEM.getKey(cheatedStack.getItem());
+            ResourceLocation location = Item.REGISTRY.getKey(cheatedStack.getItem());
             String tagMessage = cheatedStack.copy().getTag() != null && !cheatedStack.copy().getTag().isEmpty() ? cheatedStack.copy().getTag().toString() : "";
             String madeUpCommand = ConfigHelper.getInstance().getGiveCommandPrefix() + " " + Minecraft.getInstance().player.getScoreboardName() + " " + location.toString() + tagMessage + (cheatedStack.getCount() != 1 ? " " + cheatedStack.getCount() : "");
             if (madeUpCommand.length() > 256)
@@ -131,11 +130,11 @@ public class ClientHelper {
     }
     
     public void clientLoaded() {
-        IRegistry.ITEM.forEach(item -> {
+        Item.REGISTRY.forEach(item -> {
             if (!item.equals(Items.ENCHANTED_BOOK))
                 registerItem(item);
         });
-        IRegistry.ENCHANTMENT.forEach(enchantment -> {
+        Enchantment.REGISTRY.forEach(enchantment -> {
             for(int i = enchantment.getMinLevel(); i < enchantment.getMaxLevel(); i++) {
                 Map<Enchantment, Integer> map = new HashMap<>();
                 map.put(enchantment, i);
diff --git a/src/main/java/me/shedaniel/rei/client/GuiHelper.java b/src/main/java/me/shedaniel/rei/client/GuiHelper.java
index 1f603463b..67cd160e0 100644
--- a/src/main/java/me/shedaniel/rei/client/GuiHelper.java
+++ b/src/main/java/me/shedaniel/rei/client/GuiHelper.java
@@ -55,7 +55,8 @@ public class GuiHelper implements ClientTickable {
     }
     
     @Override
-    public void clientTick(Minecraft client) {
+    public void clientTick() {
+        Minecraft client = Minecraft.getInstance();
         if (client.currentScreen instanceof GuiContainer && lastGuiContainer != client.currentScreen) {
             GuiHelper.lastGuiContainer = (GuiContainer) client.currentScreen;
             GuiHelper.lastMixinGuiContainer = (IMixinGuiContainer) lastGuiContainer;
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java
index e1963ea12..aa127b4c0 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java
@@ -1,7 +1,6 @@
 package me.shedaniel.rei.gui;
 
 import com.google.common.collect.Lists;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.client.ClientHelper;
 import me.shedaniel.rei.client.ConfigHelper;
 import me.shedaniel.rei.client.GuiHelper;
@@ -119,7 +118,7 @@ public class ContainerGuiOverlay extends GuiScreen {
             });
         
         this.itemListOverlay.updateList(getItemListArea(), page, searchTerm);
-        this.children.addAll(widgets);
+        this.eventListeners.addAll(widgets);
     }
     
     private Rectangle getTextFieldArea() {
@@ -260,7 +259,7 @@ public class ContainerGuiOverlay extends GuiScreen {
         }
         if (!GuiHelper.isOverlayVisible())
             return false;
-        for(IGuiEventListener listener : children)
+        for(IGuiEventListener listener : eventListeners)
             if (listener.keyPressed(int_1, int_2, int_3))
                 return true;
         Point point = ClientHelper.getMouseLocation();
@@ -294,7 +293,7 @@ public class ContainerGuiOverlay extends GuiScreen {
     public boolean charTyped(char char_1, int int_1) {
         if (!GuiHelper.isOverlayVisible())
             return false;
-        for(IGuiEventListener listener : children)
+        for(IGuiEventListener listener : eventListeners)
             if (listener.charTyped(char_1, int_1))
                 return true;
         return super.charTyped(char_1, int_1);
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java
index 99e36f0c9..cdefb7948 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java
@@ -1,7 +1,7 @@
 package me.shedaniel.rei.gui.widget;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SimpleSound;
+import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
@@ -106,7 +106,7 @@ public abstract class ButtonWidget extends Gui implements IWidget {
     @Override
     public boolean onMouseClick(int button, double mouseX, double mouseY) {
         if (bounds.contains(mouseX, mouseY) && enabled) {
-            Minecraft.getInstance().getSoundHandler().play(SimpleSound.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
+            Minecraft.getInstance().getSoundHandler().play(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
             onPressed(button, mouseX, mouseY);
             return true;
         }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetGui.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetGui.java
index 22bc5d03c..56f7f7909 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetGui.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetGui.java
@@ -10,7 +10,7 @@ import me.shedaniel.rei.client.GuiHelper;
 import me.shedaniel.rei.client.RecipeHelper;
 import net.minecraft.client.MainWindow;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SimpleSound;
+import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -72,7 +72,7 @@ public class RecipeViewingWidgetGui extends GuiScreen {
             Minecraft.getInstance().displayGuiScreen(GuiHelper.getLastGuiContainer());
             return true;
         }
-        for(IGuiEventListener listener : children)
+        for(IGuiEventListener listener : eventListeners)
             if (listener.keyPressed(int_1, int_2, int_3))
                 return true;
         return super.keyPressed(int_1, int_2, int_3);
@@ -160,7 +160,7 @@ public class RecipeViewingWidgetGui extends GuiScreen {
                     @Override
                     public boolean onMouseClick(int button, double mouseX, double mouseY) {
                         if (getBounds().contains(mouseX, mouseY)) {
-                            Minecraft.getInstance().getSoundHandler().play(SimpleSound.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
+                            Minecraft.getInstance().getSoundHandler().play(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
                             if (getId() + categoryPages * 6 == categories.indexOf(selectedCategory))
                                 return false;
                             selectedCategory = categories.get(getId() + categoryPages * 6);
@@ -195,9 +195,9 @@ public class RecipeViewingWidgetGui extends GuiScreen {
         }
         
         GuiHelper.getLastOverlay().onInitialized();
-        children.addAll(tabs);
-        children.add(GuiHelper.getLastOverlay());
-        children.addAll(widgets);
+        eventListeners.addAll(tabs);
+        eventListeners.add(GuiHelper.getLastOverlay());
+        eventListeners.addAll(widgets);
     }
     
     private int getRecipesPerPage() {
@@ -255,7 +255,7 @@ public class RecipeViewingWidgetGui extends GuiScreen {
     
     @Override
     public boolean charTyped(char char_1, int int_1) {
-        for(IGuiEventListener listener : children)
+        for(IGuiEventListener listener : eventListeners)
             if (listener.charTyped(char_1, int_1))
                 return true;
         return super.charTyped(char_1, int_1);
@@ -263,7 +263,7 @@ public class RecipeViewingWidgetGui extends GuiScreen {
     
     @Override
     public boolean mouseScrolled(double amount) {
-        for(IGuiEventListener listener : children)
+        for(IGuiEventListener listener : eventListeners)
             if (listener.mouseScrolled(amount))
                 return true;
         if (getBounds().contains(ClientHelper.getMouseLocation())) {
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java b/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java
index 556e62871..cc2100e1d 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java
@@ -66,7 +66,7 @@ public class MixinGuiContainer extends GuiScreen implements IMixinGuiContainer {
         GuiHelper.setLastGuiContainer((GuiContainer) (Object) this);
         GuiHelper.setLastMixinGuiContainer((IMixinGuiContainer) this);
         GuiHelper.setOverlay(new ContainerGuiOverlay());
-        this.children.add(GuiHelper.getLastOverlay());
+        this.eventListeners.add(GuiHelper.getLastOverlay());
     }
     
     @Inject(method = "render(IIF)V", at = @At("RETURN"))
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java b/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java
index e96c2d318..66d3340b7 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java
@@ -4,7 +4,7 @@ import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.RoughlyEnoughItemsPlugin;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.item.crafting.RecipeManager;
-import net.minecraft.network.play.server.SPacketUpdateRecipes;
+import net.minecraft.network.play.server.SPacketUpdateRecipesPacket;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -20,7 +20,7 @@ public class MixinNetHandlerPlayClient {
     private RecipeManager recipeManager;
     
     @Inject(method = "handleUpdateRecipes", at = @At("RETURN"))
-    private void onUpdateRecipes(SPacketUpdateRecipes packetIn, CallbackInfo ci) {
+    private void onUpdateRecipes(SPacketUpdateRecipesPacket packetIn, CallbackInfo ci) {
         RoughlyEnoughItemsPlugin.discoverPlugins();
         RoughlyEnoughItemsCore.getRecipeHelper().recipesLoaded(recipeManager);
     }
diff --git a/src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java b/src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java
index 67ee4fd65..003727179 100644
--- a/src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java
+++ b/src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java
@@ -27,7 +27,7 @@ public class CreateItemsPacket implements Packet<INetHandlerPlayServer> {
     
     @Override
     public void readPacketData(PacketBuffer packetBuffer) throws IOException {
-        stack = ItemStack.read(packetBuffer.readCompoundTag());
+        stack = ItemStack.loadFromNBT(packetBuffer.readCompoundTag());
     }
     
     @Override
diff --git a/src/main/java/me/shedaniel/rei/update/UpdateChecker.java b/src/main/java/me/shedaniel/rei/update/UpdateChecker.java
index 46ee48c69..de0de5844 100644
--- a/src/main/java/me/shedaniel/rei/update/UpdateChecker.java
+++ b/src/main/java/me/shedaniel/rei/update/UpdateChecker.java
@@ -21,7 +21,7 @@ public class UpdateChecker implements InitializationListener {
     
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
     private static final Version CURRENT_VERSION = new Version("2.2.0.16");
-    private static final String CURRENT_GAME_VERSION = "1.13.2";
+    private static final String CURRENT_GAME_VERSION = "1.13";
     private static Version latestForGame = null;
     private static JsonVersionElement element;
     private static String VERSION_STRING = "https://raw.githubusercontent.com/shedaniel/RoughlyEnoughItems/1.13.2-rewrite/version.json";
diff --git a/version.json b/version.json
deleted file mode 100644
index e906456b4..000000000
--- a/version.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "latest": [
-    {
-      "game": "1.13",
-      "mod": "2.2.0.16"
-    },
-    {
-      "game": "1.13.2",
-      "mod": "2.2.0.16"
-    }
-  ],
-  "changelogs": {
-    "rift": [
-      {
-        "version": "2.2.0.16",
-        "text": "Added a version checker, an option to mirror the item panel and fixed interacting with REI when hidden.",
-        "level": "light"
-      }
-    ]
-  }
-}
\ No newline at end of file