From 006ad109cba3c9d162aaa6cbf1acd7c4f58adc47 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sun, 2 Jun 2019 17:42:07 +0100 Subject: [PATCH] Update to 1.14.2 Ughr, mapping changes. Though this time they weren't too bad I guess. --- build.gradle | 7 +++---- gradle.properties | 4 ++-- .../java/dan200/computercraft/client/gui/GuiComputer.java | 4 ++-- .../java/dan200/computercraft/client/gui/GuiDiskDrive.java | 4 ++-- .../java/dan200/computercraft/client/gui/GuiPrinter.java | 4 ++-- .../java/dan200/computercraft/client/gui/GuiPrintout.java | 4 ++-- .../java/dan200/computercraft/client/gui/GuiTurtle.java | 4 ++-- .../computercraft/shared/common/ColourableRecipe.java | 2 +- .../shared/computer/recipe/ComputerConvertRecipe.java | 2 +- .../shared/computer/recipe/ComputerFamilyRecipe.java | 2 +- .../computercraft/shared/media/recipes/DiskRecipe.java | 2 +- .../computercraft/shared/media/recipes/PrintoutRecipe.java | 2 +- .../dan200/computercraft/shared/mixin/MixinScreen.java | 2 +- .../shared/network/container/ContainerType.java | 6 +++--- .../shared/pocket/recipes/PocketComputerUpgradeRecipe.java | 2 +- .../shared/turtle/recipes/TurtleUpgradeRecipe.java | 2 +- .../shared/turtle/upgrades/TurtleInventoryCrafting.java | 2 +- .../dan200/computercraft/shared/util/ImpostorRecipe.java | 2 +- .../computercraft/shared/util/ImpostorShapelessRecipe.java | 4 ++-- 19 files changed, 30 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index edd773112..e2158dea6 100644 --- a/build.gradle +++ b/build.gradle @@ -53,9 +53,8 @@ configurations { dependencies { minecraft "com.mojang:minecraft:${mc_version}" mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}" - // modCompile "net.fabricmc:fabric-loader:0.4.6+build.143" - modCompile "net.fabricmc:fabric-loader:0.4.6+build.141" - modCompile "net.fabricmc.fabric-api:fabric-api:0.3.0-pre+build.156" + modCompile "net.fabricmc:fabric-loader:0.4.8+build.153" + modCompile "net.fabricmc.fabric-api:fabric-api:0.3.0+build.175" implementation 'com.google.code.findbugs:jsr305:3.0.2' @@ -239,7 +238,7 @@ curseforge { apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : '' project { id = '282001' - addGameVersion '1.14.1' + addGameVersion '1.14.2' releaseType = 'beta' changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})." diff --git a/gradle.properties b/gradle.properties index 41d0e6bf7..20607e4ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ mod_version=1.82.4 # Minecraft properties -mc_version=1.14.1 -mappings_version=5 +mc_version=1.14.2 +mappings_version=2 diff --git a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java index 7b8861e72..bee2e5a0d 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java @@ -14,14 +14,14 @@ import dan200.computercraft.shared.computer.blocks.TileComputer; import dan200.computercraft.shared.computer.core.ClientComputer; import dan200.computercraft.shared.computer.core.ComputerFamily; import dan200.computercraft.shared.computer.inventory.ContainerComputer; -import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.container.Container; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.network.chat.TextComponent; import net.minecraft.util.Identifier; import org.lwjgl.glfw.GLFW; -public class GuiComputer extends ContainerScreen +public class GuiComputer extends AbstractContainerScreen { private static final Identifier BACKGROUND_NORMAL = new Identifier( "computercraft", "textures/gui/corners_normal.png" ); private static final Identifier BACKGROUND_ADVANCED = new Identifier( "computercraft", "textures/gui/corners_advanced.png" ); diff --git a/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java b/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java index 6a5f03c81..663a5bc27 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java @@ -9,12 +9,12 @@ package dan200.computercraft.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive; -import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.Identifier; -public class GuiDiskDrive extends ContainerScreen +public class GuiDiskDrive extends AbstractContainerScreen { private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/disk_drive.png" ); diff --git a/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java b/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java index 46834ea70..1c8f688c8 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java @@ -9,12 +9,12 @@ package dan200.computercraft.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.printer.ContainerPrinter; -import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.Identifier; -public class GuiPrinter extends ContainerScreen +public class GuiPrinter extends AbstractContainerScreen { private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/printer.png" ); diff --git a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java index c2deaf52d..9ec3adeee 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java @@ -10,13 +10,13 @@ import com.mojang.blaze3d.platform.GlStateManager; import dan200.computercraft.core.terminal.TextBuffer; import dan200.computercraft.shared.common.ContainerHeldItem; import dan200.computercraft.shared.media.items.ItemPrintout; -import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.entity.player.PlayerInventory; import org.lwjgl.glfw.GLFW; import static dan200.computercraft.client.render.PrintoutRenderer.*; -public class GuiPrintout extends ContainerScreen +public class GuiPrintout extends AbstractContainerScreen { private final boolean m_book; private final int m_pages; diff --git a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java index 49ede4cab..25d6c1323 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java @@ -14,12 +14,12 @@ import dan200.computercraft.shared.computer.core.ClientComputer; import dan200.computercraft.shared.computer.core.ComputerFamily; import dan200.computercraft.shared.turtle.blocks.TileTurtle; import dan200.computercraft.shared.turtle.inventory.ContainerTurtle; -import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.Identifier; import org.lwjgl.glfw.GLFW; -public class GuiTurtle extends ContainerScreen +public class GuiTurtle extends AbstractContainerScreen { private static final Identifier BACKGROUND_NORMAL = new Identifier( "computercraft", "textures/gui/turtle_normal.png" ); private static final Identifier BACKGROUND_ADVANCED = new Identifier( "computercraft", "textures/gui/turtle_advanced.png" ); diff --git a/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java b/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java index 473ec6e24..b5257b174 100644 --- a/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java +++ b/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java @@ -12,8 +12,8 @@ import dan200.computercraft.shared.util.ColourUtils; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.SpecialRecipeSerializer; -import net.minecraft.recipe.crafting.SpecialCraftingRecipe; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerConvertRecipe.java b/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerConvertRecipe.java index 778a33d46..8f96e59d4 100644 --- a/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerConvertRecipe.java +++ b/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerConvertRecipe.java @@ -10,7 +10,7 @@ import dan200.computercraft.shared.computer.items.IComputerItem; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.crafting.ShapedRecipe; +import net.minecraft.recipe.ShapedRecipe; import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerFamilyRecipe.java b/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerFamilyRecipe.java index 65dd2fb1f..2637b83df 100644 --- a/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerFamilyRecipe.java +++ b/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerFamilyRecipe.java @@ -12,7 +12,7 @@ import dan200.computercraft.shared.util.RecipeUtil; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.crafting.ShapedRecipe; +import net.minecraft.recipe.ShapedRecipe; import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; diff --git a/src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java b/src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java index 9fad5439b..1ca023f8f 100644 --- a/src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java +++ b/src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java @@ -15,8 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.SpecialRecipeSerializer; -import net.minecraft.recipe.crafting.SpecialCraftingRecipe; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/media/recipes/PrintoutRecipe.java b/src/main/java/dan200/computercraft/shared/media/recipes/PrintoutRecipe.java index b9e502ff7..5d307546b 100644 --- a/src/main/java/dan200/computercraft/shared/media/recipes/PrintoutRecipe.java +++ b/src/main/java/dan200/computercraft/shared/media/recipes/PrintoutRecipe.java @@ -12,8 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.SpecialRecipeSerializer; -import net.minecraft.recipe.crafting.SpecialCraftingRecipe; import net.minecraft.util.Identifier; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/mixin/MixinScreen.java b/src/main/java/dan200/computercraft/shared/mixin/MixinScreen.java index b2948bbae..e833a365d 100644 --- a/src/main/java/dan200/computercraft/shared/mixin/MixinScreen.java +++ b/src/main/java/dan200/computercraft/shared/mixin/MixinScreen.java @@ -7,7 +7,7 @@ package dan200.computercraft.shared.mixin; import dan200.computercraft.shared.command.CommandCopy; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/dan200/computercraft/shared/network/container/ContainerType.java b/src/main/java/dan200/computercraft/shared/network/container/ContainerType.java index 57e51c977..73281d437 100644 --- a/src/main/java/dan200/computercraft/shared/network/container/ContainerType.java +++ b/src/main/java/dan200/computercraft/shared/network/container/ContainerType.java @@ -9,7 +9,7 @@ package dan200.computercraft.shared.network.container; import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry; import net.fabricmc.fabric.api.container.ContainerProviderRegistry; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.container.Container; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -43,7 +43,7 @@ public interface ContainerType } ); } - static > void registerGui( Supplier containerType, ContainerFactory> factory ) + static > void registerGui( Supplier containerType, ContainerFactory> factory ) { ScreenProviderRegistry.INSTANCE.registerFactory( containerType.get().getId(), ( id, type, player, packet ) -> { T container = containerType.get(); @@ -52,7 +52,7 @@ public interface ContainerType } ); } - static > void registerGui( Supplier containerType, BiFunction> factory ) + static > void registerGui( Supplier containerType, BiFunction> factory ) { ScreenProviderRegistry.INSTANCE.registerFactory( containerType.get().getId(), container -> factory.apply( container, MinecraftClient.getInstance().player.inventory ) ); diff --git a/src/main/java/dan200/computercraft/shared/pocket/recipes/PocketComputerUpgradeRecipe.java b/src/main/java/dan200/computercraft/shared/pocket/recipes/PocketComputerUpgradeRecipe.java index 325d75302..3ec201c50 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/recipes/PocketComputerUpgradeRecipe.java +++ b/src/main/java/dan200/computercraft/shared/pocket/recipes/PocketComputerUpgradeRecipe.java @@ -14,8 +14,8 @@ import dan200.computercraft.shared.pocket.items.PocketComputerItemFactory; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.SpecialRecipeSerializer; -import net.minecraft.recipe.crafting.SpecialCraftingRecipe; import net.minecraft.util.Identifier; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleUpgradeRecipe.java b/src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleUpgradeRecipe.java index 1dc69fa60..a4ed147e2 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleUpgradeRecipe.java +++ b/src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleUpgradeRecipe.java @@ -15,8 +15,8 @@ import dan200.computercraft.shared.turtle.items.TurtleItemFactory; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.SpecialRecipeSerializer; -import net.minecraft.recipe.crafting.SpecialCraftingRecipe; import net.minecraft.util.Identifier; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java index 555833d4b..ebbf71b9b 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java @@ -12,8 +12,8 @@ import dan200.computercraft.shared.turtle.core.TurtlePlayer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; +import net.minecraft.recipe.CraftingRecipe; import net.minecraft.recipe.RecipeType; -import net.minecraft.recipe.crafting.CraftingRecipe; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.DefaultedList; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java b/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java index fa0217c8a..9cf61a79c 100644 --- a/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java +++ b/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java @@ -12,7 +12,7 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.crafting.ShapedRecipe; +import net.minecraft.recipe.ShapedRecipe; import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; diff --git a/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java b/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java index ed5f80e7e..f5d4a31ec 100644 --- a/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java +++ b/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java @@ -13,8 +13,8 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.crafting.ShapedRecipe; -import net.minecraft.recipe.crafting.ShapelessRecipe; +import net.minecraft.recipe.ShapedRecipe; +import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper;