From 619fd39df3148b14142c854ea26e4e783f5c4043 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 2 Aug 2020 13:44:25 +0100 Subject: [PATCH] Mappings update --- build.gradle | 2 +- .../techreborn/blocks/misc/RubberButtonBlock.java | 4 ++-- src/main/java/techreborn/client/gui/GuiManual.java | 6 +++--- .../java/techreborn/client/gui/GuiStorageUnit.java | 12 ++++++------ src/main/java/techreborn/client/gui/GuiTankUnit.java | 10 +++++----- .../fluidgenerator/FluidGeneratorRecipeCategory.java | 4 ++-- .../FluidReplicatorRecipeCategory.java | 4 ++-- .../compat/rei/machine/GrinderCategory.java | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 7cd9144c0..174b28b39 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ configurations.all { dependencies { minecraft "com.mojang:minecraft:1.16.2-pre1" - mappings "net.fabricmc:yarn:1.16.2-pre1+build.1:v2" + mappings "net.fabricmc:yarn:1.16.2-pre1+build.13:v2" modImplementation "net.fabricmc:fabric-loader:0.9.0+build.204" //Fabric api diff --git a/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java b/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java index a5260f855..f4753b050 100644 --- a/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java +++ b/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java @@ -24,13 +24,13 @@ package techreborn.blocks.misc; -import net.minecraft.block.WoodButtonBlock; +import net.minecraft.block.WoodenButtonBlock; import techreborn.utils.InitUtils; /** * @author drcrazy */ -public class RubberButtonBlock extends WoodButtonBlock { +public class RubberButtonBlock extends WoodenButtonBlock { public RubberButtonBlock() { super(InitUtils.setupRubberBlockSettings(true, 0.5F, 0.5F)); diff --git a/src/main/java/techreborn/client/gui/GuiManual.java b/src/main/java/techreborn/client/gui/GuiManual.java index 50a1e73b1..fee0e5b33 100644 --- a/src/main/java/techreborn/client/gui/GuiManual.java +++ b/src/main/java/techreborn/client/gui/GuiManual.java @@ -87,10 +87,10 @@ public class GuiManual extends Screen { int centerX = (width / 2) - guiWidth / 2; int centerY = (height / 2) - guiHeight / 2; drawTexture(matrixStack, centerX, centerY, 0, 0, guiWidth, guiHeight); - textRenderer.method_30883(matrixStack, text1, ((width / 2) - textRenderer.getWidth(text1) / 2), centerY + 40, 4210752); - textRenderer.method_30883(matrixStack, text2, ((width / 2) - textRenderer.getWidth(text2) / 2), centerY + 90, 4210752); + textRenderer.draw(matrixStack, text1, ((width / 2) - textRenderer.getWidth(text1) / 2), centerY + 40, 4210752); + textRenderer.draw(matrixStack, text2, ((width / 2) - textRenderer.getWidth(text2) / 2), centerY + 90, 4210752); if (TechRebornConfig.allowManualRefund) { - textRenderer.method_30883(matrixStack, text3, ((width / 2) - textRenderer.getWidth(text3) / 2), centerY + 140, 4210752); + textRenderer.draw(matrixStack, text3, ((width / 2) - textRenderer.getWidth(text3) / 2), centerY + 140, 4210752); } super.render(matrixStack, mouseX, mouseY, partialTicks); } diff --git a/src/main/java/techreborn/client/gui/GuiStorageUnit.java b/src/main/java/techreborn/client/gui/GuiStorageUnit.java index 30e6cc58a..b54ac1689 100644 --- a/src/main/java/techreborn/client/gui/GuiStorageUnit.java +++ b/src/main/java/techreborn/client/gui/GuiStorageUnit.java @@ -66,19 +66,19 @@ public class GuiStorageUnit extends GuiBase { int storedAmount = storageEntity.storedAmount; if (storedAmount == 0 && !storageEntity.isLocked()) { - textRenderer.method_30883(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752); } else { - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.storage.store"), 10, 20, 4210752); - textRenderer.method_30883(matrixStack, storageEntity.getDisplayedStack().getName(), 10, 30, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.storage.store"), 10, 20, 4210752); + textRenderer.draw(matrixStack, storageEntity.getDisplayedStack().getName(), 10, 30, 4210752); - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.storage.amount"), 10, 50, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.storage.amount"), 10, 50, 4210752); textRenderer.draw(matrixStack, String.valueOf(storedAmount), 10, 60, 4210752); String percentFilled = String.valueOf((int) ((double) storedAmount / (double) storageEntity.getMaxCapacity() * 100)); - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752); - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680); } } diff --git a/src/main/java/techreborn/client/gui/GuiTankUnit.java b/src/main/java/techreborn/client/gui/GuiTankUnit.java index b5336ff12..ac1119d4d 100644 --- a/src/main/java/techreborn/client/gui/GuiTankUnit.java +++ b/src/main/java/techreborn/client/gui/GuiTankUnit.java @@ -64,20 +64,20 @@ public class GuiTankUnit extends GuiBase { FluidInstance fluid = tankEntity.getTank().getFluidInstance(); if (fluid.isEmpty()) { - textRenderer.method_30883(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752); } else { - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.tank.type"), 10, 20, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.tank.type"), 10, 20, 4210752); textRenderer.draw(matrixStack, FluidUtil.getFluidName(fluid).replace("_", " "), 10, 30, 4210752); - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.tank.amount"), 10, 50, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.tank.amount"), 10, 50, 4210752); textRenderer.draw(matrixStack, fluid.getAmount().toString(), 10, 60, 4210752); String percentFilled = String.valueOf((int) ((double) fluid.getAmount().getRawValue() / (double) tankEntity.getTank().getCapacity().getRawValue() * 100)); - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752); - textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680); } } diff --git a/src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java b/src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java index 425191420..41a2f4415 100644 --- a/src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java +++ b/src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java @@ -75,9 +75,9 @@ public class FluidGeneratorRecipeCategory implements RecipeCategory { List list = Lists.newArrayList(); - list.add(Text.method_30163("Energy")); + list.add(Text.of("Energy")); list.add(new TranslatableText("techreborn.jei.recipe.generator.total", recipeDisplay.getTotalEnergy()).formatted(Formatting.GRAY)); - list.add(Text.method_30163("")); + list.add(Text.of("")); list.add(ClientHelper.getInstance().getFormattedModFromIdentifier(new Identifier("techreborn", ""))); return Tooltip.create(point, list); })); diff --git a/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java b/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java index ca2ac7be3..f5dd7a9c9 100644 --- a/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java +++ b/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java @@ -78,9 +78,9 @@ public class FluidReplicatorRecipeCategory implements RecipeCategory { List list = Lists.newArrayList(); - list.add(Text.method_30163("Energy")); + list.add(Text.of("Energy")); list.add(new TranslatableText("techreborn.jei.recipe.running.cost", "E", recipeDisplay.getEnergy()).formatted(Formatting.GRAY)); - list.add(Text.method_30163("")); + list.add(Text.of("")); list.add(ClientHelper.getInstance().getFormattedModFromIdentifier(new Identifier("techreborn", ""))); return Tooltip.create(point, list); })); diff --git a/src/main/java/techreborn/compat/rei/machine/GrinderCategory.java b/src/main/java/techreborn/compat/rei/machine/GrinderCategory.java index 73d5baced..2207df2bd 100644 --- a/src/main/java/techreborn/compat/rei/machine/GrinderCategory.java +++ b/src/main/java/techreborn/compat/rei/machine/GrinderCategory.java @@ -31,9 +31,9 @@ public class GrinderCategory extends AbstractMachineCate widgets.add(Widgets.createRecipeBase(bounds)); widgets.add(ReiPlugin.createEnergyDisplay(new Rectangle(bounds.x + 8, bounds.y + 18, 14, 50), recipeDisplay.getEnergy(), ReiPlugin.EntryAnimation.downwards(5000), point -> { List list = Lists.newArrayList(); - list.add(Text.method_30163("Energy")); + list.add(Text.of("Energy")); list.add(new TranslatableText("techreborn.jei.recipe.running.cost", "E", recipeDisplay.getEnergy()).formatted(Formatting.GRAY)); - list.add(Text.method_30163("")); + list.add(Text.of("")); list.add(ClientHelper.getInstance().getFormattedModFromIdentifier(new Identifier("techreborn", ""))); return Tooltip.create(point, list); }));