diff --git a/build.gradle b/build.gradle index 8057b8cde..06faf918d 100644 --- a/build.gradle +++ b/build.gradle @@ -149,10 +149,10 @@ dependencies { api project(":RebornCore") include project(":RebornCore") - optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:6.0.262-alpha" + optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:6.0.264-alpha" disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.7') disabledOptionalDependency "com.github.dexman545:autoswitch-api:-SNAPSHOT" - optionalDependency 'net.oskarstrom:DashLoader:2.0' + disabledOptionalDependency 'net.oskarstrom:DashLoader:2.0' } diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 9e20a3cca..795dff959 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -91,7 +91,7 @@ public class GuiIronFurnace extends GuiBase { List list = new ArrayList<>(); list.add(new LiteralText(message)); - renderTooltip(matrixStack, list, mouseX, mouseY); + GuiIronFurnace.this.renderTooltip(matrixStack, list, mouseX, mouseY); RenderSystem.setShaderColor(1, 1, 1, 1); } diff --git a/src/main/java/techreborn/client/gui/GuiManual.java b/src/main/java/techreborn/client/gui/GuiManual.java index f38cecf5f..9a4c03125 100644 --- a/src/main/java/techreborn/client/gui/GuiManual.java +++ b/src/main/java/techreborn/client/gui/GuiManual.java @@ -56,24 +56,24 @@ public class GuiManual extends Screen { int y = (height / 2) - guiHeight / 2; if (client == null) { return; } - addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 40, 60, 20, new TranslatableText("techreborn.manual.wikibtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> { + addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 40, 60, 20, new TranslatableText("techreborn.manual.wikibtn"), var1 -> client.setScreen(new ConfirmChatLinkScreen(t -> { if (t) { Util.getOperatingSystem().open("http://wiki.techreborn.ovh"); } - this.client.openScreen(this); + this.client.setScreen(this); }, "http://wiki.techreborn.ovh", false)))); - addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 90, 60, 20, new TranslatableText("techreborn.manual.discordbtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> { + addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 90, 60, 20, new TranslatableText("techreborn.manual.discordbtn"), var1 -> client.setScreen(new ConfirmChatLinkScreen(t -> { if (t) { Util.getOperatingSystem().open("https://discord.gg/teamreborn"); } - this.client.openScreen(this); + this.client.setScreen(this); }, "https://discord.gg/teamreborn", false)))); if (TechRebornConfig.allowManualRefund) { addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 140, 60, 20, new TranslatableText("techreborn.manual.refundbtn"), var1 -> { NetworkManager.sendToServer(ServerboundPackets.createRefundPacket()); - this.client.openScreen(null); + this.client.setScreen(null); })); } } diff --git a/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java b/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java index 0429022a0..40226d917 100644 --- a/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java +++ b/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java @@ -38,7 +38,7 @@ public class DynamicBucketBakedModel extends BaseDynamicFluidBakedModel { private static final ModelIdentifier BUCKET_FLUID = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_fluid"), "inventory"); @Override - public Sprite getSprite() { + public Sprite getParticleSprite() { return MinecraftClient.getInstance() .getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE) .apply(new Identifier("minecraft:item/bucket")); diff --git a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java index f0a052fab..31afca7ef 100644 --- a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java +++ b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java @@ -53,7 +53,7 @@ public class DynamicCellBakedModel extends BaseDynamicFluidBakedModel { } @Override - public Sprite getSprite() { + public Sprite getParticleSprite() { return MinecraftClient.getInstance() .getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE) .apply(new Identifier("techreborn:item/cell_base")); diff --git a/src/main/java/techreborn/items/ManualItem.java b/src/main/java/techreborn/items/ManualItem.java index 7b2a73f81..51bcf7a19 100644 --- a/src/main/java/techreborn/items/ManualItem.java +++ b/src/main/java/techreborn/items/ManualItem.java @@ -51,6 +51,6 @@ public class ManualItem extends Item { @Environment(EnvType.CLIENT) private void openGui() { - MinecraftClient.getInstance().openScreen(new GuiManual()); + MinecraftClient.getInstance().setScreen(new GuiManual()); } } diff --git a/src/main/java/techreborn/world/RubberSaplingGenerator.java b/src/main/java/techreborn/world/RubberSaplingGenerator.java index 865c8f105..102a394a5 100644 --- a/src/main/java/techreborn/world/RubberSaplingGenerator.java +++ b/src/main/java/techreborn/world/RubberSaplingGenerator.java @@ -41,7 +41,7 @@ public class RubberSaplingGenerator extends SaplingGenerator { @Nullable @Override - protected ConfiguredFeature createTreeFeature(Random random, boolean bl) { + protected ConfiguredFeature getTreeFeature(Random random, boolean bl) { MutableRegistry> registry = WorldGenerator.worldGenObseravable.getA(); if (!registry.getIds().contains(IDENTIFIER)) { LOGGER.debug("Rubber tree feature not found. Are you in the rendering thread?");