From 6e001dd9cc618c4a31e138f1f0532ac1dd4b7fd0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 7 Aug 2020 21:51:48 +0100 Subject: [PATCH] 1.16.2-rc1 --- build.gradle | 8 ++++---- .../blockentity/generator/LightningRodBlockEntity.java | 2 +- .../techreborn/client/gui/GuiGreenhouseController.java | 4 ++-- src/main/java/techreborn/client/gui/GuiIronFurnace.java | 2 +- .../client/screen/builder/slot/FurnaceFuelSlot.java | 4 ++-- .../java/techreborn/items/FrequencyTransmitterItem.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 174b28b39..b5511c84b 100644 --- a/build.gradle +++ b/build.gradle @@ -73,12 +73,12 @@ configurations.all { } dependencies { - minecraft "com.mojang:minecraft:1.16.2-pre1" - mappings "net.fabricmc:yarn:1.16.2-pre1+build.13:v2" - modImplementation "net.fabricmc:fabric-loader:0.9.0+build.204" + minecraft "com.mojang:minecraft:1.16.2-rc1" + mappings "net.fabricmc:yarn:1.16.2-rc1+build.4:v2" + modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205" //Fabric api - modImplementation "net.fabricmc.fabric-api:fabric-api:0.16.1+build.387-1.16" + modImplementation "net.fabricmc.fabric-api:fabric-api:0.17.0+build.393-1.16" disabledOptionalDependency ("me.shedaniel:RoughlyEnoughItems:4.10.2") disabledOptionalDependency ('io.github.cottonmc:LibCD:2.4.1+1.15.2') diff --git a/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java b/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java index 925f01557..866164948 100644 --- a/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java @@ -81,7 +81,7 @@ public class LightningRodBlockEntity extends PowerAcceptorBlockEntity implements } LightningEntity lightningBolt = EntityType.LIGHTNING_BOLT.create(world); - lightningBolt.method_29495(Vec3d.ofBottomCenter(world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, getPos()))); + lightningBolt.refreshPositionAfterTeleport(Vec3d.ofBottomCenter(world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, getPos()))); if (!world.isClient) { world.spawnEntity(lightningBolt); diff --git a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java index 40e3270c5..7cfdadd94 100644 --- a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java +++ b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java @@ -74,7 +74,7 @@ public class GuiGreenhouseController extends GuiBase { .collect(Collectors.toList()); matrixStack.push(); - method_30901(matrixStack, list, mouseX, mouseY); + renderTooltip(matrixStack, list, mouseX, mouseY); matrixStack.pop(); } } @@ -97,7 +97,7 @@ public class GuiGreenhouseController extends GuiBase { .collect(Collectors.toList()); RenderSystem.pushMatrix(); - method_30901(matrixStack, list, mouseX - getGuiLeft(), mouseY - getGuiTop()); + renderTooltip(matrixStack, list, mouseX - getGuiLeft(), mouseY - getGuiTop()); RenderSystem.popMatrix(); } } diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index daea822e1..54675fa4d 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -93,7 +93,7 @@ public class GuiIronFurnace extends GuiBase { List list = new ArrayList<>(); list.add(new LiteralText(message)); - method_30901(matrixStack, list, mouseX, mouseY); + renderTooltip(matrixStack, list, mouseX, mouseY); GlStateManager.disableLighting(); GlStateManager.color4f(1, 1, 1, 1); diff --git a/src/main/java/techreborn/client/screen/builder/slot/FurnaceFuelSlot.java b/src/main/java/techreborn/client/screen/builder/slot/FurnaceFuelSlot.java index 14425946f..a34004dd2 100644 --- a/src/main/java/techreborn/client/screen/builder/slot/FurnaceFuelSlot.java +++ b/src/main/java/techreborn/client/screen/builder/slot/FurnaceFuelSlot.java @@ -42,8 +42,8 @@ public class FurnaceFuelSlot extends BaseSlot { } @Override - public int getMaxStackAmount(ItemStack stack) { - return isBucket(stack) ? 1 : super.getMaxStackAmount(stack); + public int getMaxItemCount(ItemStack stack) { + return isBucket(stack) ? 1 : super.getMaxItemCount(stack); } public static boolean isBucket(ItemStack stack) { diff --git a/src/main/java/techreborn/items/FrequencyTransmitterItem.java b/src/main/java/techreborn/items/FrequencyTransmitterItem.java index 5d325df44..8d4ee2113 100644 --- a/src/main/java/techreborn/items/FrequencyTransmitterItem.java +++ b/src/main/java/techreborn/items/FrequencyTransmitterItem.java @@ -27,11 +27,11 @@ package techreborn.items; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; -import net.minecraft.datafixer.NbtOps; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; +import net.minecraft.nbt.NbtOps; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText;