From 12df6e0084dba44d03d2e04b54444113271f0032 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sun, 26 Jan 2025 13:52:29 -0500 Subject: [PATCH] Componentsn't - Adjust to the removal of the Components class --- gradle.properties | 2 +- .../com/simibubi/create/AllBogeyStyles.java | 15 +++--- .../simibubi/create/AllCreativeModeTabs.java | 7 +-- .../com/simibubi/create/CreateClient.java | 17 ++++--- .../peripherals/StationPeripheral.java | 5 +- .../jei/category/CreateRecipeCategory.java | 6 +-- .../category/MechanicalCraftingCategory.java | 3 +- .../category/SequencedAssemblyCategory.java | 7 ++- .../compat/trainmap/TrainMapManager.java | 7 +-- .../IDisplayAssemblyExceptions.java | 4 +- .../elevator/ElevatorContactScreen.java | 5 +- .../glue/SuperGlueSelectionHandler.java | 4 +- .../decoration/slidingDoor/DoorControl.java | 4 +- .../content/equipment/armor/BacktankUtil.java | 7 +-- .../equipment/armor/RemainingAirOverlay.java | 3 +- .../blueprint/BlueprintOverlayRenderer.java | 4 +- .../equipment/clipboard/ClipboardScreen.java | 23 ++++----- .../ClipboardValueSettingsHandler.java | 8 +-- .../equipment/goggles/GoggleConfigScreen.java | 10 ++-- .../goggles/GoggleOverlayRenderer.java | 6 +-- .../potatoCannon/PotatoCannonItem.java | 18 +++---- .../symmetryWand/SymmetryWandScreen.java | 7 +-- .../equipment/zapper/ZapperScreen.java | 4 +- .../terrainzapper/WorldshaperScreen.java | 10 ++-- .../fluids/potion/PotionFluidHandler.java | 30 +++++------ .../content/fluids/tank/BoilerData.java | 12 ++--- .../fluids/transfer/FillingRecipe.java | 6 +-- .../content/kinetics/belt/BeltSlicer.java | 4 +- .../ChainConveyorBlockEntity.java | 4 +- .../ChainConveyorRoutingTable.java | 6 +-- .../crank/ValveHandleBlockEntity.java | 5 +- .../deployer/DeployerApplicationRecipe.java | 8 +-- .../deployer/DeployerBlockEntity.java | 12 ++--- .../motor/KineticScrollValueBehaviour.java | 5 +- .../sequencer/InstructionSpeedModifiers.java | 3 +- .../sequencer/SequencedGearshiftScreen.java | 4 +- .../content/logistics/AddressEditBox.java | 7 ++- .../content/logistics/box/PackageItem.java | 14 +++--- .../logistics/chute/ChuteBlockEntity.java | 9 ++-- .../factoryBoard/FactoryPanelBehaviour.java | 46 +++++++++-------- .../logistics/filter/AttributeFilterMenu.java | 4 +- .../filter/AttributeFilterScreen.java | 24 +++++---- .../content/logistics/filter/FilterItem.java | 12 ++--- .../logistics/filter/FilterScreen.java | 10 ++-- .../attributes/EnchantAttribute.java | 5 +- .../AstralSorceryAmuletAttribute.java | 4 +- .../AstralSorceryAttunementAttribute.java | 4 +- .../AstralSorceryCrystalAttribute.java | 4 +- .../AstralSorceryPerkGemAttribute.java | 4 +- .../packagePort/PackagePortBlockEntity.java | 9 ++-- .../packagePort/PackagePortScreen.java | 5 +- .../frogport/FrogportRenderer.java | 7 +-- .../packagePort/postbox/PostboxRenderer.java | 7 +-- .../RedstoneRequesterBlockEntity.java | 5 +- .../StockKeeperCategoryScreen.java | 10 ++-- .../stockTicker/StockKeeperRequestScreen.java | 6 +-- .../stockTicker/StockTickerBlockEntity.java | 13 +++-- .../tableCloth/ShoppingListItem.java | 3 +- .../TableClothFilteringBehaviour.java | 6 +-- .../tunnel/BrassTunnelBlockEntity.java | 5 +- .../processing/basin/BasinBlockEntity.java | 5 +- .../sequenced/SequencedAssemblyRecipe.java | 12 +++-- .../BrassDiodeScrollValueBehaviour.java | 3 +- .../displayLink/DisplayLinkScreen.java | 6 +-- .../AccumulatedItemCountDisplaySource.java | 4 +- .../source/BoilerDisplaySource.java | 16 +++--- .../source/ComputerDisplaySource.java | 4 +- .../source/CurrentFloorDisplaySource.java | 4 +- .../displayLink/source/DisplaySource.java | 13 +++-- .../source/EnchantPowerDisplaySource.java | 4 +- .../source/FactoryGaugeDisplaySource.java | 4 +- .../source/FluidAmountDisplaySource.java | 4 +- .../source/FluidListDisplaySource.java | 4 +- .../source/ItemCountDisplaySource.java | 4 +- .../NumericSingleLineDisplaySource.java | 9 ++-- .../PercentOrProgressBarDisplaySource.java | 6 +-- .../source/RedstonePowerDisplaySource.java | 4 +- .../source/ScoreboardDisplaySource.java | 8 +-- .../source/SingleLineDisplaySource.java | 12 +++-- .../source/StationSummaryDisplaySource.java | 29 +++++++---- .../source/StopWatchDisplaySource.java | 4 +- .../source/TimeOfDayDisplaySource.java | 12 +++-- .../source/ValueListDisplaySource.java | 26 +++++----- .../LinkedControllerClientHandler.java | 5 +- .../nixieTube/NixieTubeBlockEntity.java | 4 +- .../ThresholdSwitchScreen.java | 22 ++++---- .../content/schematics/SchematicItem.java | 8 +-- .../schematics/ServerSchematicLoader.java | 11 ++-- .../schematics/cannon/MaterialChecklist.java | 25 +++++----- .../cannon/SchematicannonScreen.java | 32 ++++++------ .../client/ClientSchematicLoader.java | 4 +- .../client/SchematicEditScreen.java | 12 ++--- .../client/SchematicPromptScreen.java | 5 +- .../client/ToolSelectionScreen.java | 3 +- .../table/SchematicTableScreen.java | 17 ++++--- .../trains/display/FlapDisplayBlock.java | 7 +-- .../display/FlapDisplayBlockEntity.java | 4 +- .../entity/CarriageContraptionEntity.java | 18 +++---- .../content/trains/entity/TrainStatus.java | 23 +++++---- .../trains/schedule/IScheduleInput.java | 5 +- .../content/trains/schedule/Schedule.java | 3 +- .../content/trains/schedule/ScheduleItem.java | 9 ++-- .../trains/schedule/ScheduleRuntime.java | 13 ++--- .../trains/schedule/ScheduleScreen.java | 12 ++--- .../condition/CargoThresholdCondition.java | 7 +-- .../condition/FluidThresholdCondition.java | 5 +- .../condition/ItemThresholdCondition.java | 5 +- .../condition/PlayerPassengerCondition.java | 3 +- .../condition/RedstoneLinkCondition.java | 5 +- .../condition/TimeOfDayCondition.java | 3 +- .../condition/TimedWaitCondition.java | 14 +++--- .../ChangeThrottleInstruction.java | 3 +- .../destination/ChangeTitleInstruction.java | 3 +- .../destination/DestinationInstruction.java | 3 +- .../destination/FetchPackagesInstruction.java | 3 +- .../destination/TextScheduleInstruction.java | 3 +- .../trains/station/AbstractStationScreen.java | 12 +++-- .../content/trains/station/StationMarker.java | 7 +-- .../content/trains/station/StationScreen.java | 6 +-- .../trains/station/TrainEditPacket.java | 7 +-- .../content/trains/track/TrackBlock.java | 6 +-- .../trains/track/TrackPlacementOverlay.java | 4 +- .../advancement/CreateAdvancement.java | 6 +-- .../blockEntity/behaviour/ValueBox.java | 6 +-- .../behaviour/ValueSettingsScreen.java | 5 +- .../EdgeInteractionRenderer.java | 4 +- .../filtering/FilteringBehaviour.java | 12 ++--- .../scrollValue/ScrollOptionBehaviour.java | 3 +- .../scrollValue/ScrollValueBehaviour.java | 4 +- .../scrollValue/ScrollValueRenderer.java | 3 +- .../foundation/events/CommonEvents.java | 5 +- .../foundation/gui/ModularGuiLineBuilder.java | 6 +-- .../create/foundation/gui/widget/Label.java | 7 ++- .../foundation/gui/widget/ScrollInput.java | 5 +- .../gui/widget/SelectionScrollInput.java | 15 +++--- .../foundation/item/ItemDescription.java | 25 +++++----- .../create/foundation/item/KineticStats.java | 3 +- .../create/foundation/item/TooltipHelper.java | 11 ++-- .../create/foundation/mixin/MainMixin.java | 50 ------------------- .../FluidInteractionRegistryAccessor.java | 6 +-- .../compat/JourneyFullscreenMapMixin.java | 13 ++--- .../create/foundation/utility/CreateLang.java | 6 +-- .../create/foundation/utility/Debug.java | 26 +++++----- .../foundation/utility/DynamicComponent.java | 5 +- .../foundation/utility/FluidFormatter.java | 6 +-- .../command/ClearBufferCacheCommand.java | 5 +- .../infrastructure/command/CloneCommand.java | 18 ++++--- .../command/CouplingCommand.java | 50 +++++++++++++------ .../command/CreateTestCommand.java | 13 +++-- .../command/DebugValueCommand.java | 6 ++- .../command/DumpRailwaysCommand.java | 34 +++++++------ .../command/FixLightingCommand.java | 6 ++- .../command/HighlightCommand.java | 10 ++-- .../command/OverlayConfigCommand.java | 6 ++- .../ReplaceInCommandBlocksCommand.java | 11 ++-- .../command/SimpleCreateActions.java | 14 +++--- .../infrastructure/command/TrainCommand.java | 24 +++++---- .../gametest/tests/TestItems.java | 4 +- .../gui/CreateMainMenuScreen.java | 24 ++++++--- .../gui/OpenCreateMenuButton.java | 5 +- .../ponder/scenes/DisplayScenes.java | 28 ++++++----- .../ponder/scenes/ElevatorScenes.java | 8 +-- .../ponder/scenes/RedstoneScenes.java | 4 +- src/main/resources/create.mixins.json | 1 - 164 files changed, 801 insertions(+), 748 deletions(-) delete mode 100644 src/main/java/com/simibubi/create/foundation/mixin/MainMixin.java diff --git a/gradle.properties b/gradle.properties index 55e4cdfd9d..53b23d2536 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ jei_minecraft_version = 1.20.1 jei_version = 15.10.0.39 curios_minecraft_version = 1.20.1 curios_version = 5.3.1 -ponder_version = 0.9.20 +ponder_version = 0.9.22 mixin_extras_version = 0.4.1 cc_tweaked_enable = true diff --git a/src/main/java/com/simibubi/create/AllBogeyStyles.java b/src/main/java/com/simibubi/create/AllBogeyStyles.java index 0a927761f7..4d536cd5e9 100644 --- a/src/main/java/com/simibubi/create/AllBogeyStyles.java +++ b/src/main/java/com/simibubi/create/AllBogeyStyles.java @@ -4,6 +4,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import net.minecraft.network.chat.Component; + import org.jetbrains.annotations.ApiStatus; import com.simibubi.create.content.trains.bogey.BogeySizes; @@ -12,7 +14,6 @@ import com.simibubi.create.content.trains.bogey.BogeyStyle.SizeRenderer; import com.simibubi.create.content.trains.bogey.StandardBogeyRenderer; import com.simibubi.create.content.trains.bogey.StandardBogeyVisual; -import net.createmod.catnip.lang.Components; import net.minecraft.resources.ResourceLocation; public class AllBogeyStyles { @@ -22,13 +23,13 @@ public class AllBogeyStyles { public static final ResourceLocation STANDARD_CYCLE_GROUP = Create.asResource("standard"); - public static final BogeyStyle STANDARD = - builder("standard", STANDARD_CYCLE_GROUP).displayName(Components.translatable("create.bogey.style.standard")) - .size(BogeySizes.SMALL, AllBlocks.SMALL_BOGEY, () -> () -> new SizeRenderer(new StandardBogeyRenderer.Small(), StandardBogeyVisual.Small::new)) - .size(BogeySizes.LARGE, AllBlocks.LARGE_BOGEY, () -> () -> new SizeRenderer(new StandardBogeyRenderer.Large(), StandardBogeyVisual.Large::new)) - .build(); + public static final BogeyStyle STANDARD + = builder("standard", STANDARD_CYCLE_GROUP).displayName(Component.translatable("create.bogey.style.standard")) + .size(BogeySizes.SMALL, AllBlocks.SMALL_BOGEY, () -> () -> new SizeRenderer(new StandardBogeyRenderer.Small(), StandardBogeyVisual.Small::new)) + .size(BogeySizes.LARGE, AllBlocks.LARGE_BOGEY, () -> () -> new SizeRenderer(new StandardBogeyRenderer.Large(), StandardBogeyVisual.Large::new)) + .build(); - public static Map getCycleGroup(ResourceLocation cycleGroup) { + public static Map getCycleGroup(ResourceLocation cycleGroup) { return CYCLE_GROUPS.getOrDefault(cycleGroup, EMPTY_GROUP); } diff --git a/src/main/java/com/simibubi/create/AllCreativeModeTabs.java b/src/main/java/com/simibubi/create/AllCreativeModeTabs.java index b0502b6ba4..c63a763e99 100644 --- a/src/main/java/com/simibubi/create/AllCreativeModeTabs.java +++ b/src/main/java/com/simibubi/create/AllCreativeModeTabs.java @@ -7,6 +7,8 @@ import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; +import net.minecraft.network.chat.Component; + import org.apache.commons.lang3.mutable.MutableObject; import com.simibubi.create.content.contraptions.actors.seat.SeatBlock; @@ -29,7 +31,6 @@ import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap; import it.unimi.dsi.fastutil.objects.ReferenceArrayList; import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; -import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.resources.model.BakedModel; @@ -62,7 +63,7 @@ public class AllCreativeModeTabs { public static final RegistryObject BASE_CREATIVE_TAB = REGISTER.register("base", () -> CreativeModeTab.builder() - .title(Components.translatable("itemGroup.create.base")) + .title(Component.translatable("itemGroup.create.base")) .withTabsBefore(CreativeModeTabs.SPAWN_EGGS) .icon(() -> AllBlocks.COGWHEEL.asStack()) .displayItems(new RegistrateDisplayItemsGenerator(true, AllCreativeModeTabs.BASE_CREATIVE_TAB)) @@ -70,7 +71,7 @@ public class AllCreativeModeTabs { public static final RegistryObject PALETTES_CREATIVE_TAB = REGISTER.register("palettes", () -> CreativeModeTab.builder() - .title(Components.translatable("itemGroup.create.palettes")) + .title(Component.translatable("itemGroup.create.palettes")) .withTabsBefore(BASE_CREATIVE_TAB.getKey()) .icon(() -> AllPaletteBlocks.ORNATE_IRON_WINDOW.asStack()) .displayItems(new RegistrateDisplayItemsGenerator(false, AllCreativeModeTabs.PALETTES_CREATIVE_TAB)) diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index ccde97761e..57f21ae969 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -30,13 +30,13 @@ import net.createmod.catnip.config.ui.BaseConfigScreen; import net.createmod.catnip.config.ui.ConfigScreen; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBufferCache; -import net.createmod.catnip.lang.Components; import net.createmod.ponder.foundation.PonderIndex; import net.minecraft.ChatFormatting; import net.minecraft.client.GraphicsStatus; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; import net.minecraft.network.chat.ClickEvent; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentUtils; import net.minecraft.network.chat.HoverEvent; import net.minecraft.network.chat.MutableComponent; @@ -136,14 +136,15 @@ public class CreateClient { if (AllConfigs.client().ignoreFabulousWarning.get()) return; - MutableComponent text = ComponentUtils.wrapInSquareBrackets(Components.literal("WARN")) + MutableComponent text = ComponentUtils.wrapInSquareBrackets(Component.literal("WARN")) .withStyle(ChatFormatting.GOLD) - .append(Components.literal( - " Some of Create's visual features will not be available while Fabulous graphics are enabled!")) - .withStyle(style -> style - .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/create dismissFabulousWarning")) - .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, - Components.literal("Click here to disable this warning")))); + .append(Component.literal(" Some of Create's visual features will not be available while Fabulous graphics are enabled!")) + .withStyle(style -> { + return style + .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/create dismissFabulousWarning")) + .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, + Component.literal("Click here to disable this warning"))); + }); mc.player.displayClientMessage(text, false); } diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java index 5c3ee36278..aa1cd09d54 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java @@ -4,6 +4,8 @@ import java.util.Map; import javax.annotation.Nullable; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import org.jetbrains.annotations.NotNull; import com.simibubi.create.AllPackets; @@ -18,7 +20,6 @@ import com.simibubi.create.foundation.utility.StringHelper; import dan200.computercraft.api.lua.IArguments; import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.lua.LuaFunction; -import net.createmod.catnip.lang.Components; import net.minecraft.nbt.ByteTag; import net.minecraft.nbt.CollectionTag; import net.minecraft.nbt.CompoundTag; @@ -129,7 +130,7 @@ public class StationPeripheral extends SyncedPeripheral { @LuaFunction(mainThread = true) public final void setTrainName(String name) throws LuaException { Train train = getTrainOrThrow(); - train.name = Components.literal(name); + train.name = Component.literal(name); AllPackets.getChannel().send(PacketDistributor.ALL.noArg(), new TrainEditPacket.TrainEditReturnPacket(train.id, name, train.icon.getId(), train.mapColorIndex)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java index 6f91e6f543..64f7a88fd6 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import javax.annotation.ParametersAreNonnullByDefault; +import net.minecraft.network.chat.MutableComponent; import org.jetbrains.annotations.NotNull; import com.simibubi.create.AllFluids; @@ -23,7 +24,6 @@ import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.category.IRecipeCategory; import mezz.jei.api.registration.IRecipeCatalystRegistration; import mezz.jei.api.registration.IRecipeRegistration; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; @@ -156,12 +156,12 @@ public abstract class CreateRecipeCategory> implements IReci } int amount = mbAmount == -1 ? fluidStack.getAmount() : mbAmount; - Component text = Components.literal(String.valueOf(amount)).append(CreateLang.translateDirect("generic.unit.millibuckets")).withStyle(ChatFormatting.GOLD); + Component text = Component.literal(String.valueOf(amount)).append(CreateLang.translateDirect("generic.unit.millibuckets")).withStyle(ChatFormatting.GOLD); if (tooltip.isEmpty()) tooltip.add(0, text); else { List siblings = tooltip.get(0).getSiblings(); - siblings.add(Components.literal(" ")); + siblings.add(Component.literal(" ")); siblings.add(text); } }; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java index 9e66cf2c66..f313f8cf74 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java @@ -18,7 +18,6 @@ import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.ingredients.IIngredientRenderer; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -189,7 +188,7 @@ public class MechanicalCraftingCategory extends CreateRecipeCategory list = new ArrayList<>(); - MutableComponent crash = Components.translatable("jei.tooltip.error.crash"); + MutableComponent crash = Component.translatable("jei.tooltip.error.crash"); list.add(crash.withStyle(ChatFormatting.RED)); return list; } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java index 4c3810e868..0055946559 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java @@ -21,7 +21,6 @@ import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -101,7 +100,7 @@ public class SequencedAssemblyCategory extends CreateRecipeCategory sequencedRecipe = sequence.get(i); SequencedAssemblySubCategory subCategory = getSubCategory(sequencedRecipe); int subWidth = subCategory.getWidth(); - MutableComponent component = Components.literal("" + romans[Math.min(i, 6)]); + MutableComponent component = Component.literal("" + romans[Math.min(i, 6)]); graphics.drawString(font, component, font.width(component) / -2 + subWidth / 2, 2, 0x888888, false); subCategory.draw(sequencedRecipe, graphics, mouseX, mouseY, i); matrixStack.translate(subWidth + margin, 0, 0); diff --git a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java index f4882794b7..66c6b28a47 100644 --- a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java +++ b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java @@ -33,11 +33,11 @@ import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.Rect2i; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; import net.minecraft.resources.ResourceKey; import net.minecraft.util.FastColor; @@ -76,8 +76,9 @@ public class TrainMapManager { graphics.bufferSource() .endBatch(); - if (hoveredElement instanceof GlobalStation station) - return List.of(Components.literal(station.name)); + if (hoveredElement instanceof GlobalStation station) { + return List.of(Component.literal(station.name)); + } if (hoveredElement instanceof Train train) return listTrainDetails(train); diff --git a/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java index ab3983abb1..c727c60cb0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java +++ b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java @@ -6,8 +6,8 @@ import java.util.List; import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.FontHelper.Palette; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; @@ -19,7 +19,7 @@ public interface IDisplayAssemblyExceptions { return false; if (!tooltip.isEmpty()) - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); CreateLang.translate("gui.assembly.exception").style(ChatFormatting.GOLD) .forGoggles(tooltip); diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java index 7c2f76b2f6..18e4aca87d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.elevator; +import net.createmod.catnip.lang.Lang; + import org.lwjgl.glfw.GLFW; import com.google.common.collect.ImmutableList; @@ -17,7 +19,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; @@ -107,7 +108,7 @@ public class ElevatorContactScreen extends AbstractSimiScreen { } private EditBox editBox(int x, int width, int chars) { - EditBox editBox = new EditBox(font, guiLeft + x, guiTop + 30, width, 10, Components.immutableEmpty()); + EditBox editBox = new EditBox(font, guiLeft + x, guiTop + 30, width, 10, Lang.IMMUTABLE_EMPTY); editBox.setTextColor(-1); editBox.setTextColorUneditable(-1); editBox.setBordered(false); diff --git a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java index c0e59533c1..b40fbc88c3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java @@ -12,7 +12,7 @@ import com.simibubi.create.content.contraptions.chassis.AbstractChassisBlock; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.RaycastHelper; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -63,7 +63,7 @@ public class SuperGlueSelectionHandler { if (clusterCooldown > 0) { if (clusterCooldown == 25) - player.displayClientMessage(Components.immutableEmpty(), true); + player.displayClientMessage(Lang.IMMUTABLE_EMPTY, true); Outliner.getInstance().keep(clusterOutlineSlot); clusterCooldown--; } diff --git a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java index d68fc93b49..cdf98026b9 100644 --- a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java +++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java @@ -9,10 +9,10 @@ import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.Lang; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.Entity; import net.minecraftforge.api.distmarker.Dist; @@ -59,7 +59,7 @@ public enum DoorControl { playerFacing = SOUTH; } - Label label = new Label(x + 4, y + 6, Components.empty()).withShadow(); + Label label = new Label(x + 4, y + 6, Component.empty()).withShadow(); ScrollInput input = new SelectionScrollInput(x, y, 53, 16) .forOptions(CreateLang.translatedOptions("contraption.door_control", valuesAsString())) .titled(CreateLang.translateDirect("contraption.door_control")) diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java index d0eaa29e4d..4d17a38e5b 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java @@ -10,10 +10,11 @@ import com.simibubi.create.AllTags; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket; import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket; @@ -97,9 +98,9 @@ public class BacktankUtil { player.connection.send(new ClientboundSetTitlesAnimationPacket(10, 40, 10)); player.connection.send(new ClientboundSetSubtitleTextPacket( - Components.literal("\u26A0 ").withStyle(depleted ? ChatFormatting.RED : ChatFormatting.GOLD) + Component.literal("\u26A0 ").withStyle(depleted ? ChatFormatting.RED : ChatFormatting.GOLD) .append(component.withStyle(ChatFormatting.GRAY)))); - player.connection.send(new ClientboundSetTitleTextPacket(Components.immutableEmpty())); + player.connection.send(new ClientboundSetTitleTextPacket(Lang.IMMUTABLE_EMPTY)); } public static int maxAir(ItemStack backtank) { diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java b/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java index 5c063676b6..1bd89461e9 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java @@ -6,7 +6,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllItems; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; @@ -50,7 +49,7 @@ public class RemainingAirOverlay implements IGuiOverlay { poseStack.translate(width / 2 + 90, height - 53 + (backtank.getItem() .isFireResistant() ? 9 : 0), 0); - Component text = Components.literal(StringUtil.formatTickDuration(Math.max(0, timeLeft - 1) * 20)); + Component text = Component.literal(StringUtil.formatTickDuration(Math.max(0, timeLeft - 1) * 20)); GuiGameElement.of(backtank) .at(0, 0) .render(graphics); diff --git a/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java index dd37588ac1..02a0a9c813 100644 --- a/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java @@ -29,7 +29,6 @@ import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; @@ -37,6 +36,7 @@ import net.minecraft.client.gui.screens.inventory.tooltip.TooltipRenderUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.Item; @@ -351,7 +351,7 @@ public class BlueprintOverlayRenderer { AllGuiTextures.TRADE_OVERLAY.render(graphics, width / 2 - 48, y - 19); if (shopContext.purchases() > 0) { graphics.renderItem(AllItems.SHOPPING_LIST.asStack(), width / 2 + 20, y - 20); - graphics.drawString(mc.font, Components.literal("x" + shopContext.purchases()), width / 2 + 20 + 16, + graphics.drawString(mc.font, Component.literal("x" + shopContext.purchases()), width / 2 + 20 + 16, y - 20 + 4, 0xff_eeeeee, true); } } diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java index 655b70d4e0..ef375a5833 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java @@ -29,7 +29,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import net.createmod.catnip.gui.AbstractSimiScreen; -import net.createmod.catnip.lang.Components; import net.minecraft.SharedConstants; import net.minecraft.Util; import net.minecraft.client.Minecraft; @@ -101,7 +100,7 @@ public class ClipboardScreen extends AbstractSimiScreen { currentEntries = pages.get(currentPage); boolean startEmpty = currentEntries.isEmpty(); if (startEmpty) - currentEntries.add(new ClipboardEntry(false, Components.empty())); + currentEntries.add(new ClipboardEntry(false, Component.empty())); editingIndex = 0; editContext = new TextFieldHelper(this::getCurrentEntryText, this::setCurrentEntryText, this::getClipboard, this::setClipboard, this::validateTextForEntry); @@ -128,7 +127,7 @@ public class ClipboardScreen extends AbstractSimiScreen { editingIndex = -1; currentEntries.removeIf(ce -> ce.checked); if (currentEntries.isEmpty()) - currentEntries.add(new ClipboardEntry(false, Components.empty())); + currentEntries.add(new ClipboardEntry(false, Component.empty())); sendIfEditingBlock(); }); clearBtn.setToolTip(CreateLang.translateDirect("gui.clipboard.erase_checked")); @@ -187,7 +186,7 @@ public class ClipboardScreen extends AbstractSimiScreen { ClipboardEntry clipboardEntry = currentEntries.get(i); String text = clipboardEntry.text.getString(); totalHeight += - Math.max(12, font.split(Components.literal(text), clipboardEntry.icon.isEmpty() ? 150 : 130) + Math.max(12, font.split(Component.literal(text), clipboardEntry.icon.isEmpty() ? 150 : 130) .size() * 9 + 3); if (totalHeight > my) { @@ -204,7 +203,7 @@ public class ClipboardScreen extends AbstractSimiScreen { } private void setCurrentEntryText(String text) { - currentEntries.get(editingIndex).text = Components.literal(text); + currentEntries.get(editingIndex).text = Component.literal(text); sendIfEditingBlock(); } @@ -222,7 +221,7 @@ public class ClipboardScreen extends AbstractSimiScreen { for (int i = 0; i < currentEntries.size(); i++) { ClipboardEntry clipboardEntry = currentEntries.get(i); String text = i == editingIndex ? newText : clipboardEntry.text.getString(); - totalHeight += Math.max(12, font.split(Components.literal(text), 150) + totalHeight += Math.max(12, font.split(Component.literal(text), 150) .size() * 9 + 3); } return totalHeight < 185; @@ -255,7 +254,7 @@ public class ClipboardScreen extends AbstractSimiScreen { } currentEntries = pages.get(currentPage); if (currentEntries.isEmpty()) { - currentEntries.add(new ClipboardEntry(false, Components.empty())); + currentEntries.add(new ClipboardEntry(false, Component.empty())); if (!readonly) { editingIndex = 0; editContext.setCursorToEnd(); @@ -281,7 +280,7 @@ public class ClipboardScreen extends AbstractSimiScreen { int y = guiTop - 8; AllGuiTextures.CLIPBOARD.render(graphics, x, y); - graphics.drawString(font, Components.translatable("book.pageIndicator", currentPage + 1, getNumPages()), + graphics.drawString(font, Component.translatable("book.pageIndicator", currentPage + 1, getNumPages()), x + 150, y + 9, 0x43ffffff, false); for (int i = 0; i < currentEntries.size(); i++) { @@ -298,7 +297,7 @@ public class ClipboardScreen extends AbstractSimiScreen { RenderSystem.enableBlend(); (checked ? AllGuiTextures.CLIPBOARD_ADDRESS_INACTIVE : AllGuiTextures.CLIPBOARD_ADDRESS) .render(graphics, x + 44, y + 50); - text = Components.literal(string.substring(1) + text = Component.literal(string.substring(1) .stripLeading()); } else { graphics.drawString(font, "\u25A1", x + 45, y + 51, checked ? 0x668D7F6B : 0xff8D7F6B, false); @@ -437,7 +436,7 @@ public class ClipboardScreen extends AbstractSimiScreen { if (currentEntries.size() <= editingIndex + 1 || !currentEntries.get(editingIndex + 1).text.getString() .isEmpty()) - currentEntries.add(editingIndex + 1, new ClipboardEntry(false, Components.empty())); + currentEntries.add(editingIndex + 1, new ClipboardEntry(false, Component.empty())); editingIndex += 1; editContext.setCursorToEnd(); if (validateTextForEntry(" ")) @@ -614,7 +613,7 @@ public class ClipboardScreen extends AbstractSimiScreen { if (hoveredEntry != editingIndex && !readonly) { editingIndex = hoveredEntry; if (hoveredEntry >= currentEntries.size()) { - currentEntries.add(new ClipboardEntry(false, Components.empty())); + currentEntries.add(new ClipboardEntry(false, Component.empty())); if (!validateTextForEntry(" ")) { currentEntries.remove(hoveredEntry); editingIndex = -1; @@ -865,7 +864,7 @@ public class ClipboardScreen extends AbstractSimiScreen { contents = pContents; x = pX; y = pY; - asComponent = Components.literal(pContents) + asComponent = Component.literal(pContents) .setStyle(pStyle); } } diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java index c300796a9a..dce68f045b 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java @@ -13,12 +13,12 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; @@ -95,7 +95,7 @@ public class ClipboardValueSettingsHandler { if (smartBE instanceof ClipboardBlockEntity) { List tip = new ArrayList<>(); tip.add(CreateLang.translateDirect("clipboard.actions")); - tip.add(CreateLang.translateDirect("clipboard.copy_other_clipboard", Components.keybind("key.use"))); + tip.add(CreateLang.translateDirect("clipboard.copy_other_clipboard", Component.keybind("key.use"))); CreateClient.VALUE_SETTINGS_HANDLER.showHoverTip(tip); return; } @@ -123,9 +123,9 @@ public class ClipboardValueSettingsHandler { List tip = new ArrayList<>(); tip.add(CreateLang.translateDirect("clipboard.actions")); if (canCopy) - tip.add(CreateLang.translateDirect("clipboard.to_copy", Components.keybind("key.use"))); + tip.add(CreateLang.translateDirect("clipboard.to_copy", Component.keybind("key.use"))); if (canPaste) - tip.add(CreateLang.translateDirect("clipboard.to_paste", Components.keybind("key.attack"))); + tip.add(CreateLang.translateDirect("clipboard.to_paste", Component.keybind("key.attack"))); CreateClient.VALUE_SETTINGS_HANDLER.showHoverTip(tip); } diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java index 578f8d3811..3227a5fdba 100644 --- a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java @@ -5,7 +5,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; @@ -23,26 +23,26 @@ public class GoggleConfigScreen extends AbstractSimiScreen { private final List tooltip; public GoggleConfigScreen() { - Component componentSpacing = Components.literal(" "); + Component componentSpacing = Component.literal(" "); tooltip = new ArrayList<>(); tooltip.add(componentSpacing.plainCopy() .append(CreateLang.translateDirect("gui.config.overlay1"))); tooltip.add(componentSpacing.plainCopy() .append(CreateLang.translateDirect("gui.config.overlay2") .withStyle(ChatFormatting.GRAY))); - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); tooltip.add(componentSpacing.plainCopy() .append(CreateLang.translateDirect("gui.config.overlay3"))); tooltip.add(componentSpacing.plainCopy() .append(CreateLang.translateDirect("gui.config.overlay4"))); - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); tooltip.add(componentSpacing.plainCopy() .append(CreateLang.translateDirect("gui.config.overlay5") .withStyle(ChatFormatting.GRAY))); tooltip.add(componentSpacing.plainCopy() .append(CreateLang.translateDirect("gui.config.overlay6") .withStyle(ChatFormatting.GRAY))); - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); tooltip.add(componentSpacing.plainCopy() .append(CreateLang.translateDirect("gui.config.overlay7"))); tooltip.add(componentSpacing.plainCopy() diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java index 5b75419936..e95f8f2d3c 100644 --- a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java @@ -23,7 +23,7 @@ import com.simibubi.create.infrastructure.config.CClient; import net.createmod.catnip.gui.element.BoxElement; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.data.Iterate; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.outliner.Outline; import net.createmod.catnip.outliner.Outliner; import net.createmod.catnip.outliner.Outliner.OutlineEntry; @@ -113,7 +113,7 @@ public class GoggleOverlayRenderer { if (hasHoveringInformation) { if (!tooltip.isEmpty()) - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); IHaveHoveringInformation hte = (IHaveHoveringInformation) be; hoverAddedInformation = hte.addToTooltip(tooltip, isShifting); @@ -160,7 +160,7 @@ public class GoggleOverlayRenderer { return; } if (!tooltip.isEmpty()) - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); CreateLang.translate("gui.goggles.pole_length") .text(" " + poles) diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java index 28f1c2337e..7a3252c609 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java @@ -5,6 +5,8 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Predicate; +import net.createmod.catnip.lang.Lang; + import org.jetbrains.annotations.Nullable; import com.simibubi.create.AllEnchantments; @@ -20,7 +22,6 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.math.VecHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel.ArmPose; @@ -225,21 +226,20 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP String _reload = "potato_cannon.ammo.reload_ticks"; String _knockback = "potato_cannon.ammo.knockback"; - tooltip.add(Components.immutableEmpty()); - tooltip.add(Components.translatable(ammo.getDescriptionId()).append(Components.literal(":")) + tooltip.add(Lang.IMMUTABLE_EMPTY); + tooltip.add(Component.translatable(ammo.getDescriptionId()).append(Component.literal(":")) .withStyle(ChatFormatting.GRAY)); PotatoCannonProjectileType type = PotatoProjectileTypeManager.getTypeForStack(ammo) .get(); - MutableComponent spacing = Components.literal(" "); + MutableComponent spacing = Component.literal(" "); ChatFormatting green = ChatFormatting.GREEN; ChatFormatting darkGreen = ChatFormatting.DARK_GREEN; float damageF = type.getDamage() * additionalDamageMult; - MutableComponent damage = Components.literal( - damageF == Mth.floor(damageF) ? "" + Mth.floor(damageF) : "" + damageF); - MutableComponent reloadTicks = Components.literal("" + type.getReloadTicks()); - MutableComponent knockback = - Components.literal("" + (type.getKnockback() + additionalKnockback)); + MutableComponent damage = Component.literal(damageF == Mth.floor(damageF) ? "" + Mth.floor(damageF) : "" + damageF); + MutableComponent reloadTicks = Component.literal("" + type.getReloadTicks()); + MutableComponent knockback = + Component.literal("" + (type.getKnockback() + additionalKnockback)); damage = damage.withStyle(additionalDamageMult > 1 ? green : darkGreen); knockback = knockback.withStyle(additionalKnockback > 0 ? green : darkGreen); diff --git a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java index 3963b7fb06..ba1cf60af4 100644 --- a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.equipment.symmetryWand; +import net.createmod.catnip.lang.Lang; + import org.joml.Vector3f; import com.mojang.blaze3d.vertex.PoseStack; @@ -20,7 +22,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; @@ -64,9 +65,9 @@ public class SymmetryWandScreen extends AbstractSimiScreen { int x = guiLeft; int y = guiTop; - labelType = new Label(x + 51, y + 28, Components.immutableEmpty()).colored(0xFFFFFFFF) + labelType = new Label(x + 51, y + 28, Lang.IMMUTABLE_EMPTY).colored(0xFFFFFFFF) .withShadow(); - labelAlign = new Label(x + 51, y + 50, Components.immutableEmpty()).colored(0xFFFFFFFF) + labelAlign = new Label(x + 51, y + 50, Lang.IMMUTABLE_EMPTY).colored(0xFFFFFFFF) .withShadow(); int state = diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java index 411454c7a0..61f46141af 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java @@ -12,8 +12,8 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; @@ -46,7 +46,7 @@ public abstract class ZapperScreen extends AbstractSimiScreen { this.background = background; this.zapper = zapper; this.hand = hand; - title = Components.immutableEmpty(); + title = Lang.IMMUTABLE_EMPTY; brightColor = 0xFEFEFE; fontColor = AllGuiTextures.FONT_COLOR; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java index fc6cc9dd98..2dda8ef1ff 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java @@ -15,8 +15,8 @@ import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -82,7 +82,7 @@ public class WorldshaperScreen extends ZapperScreen { int x = guiLeft; int y = guiTop; - brushLabel = new Label(x + 61, y + 25, Components.immutableEmpty()).withShadow(); + brushLabel = new Label(x + 61, y + 25, Lang.IMMUTABLE_EMPTY).withShadow(); brushInput = new SelectionScrollInput(x + 56, y + 20, 77, 18).forOptions(brushOptions) .titled(CreateLang.translateDirect("gui.terrainzapper.brush")) .writingTo(brushLabel) @@ -111,7 +111,7 @@ public class WorldshaperScreen extends ZapperScreen { brushParams.clear(); for (int index = 0; index < 3; index++) { - Label label = new Label(x + 65 + 20 * index, y + 45, Components.immutableEmpty()).withShadow(); + Label label = new Label(x + 65 + 20 * index, y + 45, Lang.IMMUTABLE_EMPTY).withShadow(); final int finalIndex = index; ScrollInput input = new ScrollInput(x + 56 + 20 * index, y + 40, 18, 18) @@ -155,10 +155,10 @@ public class WorldshaperScreen extends ZapperScreen { if (currentBrush.hasConnectivityOptions()) { int x1 = x + 7 + 4 * 18; int y1 = y + 79; - followDiagonalsIndicator = new Indicator(x1, y1 - 6, Components.immutableEmpty()); + followDiagonalsIndicator = new Indicator(x1, y1 - 6, Lang.IMMUTABLE_EMPTY); followDiagonals = new IconButton(x1, y1, AllIcons.I_FOLLOW_DIAGONAL); x1 += 18; - acrossMaterialsIndicator = new Indicator(x1, y1 - 6, Components.immutableEmpty()); + acrossMaterialsIndicator = new Indicator(x1, y1 - 6, Lang.IMMUTABLE_EMPTY); acrossMaterials = new IconButton(x1, y1, AllIcons.I_FOLLOW_MATERIAL); followDiagonals.withCallback(() -> { diff --git a/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java index 9657acf8fb..6bba5ca5c4 100644 --- a/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java +++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java @@ -9,9 +9,9 @@ import com.simibubi.create.content.fluids.potion.PotionFluid.BottleType; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.FluidIngredient; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.nbt.NBTHelper; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -112,10 +112,10 @@ public class PotionFluidHandler { List list = PotionUtils.getAllEffects(fs.getOrCreateTag()); List> list1 = Lists.newArrayList(); if (list.isEmpty()) { - tooltip.add((Components.translatable("effect.none")).withStyle(ChatFormatting.GRAY)); + tooltip.add((Component.translatable("effect.none")).withStyle(ChatFormatting.GRAY)); } else { for (MobEffectInstance effectinstance : list) { - MutableComponent textcomponent = Components.translatable(effectinstance.getDescriptionId()); + MutableComponent textcomponent = Component.translatable(effectinstance.getDescriptionId()); MobEffect effect = effectinstance.getEffect(); Map map = effect.getAttributeModifiers(); if (!map.isEmpty()) { @@ -131,8 +131,8 @@ public class PotionFluidHandler { } if (effectinstance.getAmplifier() > 0) { - textcomponent.append(" ") - .append(Components.translatable("potion.potency." + effectinstance.getAmplifier()).getString()); + textcomponent.append(" ") + .append(Component.translatable("potion.potency." + effectinstance.getAmplifier()).getString()); } if (effectinstance.getDuration() > 20) { @@ -147,8 +147,8 @@ public class PotionFluidHandler { } if (!list1.isEmpty()) { - tooltip.add(Components.immutableEmpty()); - tooltip.add((Components.translatable("potion.whenDrank")).withStyle(ChatFormatting.DARK_PURPLE)); + tooltip.add(Lang.IMMUTABLE_EMPTY); + tooltip.add((Component.translatable("potion.whenDrank")).withStyle(ChatFormatting.DARK_PURPLE)); for (Tuple tuple : list1) { AttributeModifier attributemodifier2 = tuple.getB(); @@ -162,19 +162,15 @@ public class PotionFluidHandler { } if (d0 > 0.0D) { - tooltip.add((Components.translatable( - "attribute.modifier.plus." + attributemodifier2.getOperation() - .toValue(), - ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(d1), - Components.translatable(tuple.getA()))) + Object[] args = new Object[]{ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(d1), Component.translatable(tuple.getA())}; + tooltip.add((Component.translatable("attribute.modifier.plus." + attributemodifier2.getOperation() + .toValue(), args)) .withStyle(ChatFormatting.BLUE)); } else if (d0 < 0.0D) { d1 = d1 * -1.0D; - tooltip.add((Components.translatable( - "attribute.modifier.take." + attributemodifier2.getOperation() - .toValue(), - ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(d1), - Components.translatable(tuple.getA()))) + Object[] args = new Object[]{ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(d1), Component.translatable(tuple.getA())}; + tooltip.add((Component.translatable("attribute.modifier.take." + attributemodifier2.getOperation() + .toValue(), args)) .withStyle(ChatFormatting.RED)); } } diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java index 70d7d1de3d..08d171ecd7 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java @@ -6,6 +6,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import net.createmod.catnip.lang.Lang; + import org.jetbrains.annotations.NotNull; import com.simibubi.create.AllBlocks; @@ -23,7 +25,6 @@ import joptsimple.internal.Strings; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -208,7 +209,7 @@ public class BoilerData { double totalSU = getEngineEfficiency(boilerSize) * 16 * Math.max(boilerLevel, attachedEngines) * BlockStressValues.getCapacity(AllBlocks.STEAM_ENGINE.get()); - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); if (attachedEngines > 0 && maxHeatForSize > 0 && maxHeatForWater == 0 && (passiveHeat ? 1 : activeHeat) > 0) { CreateLang.translate("boiler.water_input_rate") @@ -289,12 +290,11 @@ public class BoilerData { } private MutableComponent blockComponent(int level) { - return Components.literal( - "" + "\u2588".repeat(minValue) + "\u2592".repeat(level - minValue) + "\u2591".repeat(maxValue - level)); + return Component.literal("" + "\u2588".repeat(minValue) + "\u2592".repeat(level - minValue) + "\u2591".repeat(maxValue - level)); } private MutableComponent barComponent(int level) { - return Components.empty() + return Component.empty() .append(bars(Math.max(0, minValue - 1), ChatFormatting.DARK_GREEN)) .append(bars(minValue > 0 ? 1 : 0, ChatFormatting.GREEN)) .append(bars(Math.max(0, level - minValue), ChatFormatting.DARK_GREEN)) @@ -305,7 +305,7 @@ public class BoilerData { } private MutableComponent bars(int level, ChatFormatting format) { - return Components.literal(Strings.repeat('|', level)) + return Component.literal(Strings.repeat('|', level)) .withStyle(format); } diff --git a/src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java b/src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java index 97631ae4ce..80d7e60b78 100644 --- a/src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java +++ b/src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java @@ -13,7 +13,6 @@ import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.Component; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; @@ -69,8 +68,9 @@ public class FillingRecipe extends ProcessingRecipe implements IA public Component getDescriptionForAssembly() { List matchingFluidStacks = fluidIngredients.get(0) .getMatchingFluidStacks(); - if (matchingFluidStacks.size() == 0) - return Components.literal("Invalid"); + if (matchingFluidStacks.size() == 0) { + return Component.literal("Invalid"); + } return CreateLang.translateDirect("recipe.assembly.spout_filling_fluid", matchingFluidStacks.get(0).getDisplayName().getString()); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java index 29177009b3..db08175e36 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java @@ -15,8 +15,8 @@ import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.math.VecHelper; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -477,7 +477,7 @@ public class BeltSlicer { mc.player.displayClientMessage(CreateLang.translateDirect(feedback.langKey) .withStyle(feedback.formatting), true); else - mc.player.displayClientMessage(Components.immutableEmpty(), true); + mc.player.displayClientMessage(Lang.IMMUTABLE_EMPTY, true); if (feedback.bb != null) Outliner.getInstance().chaseAABB("BeltSlicer", feedback.bb) diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java index 6de9d8a23a..e5d0466b98 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java @@ -120,9 +120,9 @@ public class ChainConveyorBlockEntity extends KineticBlockEntity implements ITra // debug routing info // tooltip.addAll(routingTable.createSummary()); // if (!loopPorts.isEmpty()) -// tooltip.add(Components.literal(loopPorts.size() + " Loop ports")); +// tooltip.add(Component.literal(loopPorts.size() + " Loop ports")); // if (!travelPorts.isEmpty()) -// tooltip.add(Components.literal(travelPorts.size() + " Travel ports")); +// tooltip.add(Component.literal(travelPorts.size() + " Travel ports")); // return true; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRoutingTable.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRoutingTable.java index 216c1d43da..fb8ac8f5aa 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRoutingTable.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRoutingTable.java @@ -8,7 +8,6 @@ import org.apache.commons.lang3.mutable.MutableInt; import com.simibubi.create.content.logistics.box.PackageItem; -import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; @@ -89,8 +88,9 @@ public class ChainConveyorRoutingTable { public Collection createSummary() { ArrayList list = new ArrayList<>(); - for (RoutingTableEntry entry : entriesByDistance) - list.add(Components.literal(" [" + entry.distance() + "] " + entry.port())); + for (RoutingTableEntry entry : entriesByDistance) { + list.add(Component.literal(" [" + entry.distance() + "] " + entry.port())); + } return list; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java index ba76b9f2c3..91946bf1dc 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java @@ -24,7 +24,6 @@ import dev.engine_room.flywheel.lib.model.Models; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.math.VecHelper; -import net.createmod.catnip.lang.Components; import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -168,9 +167,9 @@ public class ValveHandleBlockEntity extends HandCrankBlockEntity { @Override public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) { - ImmutableList rows = ImmutableList.of(Components.literal("\u27f3") + ImmutableList rows = ImmutableList.of(Component.literal("\u27f3") .withStyle(ChatFormatting.BOLD), - Components.literal("\u27f2") + Component.literal("\u27f2") .withStyle(ChatFormatting.BOLD)); return new ValueSettingsBoard(label, 180, 45, rows, new ValueSettingsFormatter(this::formatValue)); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java index a5e6e56160..81ee1daa3b 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java @@ -13,7 +13,6 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.Pro import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -57,10 +56,11 @@ public class DeployerApplicationRecipe extends ItemApplicationRecipe implements public Component getDescriptionForAssembly() { ItemStack[] matchingStacks = ingredients.get(1) .getItems(); - if (matchingStacks.length == 0) - return Components.literal("Invalid"); + if (matchingStacks.length == 0) { + return Component.literal("Invalid"); + } return CreateLang.translateDirect("recipe.assembly.deploying_item", - Components.translatable(matchingStacks[0].getDescriptionId()).getString()); + Component.translatable(matchingStacks[0].getDescriptionId()).getString()); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java index 5122dd8f27..dccd1d75ef 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java @@ -27,10 +27,10 @@ import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.lib.model.baked.PartialModel; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.nbt.NBTHelper; import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.animation.LerpedFloat; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -503,14 +503,14 @@ public class DeployerBlockEntity extends KineticBlockEntity { .forGoggles(tooltip); if (!heldItem.isEmpty()) - CreateLang.translate("tooltip.deployer.contains", Components.translatable(heldItem.getDescriptionId()) - .getString(), heldItem.getCount()) - .style(ChatFormatting.GREEN) - .forGoggles(tooltip); + CreateLang.translate("tooltip.deployer.contains", Component.translatable(heldItem.getDescriptionId()) + .getString(), heldItem.getCount()) + .style(ChatFormatting.GREEN) + .forGoggles(tooltip); float stressAtBase = calculateStressApplied(); if (StressImpact.isEnabled() && !Mth.equal(stressAtBase, 0)) { - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); addStressImpactStats(tooltip, stressAtBase); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java index 628c0f12e4..95ca6c15ef 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java @@ -8,7 +8,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatt import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -24,9 +23,9 @@ public class KineticScrollValueBehaviour extends ScrollValueBehaviour { @Override public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) { - ImmutableList rows = ImmutableList.of(Components.literal("\u27f3") + ImmutableList rows = ImmutableList.of(Component.literal("\u27f3") .withStyle(ChatFormatting.BOLD), - Components.literal("\u27f2") + Component.literal("\u27f2") .withStyle(ChatFormatting.BOLD)); ValueSettingsFormatter formatter = new ValueSettingsFormatter(this::formatSettings); return new ValueSettingsBoard(label, 256, 32, rows, formatter); diff --git a/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/InstructionSpeedModifiers.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/InstructionSpeedModifiers.java index 3e26520b75..8f6387cb8c 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/InstructionSpeedModifiers.java +++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/InstructionSpeedModifiers.java @@ -6,7 +6,6 @@ import java.util.List; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.Lang; import net.minecraft.network.chat.Component; @@ -26,7 +25,7 @@ public enum InstructionSpeedModifiers { value = modifier; } private InstructionSpeedModifiers(int modifier, String label) { - this.label = Components.literal(label); + this.label = Component.literal(label); translationKey = "gui.sequenced_gearshift.speed." + Lang.asId(name()); value = modifier; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftScreen.java index 240aab2d55..7cf35589e5 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftScreen.java +++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftScreen.java @@ -14,10 +14,10 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.ItemStack; public class SequencedGearshiftScreen extends AbstractSimiScreen { @@ -169,7 +169,7 @@ public class SequencedGearshiftScreen extends AbstractSimiScreen { if (def.hasValueParameter) { String text = def.formatValue(instruction.value); int stringWidth = font.width(text); - label(graphics, 90 + (12 - stringWidth / 2), yOffset - 1, Components.literal(text)); + label(graphics, 90 + (12 - stringWidth / 2), yOffset - 1, Component.literal(text)); } if (def.hasSpeedParameter) label(graphics, 127, yOffset - 1, instruction.speedModifier.label); diff --git a/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java b/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java index accef5fd0f..a022055ae2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java +++ b/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java @@ -11,7 +11,6 @@ import com.simibubi.create.content.trains.schedule.DestinationSuggestions; import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -27,7 +26,7 @@ public class AddressEditBox extends EditBox { private Consumer mainResponder; public AddressEditBox(Screen screen, Font pFont, int pX, int pY, int pWidth, int pHeight, boolean anchorToBottom) { - super(pFont, pX, pY, pWidth, pHeight, Components.empty()); + super(pFont, pX, pY, pWidth, pHeight, Component.empty()); destinationSuggestions = AddressEditBoxHelper.createSuggestions(screen, this, anchorToBottom); destinationSuggestions.setAllowSuggestions(true); destinationSuggestions.updateCommandInfo(); @@ -73,12 +72,12 @@ public class AddressEditBox extends EditBox { return true; return false; } - + @Override public void setValue(String text) { super.setValue(text); } - + @Override public void setFocused(boolean focused) { super.setFocused(focused); diff --git a/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java b/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java index 60c1e53ed1..c217a7ed8c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java @@ -13,7 +13,6 @@ import com.simibubi.create.content.logistics.stockTicker.PackageOrder; import net.createmod.catnip.data.Glob; import net.createmod.catnip.math.VecHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -201,20 +200,21 @@ public class PackageItem extends Item { CompoundTag compoundnbt = pStack.getOrCreateTag(); if (compoundnbt.contains("Address", Tag.TAG_STRING) && !compoundnbt.getString("Address") - .isBlank()) - pTooltipComponents.add(Components.literal("\u2192 " + compoundnbt.getString("Address")) - .withStyle(ChatFormatting.GOLD)); + .isBlank()) { + pTooltipComponents.add(Component.literal("\u2192 " + compoundnbt.getString("Address")) + .withStyle(ChatFormatting.GOLD)); + } /* * Debug Fragmentation Data if (compoundnbt.contains("Fragment")) { CompoundTag * fragTag = compoundnbt.getCompound("Fragment"); - * pTooltipComponents.add(Components.literal("Order Information (Temporary)") + * pTooltipComponents.add(Component.literal("Order Information (Temporary)") * .withStyle(ChatFormatting.GREEN)); pTooltipComponents.add(Components * .literal(" Link " + fragTag.getInt("LinkIndex") + * (fragTag.getBoolean("IsFinalLink") ? " Final" : "") + " | Fragment " + * fragTag.getInt("Index") + (fragTag.getBoolean("IsFinal") ? " Final" : "")) * .withStyle(ChatFormatting.DARK_GREEN)); if (fragTag.contains("OrderContext")) - * pTooltipComponents.add(Components.literal("Has Context!") + * pTooltipComponents.add(Component.literal("Has Context!") * .withStyle(ChatFormatting.DARK_GREEN)); } */ @@ -242,7 +242,7 @@ public class PackageItem extends Item { } if (skippedNames > 0) - pTooltipComponents.add(Components.translatable("container.shulkerBox.more", skippedNames) + pTooltipComponents.add(Component.translatable("container.shulkerBox.more", skippedNames) .withStyle(ChatFormatting.ITALIC)); } diff --git a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java index 436e375d19..70d265c363 100644 --- a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java @@ -31,7 +31,6 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.animation.LerpedFloat; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; @@ -740,10 +739,10 @@ public class ChuteBlockEntity extends SmartBlockEntity implements IHaveGoggleInf .style(ChatFormatting.YELLOW) .forGoggles(tooltip); if (!item.isEmpty()) - CreateLang.translate("tooltip.chute.contains", Components.translatable(item.getDescriptionId()) - .getString(), item.getCount()) - .style(ChatFormatting.GREEN) - .forGoggles(tooltip); + CreateLang.translate("tooltip.chute.contains", Component.translatable(item.getDescriptionId()) + .getString(), item.getCount()) + .style(ChatFormatting.GREEN) + .forGoggles(tooltip); return true; } diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java index 68c2c23cd0..3ceb11f0be 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java @@ -13,6 +13,7 @@ import java.util.UUID; import javax.annotation.Nullable; +import net.minecraft.network.chat.Component; import org.joml.Math; import com.google.common.collect.HashMultimap; @@ -47,7 +48,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.createmod.catnip.gui.ScreenOpener; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.player.LocalPlayer; @@ -156,7 +156,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { return null; return behaviour; } - + @Nullable public static FactoryPanelSupportBehaviour linkAt(BlockAndTintGetter world, FactoryPanelConnection connection) { Object cached = connection.cachedSource.get(); @@ -177,7 +177,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { public void moveTo(FactoryPanelPosition newPos, ServerPlayer player) { Level level = getWorld(); BlockState existingState = level.getBlockState(newPos.pos()); - + // Check if target pos is valid if (FactoryPanelBehaviour.at(level, newPos) != null) return; @@ -188,7 +188,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { return; if (!isAddedToOtherGauge) level.setBlock(newPos.pos(), blockEntity.getBlockState(), 3); - + for (BlockPos blockPos : targetedByLinks.keySet()) if (!blockPos.closerThan(newPos.pos(), 24)) return; @@ -198,18 +198,18 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { for (FactoryPanelPosition blockPos : targeting) if (!blockPos.pos().closerThan(newPos.pos(), 24)) return; - + // Disconnect links for (BlockPos pos : targetedByLinks.keySet()) { FactoryPanelSupportBehaviour at = linkAt(level, new FactoryPanelPosition(pos, slot)); if (at != null) at.disconnect(this); } - + SmartBlockEntity oldBE = blockEntity; FactoryPanelPosition oldPos = getPanelPosition(); slot = newPos.slot(); - + // Add to new BE if (level.getBlockEntity(newPos.pos()) instanceof FactoryPanelBlockEntity fpbe) { fpbe.attachBehaviourLate(this); @@ -218,7 +218,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { fpbe.lastShape = null; fpbe.notifyUpdate(); } - + // Remove from old BE if (oldBE instanceof FactoryPanelBlockEntity fpbe) { FactoryPanelBehaviour newBehaviour = new FactoryPanelBehaviour(fpbe, oldPos.slot()); @@ -228,7 +228,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { fpbe.lastShape = null; fpbe.notifyUpdate(); } - + // Rewire connections for (FactoryPanelPosition position : targeting) { FactoryPanelBehaviour at = at(level, position); @@ -239,7 +239,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { at.blockEntity.sendData(); } } - + for (FactoryPanelPosition position : targetedBy.keySet()) { FactoryPanelBehaviour at = at(level, position); if (at != null) { @@ -247,14 +247,14 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { at.targeting.add(newPos); } } - + // Reconnect links for (BlockPos pos : targetedByLinks.keySet()) { FactoryPanelSupportBehaviour at = linkAt(level, new FactoryPanelPosition(pos, slot)); if (at != null) at.connect(this); } - + // Tell player player.displayClientMessage(CreateLang.translate("factory_panel.relocated") .style(ChatFormatting.GREEN) @@ -262,7 +262,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { player.level() .playSound(null, newPos.pos(), SoundEvents.COPPER_BREAK, SoundSource.BLOCKS, 1.0f, 1.0f); } - + @Override public void initialize() { super.initialize(); @@ -810,8 +810,11 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { @Override public MutableComponent formatValue(ValueSettings value) { - return value.value() == 0 ? CreateLang.translateDirect("gui.factory_panel.inactive") - : Components.literal(Math.max(0, value.value()) + ((value.row() == 0) ? "" : "\u25A4")); + if (value.value() == 0) { + return CreateLang.translateDirect("gui.factory_panel.inactive"); + } else { + return Component.literal(Math.max(0, value.value()) + ((value.row() == 0) ? "" : "\u25A4")); + } } @Override @@ -905,9 +908,10 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { @Override public MutableComponent getCountLabelForValueBox() { if (filter.isEmpty()) - return Components.empty(); - if (waitingForNetwork) - return Components.literal("?"); + return Component.empty(); + if (waitingForNetwork) { + return Component.literal("?"); + } int levelInStorage = getLevelInStorage(); boolean inf = levelInStorage >= BigItemStack.INF; @@ -971,17 +975,17 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { return isActive() ? new ItemRequirement(ItemRequirement.ItemUseType.CONSUME, AllBlocks.FACTORY_GAUGE.asItem()) : ItemRequirement.NONE; } - + @Override public boolean canShortInteract(ItemStack toApply) { return true; } - + @Override public boolean readFromClipboard(CompoundTag tag, Player player, Direction side, boolean simulate) { return false; } - + @Override public boolean writeToClipboard(CompoundTag tag, Direction side) { return false; diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java index 194690f3d8..aded46f510 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java @@ -8,12 +8,12 @@ import com.simibubi.create.AllMenuTypes; import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickType; @@ -54,7 +54,7 @@ public class AttributeFilterMenu extends AbstractFilterMenu { super.init(inv, contentHolder); ItemStack stack = new ItemStack(Items.NAME_TAG); stack.setHoverName( - Components.literal("Selected Tags").withStyle(ChatFormatting.RESET, ChatFormatting.BLUE)); + Component.literal("Selected Tags").withStyle(ChatFormatting.RESET, ChatFormatting.BLUE)); ghostInventory.setStackInSlot(1, stack); } diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java index 1a8ba38fc3..41e0e1dc3a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java @@ -21,7 +21,7 @@ import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.nbt.CompoundTag; @@ -90,9 +90,9 @@ public class AttributeFilterScreen extends AbstractFilterScreen selectedAttributes.add(Components.literal("- ") - .append(at.getFirst() - .format(at.getSecond())) - .withStyle(ChatFormatting.GRAY))); + menu.selectedAttributes.forEach(at -> { + selectedAttributes.add(Component.literal("- ") + .append(at.getFirst() + .format(at.getSecond())) + .withStyle(ChatFormatting.GRAY)); + }); } private void referenceItemChanged(ItemStack stack) { @@ -240,7 +242,7 @@ public class AttributeFilterScreen extends AbstractFilterScreen makeSummary = makeSummary(stack); if (makeSummary.isEmpty()) return; - tooltip.add(Components.literal(" ")); + tooltip.add(Component.literal(" ")); tooltip.addAll(makeSummary); } @@ -102,7 +102,7 @@ public class FilterItem extends Item implements MenuProvider { int count = 0; for (int i = 0; i < filterItems.getSlots(); i++) { if (count > 3) { - list.add(Components.literal("- ...") + list.add(Component.literal("- ...") .withStyle(ChatFormatting.DARK_GRAY)); break; } @@ -110,7 +110,7 @@ public class FilterItem extends Item implements MenuProvider { ItemStack filterStack = filterItems.getStackInSlot(i); if (filterStack.isEmpty()) continue; - list.add(Components.literal("- ") + list.add(Component.literal("- ") .append(filterStack.getHoverName()) .withStyle(ChatFormatting.GRAY)); count++; @@ -139,11 +139,11 @@ public class FilterItem extends Item implements MenuProvider { continue; boolean inverted = compound.getBoolean("Inverted"); if (count > 3) { - list.add(Components.literal("- ...") + list.add(Component.literal("- ...") .withStyle(ChatFormatting.DARK_GRAY)); break; } - list.add(Components.literal("- ") + list.add(Component.literal("- ") .append(attribute.format(inverted))); count++; } diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java index ffc6609426..b6256df5f6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.gui.widget.IconButton; import com.simibubi.create.foundation.gui.widget.Indicator; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; @@ -58,8 +58,8 @@ public class FilterScreen extends AbstractFilterScreen { sendOptionUpdate(Option.WHITELIST); }); whitelist.setToolTip(allowN); - blacklistIndicator = new Indicator(x + 18, y + 69, Components.immutableEmpty()); - whitelistIndicator = new Indicator(x + 36, y + 69, Components.immutableEmpty()); + blacklistIndicator = new Indicator(x + 18, y + 69, Lang.IMMUTABLE_EMPTY); + whitelistIndicator = new Indicator(x + 36, y + 69, Lang.IMMUTABLE_EMPTY); addRenderableWidgets(blacklist, whitelist, blacklistIndicator, whitelistIndicator); respectNBT = new IconButton(x + 60, y + 75, AllIcons.I_RESPECT_NBT); @@ -74,8 +74,8 @@ public class FilterScreen extends AbstractFilterScreen { sendOptionUpdate(Option.IGNORE_DATA); }); ignoreNBT.setToolTip(ignoreDataN); - respectNBTIndicator = new Indicator(x + 60, y + 69, Components.immutableEmpty()); - ignoreNBTIndicator = new Indicator(x + 78, y + 69, Components.immutableEmpty()); + respectNBTIndicator = new Indicator(x + 60, y + 69, Lang.IMMUTABLE_EMPTY); + ignoreNBTIndicator = new Indicator(x + 78, y + 69, Lang.IMMUTABLE_EMPTY); addRenderableWidgets(respectNBT, ignoreNBT, respectNBTIndicator, ignoreNBTIndicator); handleIndicators(); diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java index 2622099371..69ff34af90 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java @@ -4,7 +4,8 @@ import java.util.ArrayList; import java.util.List; import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.lang.Components; + +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -42,7 +43,7 @@ public class EnchantAttribute implements ItemAttribute { public Object[] getTranslationParameters() { String parameter = ""; if (enchantment != null) - parameter = Components.translatable(enchantment.getDescriptionId()).getString(); + parameter = Component.translatable(enchantment.getDescriptionId()).getString(); return new Object[]{parameter}; } diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAmuletAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAmuletAttribute.java index 9b1b9f5783..9fd2bc5bcf 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAmuletAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAmuletAttribute.java @@ -5,7 +5,7 @@ import java.util.List; import com.simibubi.create.content.logistics.item.filter.attribute.AllItemAttributeTypes; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; @@ -55,7 +55,7 @@ public class AstralSorceryAmuletAttribute implements ItemAttribute { Enchantment enchant = ForgeRegistries.ENCHANTMENTS.getValue(ResourceLocation.tryParse(enchName)); if (enchant != null) { - something = Components.translatable(enchant.getDescriptionId()).getString(); + something = Component.translatable(enchant.getDescriptionId()).getString(); } if (enchType == 1) something = "existing " + something; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAttunementAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAttunementAttribute.java index 138c532e30..1dc38bba91 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAttunementAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAttunementAttribute.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.logistics.item.filter.attribute.attributes.a import java.util.ArrayList; import java.util.List; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; @@ -50,7 +50,7 @@ public class AstralSorceryAttunementAttribute implements ItemAttribute { @Override public Object[] getTranslationParameters() { ResourceLocation constResource = new ResourceLocation(constellationName); - String something = Components.translatable(String.format("%s.constellation.%s", constResource.getNamespace(), constResource.getPath())).getString(); + String something = Component.translatable(String.format("%s.constellation.%s", constResource.getNamespace(), constResource.getPath())).getString(); return new Object[]{something}; } diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryCrystalAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryCrystalAttribute.java index 5702e82b27..77887970d7 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryCrystalAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryCrystalAttribute.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.logistics.item.filter.attribute.attributes.a import java.util.ArrayList; import java.util.List; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; @@ -46,7 +46,7 @@ public class AstralSorceryCrystalAttribute implements ItemAttribute { @Override public Object[] getTranslationParameters() { ResourceLocation traitResource = new ResourceLocation(traitName); - String something = Components.translatable(String.format("crystal.property.%s.%s.name", traitResource.getNamespace(), traitResource.getPath())).getString(); + String something = Component.translatable(String.format("crystal.property.%s.%s.name", traitResource.getNamespace(), traitResource.getPath())).getString(); return new Object[]{something}; } diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryPerkGemAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryPerkGemAttribute.java index b40dc3f4df..e82e368c75 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryPerkGemAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryPerkGemAttribute.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.logistics.item.filter.attribute.attributes.a import java.util.ArrayList; import java.util.List; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; @@ -46,7 +46,7 @@ public class AstralSorceryPerkGemAttribute implements ItemAttribute { @Override public Object[] getTranslationParameters() { ResourceLocation traitResource = new ResourceLocation(traitName); - String something = Components.translatable(String.format("perk.attribute.%s.%s.name", traitResource.getNamespace(), traitResource.getPath())).getString(); + String something = Component.translatable(String.format("perk.attribute.%s.%s.name", traitResource.getNamespace(), traitResource.getPath())).getString(); return new Object[]{something}; } diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java index d53d631f65..0635ce802d 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.logistics.packagePort; import java.util.ArrayList; import java.util.List; +import net.minecraft.network.chat.MutableComponent; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,7 +17,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.animatedContainer.An import com.simibubi.create.foundation.item.SmartInventory; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -193,7 +194,7 @@ public abstract class PackagePortBlockEntity extends SmartBlockEntity implements list.add(page); } - page.add(new ClipboardEntry(false, Components.literal("#" + addressFilter))); + page.add(new ClipboardEntry(false, Component.literal("#" + addressFilter))); player.displayClientMessage(CreateLang.translate("clipboard.address_added", addressFilter) .component(), true); @@ -204,8 +205,8 @@ public abstract class PackagePortBlockEntity extends SmartBlockEntity implements @Override public Component getDisplayName() { - return Components.empty(); - } + return Component.empty(); + } @Override public AbstractContainerMenu createMenu(int pContainerId, Inventory pPlayerInventory, Player pPlayer) { diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java index a110f58412..33eb9bf737 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java @@ -17,7 +17,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.gui.widget.AbstractSimiWidget; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; @@ -60,8 +59,8 @@ public class PackagePortScreen extends AbstractSimiContainerScreen onTextChanged; onTextChanged = s -> addressBox.setX(nameBoxX(s, addressBox)); - addressBox = new EditBox(new NoShadowFontWrapper(font), x + 23, y - 11, background.getWidth() - 20, 10, - Components.empty()); + addressBox = new EditBox(new NoShadowFontWrapper(font), x + 23, y - 11, background.getWidth() - 20, 10, + Component.empty()); addressBox.setBordered(false); addressBox.setMaxLength(25); addressBox.setTextColor(0x3D3C48); diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java index e7ef9604ec..09b004d2c3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java @@ -7,10 +7,10 @@ import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRende import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.lang.Components; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; @@ -40,8 +40,9 @@ public class FrogportRenderer extends SmartBlockEntityRenderer { @@ -24,8 +24,9 @@ public class PostboxRenderer extends SmartBlockEntityRenderer 8) - graphics.drawString(font, Components.literal("[+" + (itemsToOrder.size() - 8) + "]"), x + windowWidth - 40, + if (itemsToOrder.size() > 8) { + graphics.drawString(font, Component.literal("[+" + (itemsToOrder.size() - 8) + "]"), x + windowWidth - 40, orderY + 21, 0xF8F8EC); + } boolean justSent = itemsToOrder.isEmpty() && successTicks > 0; if (isConfirmHovered(mouseX, mouseY) && !justSent) diff --git a/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java index f50cfeac74..cf54876c48 100644 --- a/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java @@ -28,7 +28,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -226,7 +225,7 @@ public class StockTickerBlockEntity extends StockCheckingBlockEntity implements summary.add(receivedPayments.getStackInSlot(i)); for (BigItemStack entry : summary.getStacksByCount()) CreateLang.builder() - .text(Components.translatable(entry.stack.getDescriptionId()) + .text(Component.translatable(entry.stack.getDescriptionId()) .getString() + " x" + entry.count) .style(ChatFormatting.GREEN) .forGoggles(tooltip); @@ -259,7 +258,7 @@ public class StockTickerBlockEntity extends StockCheckingBlockEntity implements capability.invalidate(); super.invalidate(); } - + public void playEffect() { AllSoundEvents.STOCK_LINK.playAt(level, worldPosition, 1.0f, 1.0f, false); Vec3 vec3 = Vec3.atCenterOf(worldPosition); @@ -275,8 +274,8 @@ public class StockTickerBlockEntity extends StockCheckingBlockEntity implements @Override public Component getDisplayName() { - return Components.empty(); - } + return Component.empty(); + } } @@ -289,8 +288,8 @@ public class StockTickerBlockEntity extends StockCheckingBlockEntity implements @Override public Component getDisplayName() { - return Components.empty(); - } + return Component.empty(); + } } diff --git a/src/main/java/com/simibubi/create/content/logistics/tableCloth/ShoppingListItem.java b/src/main/java/com/simibubi/create/content/logistics/tableCloth/ShoppingListItem.java index 4d436c9b2b..abd9aed287 100644 --- a/src/main/java/com/simibubi/create/content/logistics/tableCloth/ShoppingListItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/tableCloth/ShoppingListItem.java @@ -12,7 +12,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.IntAttached; import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -127,7 +126,7 @@ public class ShoppingListItem extends Item { boolean cost = items == lists.getSecond(); if (cost) - pTooltipComponents.add(Components.empty()); + pTooltipComponents.add(Component.empty()); if (entries.size() == 1) { BigItemStack entry = entries.get(0); diff --git a/src/main/java/com/simibubi/create/content/logistics/tableCloth/TableClothFilteringBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/tableCloth/TableClothFilteringBehaviour.java index 6577edde41..c6be93e071 100644 --- a/src/main/java/com/simibubi/create/content/logistics/tableCloth/TableClothFilteringBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/tableCloth/TableClothFilteringBehaviour.java @@ -6,8 +6,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatt import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; @@ -81,12 +81,12 @@ public class TableClothFilteringBehaviour extends FilteringBehaviour { } public MutableComponent formatValue(ValueSettings value) { - return Components.literal(String.valueOf(Math.max(1, value.value()))); + return Component.literal(String.valueOf(Math.max(1, value.value()))); } @Override public MutableComponent getCountLabelForValueBox() { - return Components.literal(isCountVisible() ? String.valueOf(count) : ""); + return Component.literal(isCountVisible() ? String.valueOf(count) : ""); } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java index 9ad5197130..624e8716ec 100644 --- a/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java @@ -34,7 +34,6 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -795,8 +794,8 @@ public class BrassTunnelBlockEntity extends BeltTunnelBlockEntity implements IHa CreateLang.translate("tooltip.brass_tunnel.contains").style(ChatFormatting.WHITE).forGoggles(tooltip); for (ItemStack item : allStacks) { - CreateLang.translate("tooltip.brass_tunnel.contains_entry", - Components.translatable(item.getDescriptionId()).getString(), item.getCount()) + CreateLang.translate("tooltip.brass_tunnel.contains_entry", + Component.translatable(item.getDescriptionId()).getString(), item.getCount()) .style(ChatFormatting.GRAY).forGoggles(tooltip); } CreateLang.translate("tooltip.brass_tunnel.retrieve").style(ChatFormatting.DARK_GRAY).forGoggles(tooltip); diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java index e72c1c07bc..ee3a001fa1 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java @@ -39,7 +39,6 @@ import net.createmod.catnip.nbt.NBTHelper; import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.LangBuilder; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -753,8 +752,8 @@ public class BasinBlockEntity extends SmartBlockEntity implements IHaveGoggleInf ItemStack stackInSlot = items.getStackInSlot(i); if (stackInSlot.isEmpty()) continue; - CreateLang.text("") - .add(Components.translatable(stackInSlot.getDescriptionId()) + CreateLang.text("") + .add(Component.translatable(stackInSlot.getDescriptionId()) .withStyle(ChatFormatting.GRAY)) .add(CreateLang.text(" x" + stackInSlot.getCount()) .style(ChatFormatting.GREEN)) diff --git a/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java index 2ce705caaf..cc9c4dbaff 100644 --- a/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java +++ b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java @@ -16,12 +16,13 @@ import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.RegistryAccess; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; @@ -249,7 +250,7 @@ public class SequencedAssemblyRecipe implements Recipe { int step = sequencedAssemblyRecipe.getStep(stack); int total = length * sequencedAssemblyRecipe.loops; List tooltip = event.getToolTip(); - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); tooltip.add(CreateLang.translateDirect("recipe.sequenced_assembly") .withStyle(ChatFormatting.GRAY)); tooltip.add(CreateLang.translateDirect("recipe.assembly.progress", step, total) @@ -265,9 +266,10 @@ public class SequencedAssemblyRecipe implements Recipe { if (i == 0) tooltip.add(CreateLang.translateDirect("recipe.assembly.next", textComponent) .withStyle(ChatFormatting.AQUA)); - else - tooltip.add(Components.literal("-> ").append(textComponent) - .withStyle(ChatFormatting.DARK_AQUA)); + else { + tooltip.add(Component.literal("-> ").append(textComponent) + .withStyle(ChatFormatting.DARK_AQUA)); + } } } diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java index 7c853d1106..e5b0586461 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java @@ -7,7 +7,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatt import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -69,7 +68,7 @@ public class BrassDiodeScrollValueBehaviour extends ScrollValueBehaviour { public MutableComponent formatSettings(ValueSettings settings) { int value = Math.max(1, settings.value()); - return Components.literal(switch (settings.row()) { + return Component.literal(switch (settings.row()) { case 0 -> Math.max(2, value) + "t"; case 1 -> "0:" + (value < 10 ? "0" : "") + value; default -> value + ":00"; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java index e96e1da4f3..557e380373 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java @@ -27,7 +27,7 @@ import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.gui.widget.AbstractSimiWidget; import net.createmod.catnip.gui.widget.ElementWidget; import net.createmod.catnip.data.Couple; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.createmod.ponder.foundation.ui.PonderTagScreen; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; @@ -138,7 +138,7 @@ public class DisplayLinkScreen extends AbstractSimiScreen { int rows = stats.maxRows(); int startIndex = Math.min(blockEntity.targetLine, rows); - targetLineLabel = new Label(x + 65, y + 109, Components.immutableEmpty()).withShadow(); + targetLineLabel = new Label(x + 65, y + 109, Lang.IMMUTABLE_EMPTY).withShadow(); targetLineLabel.text = target.getLineOptionText(startIndex); if (rows > 1) { @@ -190,7 +190,7 @@ public class DisplayLinkScreen extends AbstractSimiScreen { if (!sources.isEmpty()) { int startIndex = Math.max(sources.indexOf(blockEntity.activeSource), 0); - sourceTypeLabel = new Label(x + 65, y + 30, Components.immutableEmpty()).withShadow(); + sourceTypeLabel = new Label(x + 65, y + 30, Lang.IMMUTABLE_EMPTY).withShadow(); sourceTypeLabel.text = sources.get(startIndex) .getName(); diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/AccumulatedItemCountDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/AccumulatedItemCountDisplaySource.java index e01d76ed47..5d7bcd9404 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/AccumulatedItemCountDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/AccumulatedItemCountDisplaySource.java @@ -5,14 +5,14 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; public class AccumulatedItemCountDisplaySource extends NumericSingleLineDisplaySource { @Override protected MutableComponent provideLine(DisplayLinkContext context, DisplayTargetStats stats) { - return Components.literal(String.valueOf(context.sourceConfig() + return Component.literal(String.valueOf(context.sourceConfig() .getInt("Collected"))); } diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/BoilerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/BoilerDisplaySource.java index d7ebffe5c7..b4b6fbfc8a 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/BoilerDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/BoilerDisplaySource.java @@ -14,8 +14,8 @@ import com.simibubi.create.content.trains.display.FlapDisplaySection; import com.simibubi.create.foundation.utility.CreateLang; import joptsimple.internal.Strings; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.LecternBlockEntity; @@ -50,8 +50,10 @@ public class BoilerDisplaySource extends DisplaySource { return reduce.orElse(EMPTY_LINE); }); - return List.of(componentList.reduce((comp1, comp2) -> comp1.append(Components.literal("\n")) - .append(comp2)) + return List.of(componentList.reduce((comp1, comp2) -> { + return comp1.append(Component.literal("\n")) + .append(comp2); + }) .orElse(EMPTY_LINE)); } @@ -128,9 +130,9 @@ public class BoilerDisplaySource extends DisplaySource { int lw = labelWidth(); if (forFlapDisplay) { - size = Components.literal(Strings.repeat(' ', lw - labelWidthOf("size"))).append(size); - water = Components.literal(Strings.repeat(' ', lw - labelWidthOf("water"))).append(water); - heat = Components.literal(Strings.repeat(' ', lw - labelWidthOf("heat"))).append(heat); + size = Component.literal(Strings.repeat(' ', lw - labelWidthOf("size"))).append(size); + water = Component.literal(Strings.repeat(' ', lw - labelWidthOf("water"))).append(water); + heat = Component.literal(Strings.repeat(' ', lw - labelWidthOf("heat"))).append(heat); } return Stream.of(List.of(CreateLang.translateDirect(label, boiler.getHeatLevelTextComponent())), @@ -150,7 +152,7 @@ public class BoilerDisplaySource extends DisplaySource { private MutableComponent labelOf(String label) { if (label.isBlank()) - return Components.empty(); + return Component.empty(); return CreateLang.translateDirect("boiler." + label); } diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ComputerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ComputerDisplaySource.java index 451147f148..d1af5e649e 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ComputerDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ComputerDisplaySource.java @@ -6,9 +6,9 @@ import java.util.List; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; -import net.createmod.catnip.lang.Components; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; public class ComputerDisplaySource extends DisplaySource { @@ -19,7 +19,7 @@ public class ComputerDisplaySource extends DisplaySource { ListTag tag = context.sourceConfig().getList("ComputerSourceList", Tag.TAG_STRING); for (int i = 0; i < tag.size(); i++) { - components.add(Components.literal(tag.getString(i))); + components.add(Component.literal(tag.getString(i))); } return components; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/CurrentFloorDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/CurrentFloorDisplaySource.java index f092286034..916a80d6c5 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/CurrentFloorDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/CurrentFloorDisplaySource.java @@ -4,7 +4,7 @@ import com.simibubi.create.content.contraptions.elevator.ElevatorContactBlockEnt import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; public class CurrentFloorDisplaySource extends SingleLineDisplaySource { @@ -13,7 +13,7 @@ public class CurrentFloorDisplaySource extends SingleLineDisplaySource { protected MutableComponent provideLine(DisplayLinkContext context, DisplayTargetStats stats) { if (!(context.getSourceBlockEntity() instanceof ElevatorContactBlockEntity ecbe)) return EMPTY_LINE; - return Components.literal(ecbe.lastReportedCurrentFloor); + return Component.literal(ecbe.lastReportedCurrentFloor); } @Override diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java index 125284b8d1..5686ab559d 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java @@ -14,7 +14,6 @@ import com.simibubi.create.content.trains.display.FlapDisplayLayout; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import net.createmod.catnip.nbt.NBTProcessors; -import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraftforge.api.distmarker.Dist; @@ -22,9 +21,13 @@ import net.minecraftforge.api.distmarker.OnlyIn; public abstract class DisplaySource extends DisplayBehaviour { - public static final List EMPTY = ImmutableList.of(Components.empty()); - public static final MutableComponent EMPTY_LINE = Components.empty(); - public static final MutableComponent WHITESPACE = Components.literal(" "); + public static final List EMPTY = ImmutableList.of(Component.empty()); + public static final MutableComponent EMPTY_LINE = Component.empty(); + public static final MutableComponent WHITESPACE; + + static { + WHITESPACE = Component.literal(" "); + } public abstract List provideText(DisplayLinkContext context, DisplayTargetStats stats); @@ -65,7 +68,7 @@ public abstract class DisplaySource extends DisplayBehaviour { } public Component getName() { - return Components.translatable(id.getNamespace() + ".display_source." + getTranslationKey()); + return Component.translatable(id.getNamespace() + ".display_source." + getTranslationKey()); } public void loadFlapDisplayLayout(DisplayLinkContext context, FlapDisplayBlockEntity flapDisplay, FlapDisplayLayout layout, int lineIndex) { diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EnchantPowerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EnchantPowerDisplaySource.java index b6bb412c6d..6a8a8e14ef 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EnchantPowerDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EnchantPowerDisplaySource.java @@ -3,8 +3,8 @@ package com.simibubi.create.content.redstone.displayLink.source; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; -import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.RandomSource; import net.minecraft.world.item.ItemStack; @@ -38,7 +38,7 @@ public class EnchantPowerDisplaySource extends NumericSingleLineDisplaySource { int cost = EnchantmentHelper.getEnchantmentCost(random, 2, (int) enchantPower, stack); - return Components.literal(String.valueOf(cost)); + return Component.literal(String.valueOf(cost)); } @Override diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FactoryGaugeDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FactoryGaugeDisplaySource.java index 04770804f2..a301696e4e 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FactoryGaugeDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FactoryGaugeDisplaySource.java @@ -11,8 +11,8 @@ import com.simibubi.create.content.logistics.factoryBoard.FactoryPanelPosition; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import net.createmod.catnip.data.IntAttached; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -51,7 +51,7 @@ public class FactoryGaugeDisplaySource extends ValueListDisplaySource { s = "\u25aa"; } - return IntAttached.with(panel.getLevelInStorage(), Components.literal(s + " ") + return IntAttached.with(panel.getLevelInStorage(), Component.literal(s + " ") .withStyle(style -> style.withColor(panel.getIngredientStatusColor())) .append(filter.getHoverName() .plainCopy() diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidAmountDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidAmountDisplaySource.java index 89af25d13f..6ae7949fb5 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidAmountDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidAmountDisplaySource.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringB import com.simibubi.create.foundation.blockEntity.behaviour.inventory.TankManipulationBehaviour; import com.simibubi.create.foundation.utility.FluidFormatter; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.fluids.FluidStack; @@ -38,7 +38,7 @@ public class FluidAmountDisplaySource extends SingleLineDisplaySource { collected += stack.getAmount(); } - return Components.literal(FluidFormatter.asString(collected, false)); + return Component.literal(FluidFormatter.asString(collected, false)); } @Override diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidListDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidListDisplaySource.java index 901a57d02c..d931a20945 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidListDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidListDisplaySource.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; +import net.minecraft.network.chat.Component; import org.apache.commons.lang3.mutable.MutableInt; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; @@ -19,7 +20,6 @@ import com.simibubi.create.foundation.utility.FluidFormatter; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.IntAttached; -import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.material.Fluid; @@ -63,7 +63,7 @@ public class FluidListDisplaySource extends ValueListDisplaySource { .limit(maxRows) .map(entry -> IntAttached.with( entry.getValue(), - Components.translatable(fluidNames.get(entry.getKey()).getTranslationKey())) + Component.translatable(fluidNames.get(entry.getKey()).getTranslationKey())) ); } diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemCountDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemCountDisplaySource.java index 1f329fe5cb..69d3eea768 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemCountDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemCountDisplaySource.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEnti import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; @@ -37,7 +37,7 @@ public class ItemCountDisplaySource extends NumericSingleLineDisplaySource { collected += stack.getCount(); } - return Components.literal(String.valueOf(collected)); + return Component.literal(String.valueOf(collected)); } @Override diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NumericSingleLineDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NumericSingleLineDisplaySource.java index 38a50f09d2..06d31c6243 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NumericSingleLineDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NumericSingleLineDisplaySource.java @@ -3,14 +3,17 @@ package com.simibubi.create.content.redstone.displayLink.source; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.trains.display.FlapDisplaySection; -import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.Component; public abstract class NumericSingleLineDisplaySource extends SingleLineDisplaySource { - protected static final Component ZERO = Components.literal("0"); + protected static final Component ZERO; - @Override + static { + ZERO = Component.literal("0"); + } + + @Override protected String getFlapDisplayLayoutName(DisplayLinkContext context) { return "Number"; } diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/PercentOrProgressBarDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/PercentOrProgressBarDisplaySource.java index 871a48f89b..db73982edb 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/PercentOrProgressBarDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/PercentOrProgressBarDisplaySource.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStat import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity; import com.simibubi.create.content.trains.display.FlapDisplaySection; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraft.world.level.block.entity.SignBlockEntity; @@ -47,11 +47,11 @@ public abstract class PercentOrProgressBarDisplaySource extends NumericSingleLin for (int i = 0; i < emptySpaces; i++) s.append("\u2592"); - return Components.literal(s.toString()); + return Component.literal(s.toString()); } protected MutableComponent formatNumeric(DisplayLinkContext context, Float currentLevel) { - return Components.literal(Mth.clamp((int) (currentLevel * 100), 0, 100) + "%"); + return Component.literal(Mth.clamp((int) (currentLevel * 100), 0, 100) + "%"); } @Nullable diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/RedstonePowerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/RedstonePowerDisplaySource.java index d49e5c76b1..8777d283ce 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/RedstonePowerDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/RedstonePowerDisplaySource.java @@ -4,7 +4,7 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -20,7 +20,7 @@ public class RedstonePowerDisplaySource extends PercentOrProgressBarDisplaySourc @Override protected MutableComponent formatNumeric(DisplayLinkContext context, Float currentLevel) { - return Components.literal(String.valueOf((int) (currentLevel * 15))); + return Component.literal(String.valueOf((int) (currentLevel * 15))); } @Override diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ScoreboardDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ScoreboardDisplaySource.java index f7672b9c14..2a0251e824 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ScoreboardDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ScoreboardDisplaySource.java @@ -8,8 +8,8 @@ import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.IntAttached; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; @@ -40,8 +40,10 @@ public class ScoreboardDisplaySource extends ValueListDisplaySource { return sLevel.getScoreboard() .getPlayerScores(objective) .stream() - .map(score -> IntAttached.with(score.getScore(), Components.literal(score.getOwner()) - .copy())) + .map(score -> { + return IntAttached.with(score.getScore(), Component.literal(score.getOwner()) + .copy()); + }) .sorted(IntAttached.comparator()) .limit(maxRows); } diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/SingleLineDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/SingleLineDisplaySource.java index 614323fd80..c86655d1e9 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/SingleLineDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/SingleLineDisplaySource.java @@ -11,8 +11,8 @@ import com.simibubi.create.content.trains.display.FlapDisplaySection; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -50,8 +50,9 @@ public abstract class SingleLineDisplaySource extends DisplaySource { if (allowsLabeling(context)) { String label = context.sourceConfig() .getString("Label"); - if (!label.isEmpty()) - line = Components.literal(label + " ").append(line); + if (!label.isEmpty()) { + line = Component.literal(label + " ").append(line); + } } return ImmutableList.of(line); @@ -63,8 +64,9 @@ public abstract class SingleLineDisplaySource extends DisplaySource { if (allowsLabeling(context)) { String label = context.sourceConfig() .getString("Label"); - if (!label.isEmpty()) - return ImmutableList.of(ImmutableList.of(Components.literal(label + " "), provideLine(context, stats))); + if (!label.isEmpty()) { + return ImmutableList.of(ImmutableList.of(Component.literal(label + " "), provideLine(context, stats))); + } } return super.provideFlapDisplayText(context, stats); diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StationSummaryDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StationSummaryDisplaySource.java index c52779b783..cd2ed97a3b 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StationSummaryDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StationSummaryDisplaySource.java @@ -18,9 +18,9 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraftforge.api.distmarker.Dist; @@ -28,14 +28,25 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class StationSummaryDisplaySource extends DisplaySource { - protected static final MutableComponent UNPREDICTABLE = Components.literal(" ~ "); + protected static final MutableComponent UNPREDICTABLE; - protected static final List EMPTY_ENTRY_4 = - ImmutableList.of(WHITESPACE, Components.literal(" . "), WHITESPACE, WHITESPACE); - protected static final List EMPTY_ENTRY_5 = - ImmutableList.of(WHITESPACE, Components.literal(" . "), WHITESPACE, WHITESPACE, WHITESPACE); + static { + UNPREDICTABLE = Component.literal(" ~ "); + } - @Override + protected static final List EMPTY_ENTRY_4; + + static { + EMPTY_ENTRY_4 = ImmutableList.of(WHITESPACE, Component.literal(" . "), WHITESPACE, WHITESPACE); + } + + protected static final List EMPTY_ENTRY_5; + + static { + EMPTY_ENTRY_5 = ImmutableList.of(WHITESPACE, Component.literal(" . "), WHITESPACE, WHITESPACE, WHITESPACE); + } + + @Override public List provideText(DisplayLinkContext context, DisplayTargetStats stats) { return EMPTY; } @@ -67,7 +78,7 @@ public class StationSummaryDisplaySource extends DisplaySource { min++; sec = 0; } - lines.add(min > 0 ? Components.literal(String.valueOf(min)) : WHITESPACE); + lines.add(min > 0 ? Component.literal(String.valueOf(min)) : WHITESPACE); lines.add(min > 0 ? CreateLang.translateDirect("display_source.station_summary.minutes") : CreateLang.translateDirect("display_source.station_summary.seconds", sec)); } @@ -86,7 +97,7 @@ public class StationSummaryDisplaySource extends DisplaySource { platform = platform.replace(string, ""); platform = platform.replace("*", "?"); - lines.add(Components.literal(platform.trim())); + lines.add(Component.literal(platform.trim())); list.add(lines); }); diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StopWatchDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StopWatchDisplaySource.java index b9ee3c9b24..b67254c192 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StopWatchDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StopWatchDisplaySource.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; import com.simibubi.create.content.trains.display.FlapDisplaySection; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; public class StopWatchDisplaySource extends SingleLineDisplaySource { @@ -32,7 +32,7 @@ public class StopWatchDisplaySource extends SingleLineDisplaySource { int minutes = (diff / 60 / 20) % 60; int seconds = (diff / 20) % 60; - MutableComponent component = Components.literal((hours == 0 ? "" : (hours < 10 ? " " : "") + hours + ":") + MutableComponent component = Component.literal((hours == 0 ? "" : (hours < 10 ? " " : "") + hours + ":") + (minutes < 10 ? hours == 0 ? " " : "0" : "") + minutes + ":" + (seconds < 10 ? "0" : "") + seconds); return component; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TimeOfDayDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TimeOfDayDisplaySource.java index 749c84acf6..7cda01ff71 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TimeOfDayDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TimeOfDayDisplaySource.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.trains.display.FlapDisplaySection; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.level.ServerLevel; import net.minecraftforge.api.distmarker.Dist; @@ -15,9 +15,13 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class TimeOfDayDisplaySource extends SingleLineDisplaySource { - public static final MutableComponent EMPTY_TIME = Components.literal("--:--"); + public static final MutableComponent EMPTY_TIME; - @Override + static { + EMPTY_TIME = Component.literal("--:--"); + } + + @Override protected MutableComponent provideLine(DisplayLinkContext context, DisplayTargetStats stats) { if (!(context.level()instanceof ServerLevel sLevel)) return EMPTY_TIME; @@ -48,7 +52,7 @@ public class TimeOfDayDisplaySource extends SingleLineDisplaySource { minutes = sLevel.random.nextInt(40) + 60; } - MutableComponent component = Components.literal( + MutableComponent component = Component.literal( (hours < 10 ? " " : "") + hours + ":" + (minutes < 10 ? "0" : "") + minutes + (c12 ? " " : "")); return c12 ? component.append(suffix) : component; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ValueListDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ValueListDisplaySource.java index 1c36ac4c69..e22dcbd292 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ValueListDisplaySource.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ValueListDisplaySource.java @@ -7,6 +7,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; +import net.minecraft.network.chat.Component; import org.apache.commons.lang3.mutable.MutableInt; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; @@ -19,7 +20,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.IntAttached; -import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.entity.LecternBlockEntity; import net.minecraftforge.api.distmarker.Dist; @@ -63,7 +63,7 @@ public abstract class ValueListDisplaySource extends DisplaySource { current = atIndex; continue; } - current.append(Components.literal("\n")) + current.append(Component.literal("\n")) .append(atIndex); if ((i + 1) % ENTRIES_PER_PAGE == 0) { condensed.add(current); @@ -99,7 +99,7 @@ public abstract class ValueListDisplaySource extends DisplaySource { : Arrays.asList(name, shortened.getFirst(), shortened.getSecond()); } - MutableComponent formattedNumber = Components.literal(String.valueOf(number)).append(WHITESPACE); + MutableComponent formattedNumber = Component.literal(String.valueOf(number)).append(WHITESPACE); return valueFirst() ? Arrays.asList(formattedNumber, name) : Arrays.asList(name, formattedNumber); } @@ -136,15 +136,17 @@ public abstract class ValueListDisplaySource extends DisplaySource { } private Couple shorten(int number) { - if (number >= 1000000) - return Couple.create(Components.literal(String.valueOf(number / 1000000)), - CreateLang.translateDirect("display_source.value_list.million") - .append(WHITESPACE)); - if (number >= 1000) - return Couple.create(Components.literal(String.valueOf(number / 1000)), - CreateLang.translateDirect("display_source.value_list.thousand") - .append(WHITESPACE)); - return Couple.create(Components.literal(String.valueOf(number)), WHITESPACE); + if (number >= 1000000) { + return Couple.create(Component.literal(String.valueOf(number / 1000000)), + CreateLang.translateDirect("display_source.value_list.million") + .append(WHITESPACE)); + } + if (number >= 1000) { + return Couple.create(Component.literal(String.valueOf(number / 1000)), + CreateLang.translateDirect("display_source.value_list.thousand") + .append(WHITESPACE)); + } + return Couple.create(Component.literal(String.valueOf(number)), WHITESPACE); } protected boolean shortenNumbers(DisplayLinkContext context) { diff --git a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java index 46e0e975f9..2dc270f35f 100644 --- a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java +++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java @@ -6,6 +6,8 @@ import java.util.HashSet; import java.util.List; import java.util.Vector; +import net.createmod.catnip.lang.Lang; + import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants; @@ -21,7 +23,6 @@ import com.simibubi.create.foundation.utility.ControlsUtil; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.lang.FontHelper.Palette; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.KeyMapping; @@ -224,7 +225,7 @@ public class LinkedControllerClientHandler { PoseStack poseStack = graphics.pose(); poseStack.pushPose(); - Screen tooltipScreen = new Screen(Components.immutableEmpty()) { + Screen tooltipScreen = new Screen(Lang.IMMUTABLE_EMPTY) { }; tooltipScreen.init(mc, width1, height1); diff --git a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java index d8ea7c1e17..cb8c888cd5 100644 --- a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java @@ -12,10 +12,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.utility.DynamicComponent; import net.createmod.catnip.data.Couple; -import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -82,7 +82,7 @@ public class NixieTubeBlockEntity extends SmartBlockEntity { public MutableComponent getFullText() { return customText.map(DynamicComponent::get) - .orElse(Components.literal("" + redstoneStrength)); + .orElse(Component.literal("" + redstoneStrength)); } public void updateRedstoneStrength(int signalStrength) { diff --git a/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchScreen.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchScreen.java index 4ba2784f8f..3dbe1f919c 100644 --- a/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchScreen.java +++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchScreen.java @@ -21,11 +21,11 @@ import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.gui.widget.AbstractSimiWidget; import net.createmod.catnip.data.Iterate; -import net.createmod.catnip.lang.Components; import net.createmod.ponder.foundation.ui.PonderTagScreen; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -160,17 +160,17 @@ public class ThresholdSwitchScreen extends AbstractSimiScreen { } - graphics.drawString(font, - Components.literal("\u2265 " + (typeOfCurrentTarget == ThresholdType.UNSUPPORTED ? "" - : forItems ? onAbove.getState() / valueStep - : blockEntity.format(onAbove.getState() / valueStep, stacks) - .getString())), + graphics.drawString(font, + Component.literal("\u2265 " + (typeOfCurrentTarget == ThresholdType.UNSUPPORTED ? "" + : forItems ? onAbove.getState() / valueStep + : blockEntity.format(onAbove.getState() / valueStep, stacks) + .getString())), x + 53, y + 28, 0xFFFFFFFF, true); - graphics.drawString(font, - Components.literal("\u2264 " + (typeOfCurrentTarget == ThresholdType.UNSUPPORTED ? "" - : forItems ? offBelow.getState() / valueStep - : blockEntity.format(offBelow.getState() / valueStep, stacks) - .getString())), + graphics.drawString(font, + Component.literal("\u2264 " + (typeOfCurrentTarget == ThresholdType.UNSUPPORTED ? "" + : forItems ? offBelow.getState() / valueStep + : blockEntity.format(offBelow.getState() / valueStep, stacks) + .getString())), x + 53, y + 28 + 24, 0xFFFFFFFF, true); GuiGameElement.of(renderedItem). tooltip, TooltipFlag flagIn) { if (stack.hasTag()) { if (stack.getTag() - .contains("File")) - tooltip.add(Components.literal(ChatFormatting.GOLD + stack.getTag() - .getString("File"))); + .contains("File")) { + tooltip.add(Component.literal(ChatFormatting.GOLD + stack.getTag() + .getString("File"))); + } } else { tooltip.add(CreateLang.translateDirect("schematic.invalid").withStyle(ChatFormatting.RED)); } diff --git a/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java b/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java index 1d5241a398..80459e1e6c 100644 --- a/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java +++ b/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java @@ -24,9 +24,10 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CSchematics; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.level.Level; @@ -163,10 +164,10 @@ public class ServerSchematicLoader { protected boolean validateSchematicSizeOnServer(ServerPlayer player, long size) { Integer maxFileSize = getConfig().maxTotalSchematicSize.get(); if (size > maxFileSize * 1000) { - player.sendSystemMessage(CreateLang.translateDirect("schematics.uploadTooLarge") - .append(Components.literal(" (" + size / 1000 + " KB)."))); - player.sendSystemMessage(CreateLang.translateDirect("schematics.maxAllowedSize") - .append(Components.literal(" " + maxFileSize + " KB"))); + player.sendSystemMessage(CreateLang.translateDirect("schematics.uploadTooLarge") + .append(Component.literal(" (" + size / 1000 + " KB)."))); + player.sendSystemMessage(CreateLang.translateDirect("schematics.maxAllowedSize") + .append(Component.literal(" " + maxFileSize + " KB"))); return false; } return true; diff --git a/src/main/java/com/simibubi/create/content/schematics/cannon/MaterialChecklist.java b/src/main/java/com/simibubi/create/content/schematics/cannon/MaterialChecklist.java index 43259ee3ae..24f0edf739 100644 --- a/src/main/java/com/simibubi/create/content/schematics/cannon/MaterialChecklist.java +++ b/src/main/java/com/simibubi/create/content/schematics/cannon/MaterialChecklist.java @@ -16,7 +16,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -86,7 +85,7 @@ public class MaterialChecklist { MutableComponent textComponent; if (blocksNotLoaded) { - textComponent = Components.literal("\n" + ChatFormatting.RED); + textComponent = Component.literal("\n" + ChatFormatting.RED); textComponent = textComponent.append(CreateLang.translateDirect("materialChecklist.blocksNotLoaded")); pages.add(StringTag.valueOf(Component.Serializer.toJson(textComponent))); } @@ -103,7 +102,7 @@ public class MaterialChecklist { return name1.compareTo(name2); }); - textComponent = Components.empty(); + textComponent = Component.empty(); List completed = new ArrayList<>(); for (Item item : keys) { int amount = getRequiredAmount(item); @@ -117,10 +116,10 @@ public class MaterialChecklist { if (itemsWritten == MAX_ENTRIES_PER_PAGE) { itemsWritten = 0; - textComponent.append(Components.literal("\n >>>") + textComponent.append(Component.literal("\n >>>") .withStyle(ChatFormatting.BLUE)); pages.add(StringTag.valueOf(Component.Serializer.toJson(textComponent))); - textComponent = Components.empty(); + textComponent = Component.empty(); } itemsWritten++; @@ -130,10 +129,10 @@ public class MaterialChecklist { for (Item item : completed) { if (itemsWritten == MAX_ENTRIES_PER_PAGE) { itemsWritten = 0; - textComponent.append(Components.literal("\n >>>") + textComponent.append(Component.literal("\n >>>") .withStyle(ChatFormatting.DARK_GREEN)); pages.add(StringTag.valueOf(Component.Serializer.toJson(textComponent))); - textComponent = Components.empty(); + textComponent = Component.empty(); } itemsWritten++; @@ -194,7 +193,7 @@ public class MaterialChecklist { if (itemsWritten == MAX_ENTRIES_PER_CLIPBOARD_PAGE) { itemsWritten = 0; - currentPage.add(new ClipboardEntry(false, Components.literal(">>>") + currentPage.add(new ClipboardEntry(false, Component.literal(">>>") .withStyle(ChatFormatting.DARK_GRAY))); pages.add(currentPage); currentPage = new ArrayList<>(); @@ -208,7 +207,7 @@ public class MaterialChecklist { for (Item item : completed) { if (itemsWritten == MAX_ENTRIES_PER_CLIPBOARD_PAGE) { itemsWritten = 0; - currentPage.add(new ClipboardEntry(true, Components.literal(">>>") + currentPage.add(new ClipboardEntry(true, Component.literal(">>>") .withStyle(ChatFormatting.DARK_GREEN))); pages.add(currentPage); currentPage = new ArrayList<>(); @@ -240,8 +239,8 @@ public class MaterialChecklist { private MutableComponent entry(ItemStack item, int amount, boolean unfinished, boolean forBook) { int stacks = amount / 64; int remainder = amount % 64; - MutableComponent tc = Components.empty(); - tc.append(Components.translatable(item.getDescriptionId()) + MutableComponent tc = Component.empty(); + tc.append(Component.translatable(item.getDescriptionId()) .setStyle(Style.EMPTY .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_ITEM, new HoverEvent.ItemStackInfo(item))))); @@ -249,9 +248,9 @@ public class MaterialChecklist { tc.append(" \u2714"); if (!unfinished || forBook) tc.withStyle(unfinished ? ChatFormatting.BLUE : ChatFormatting.DARK_GREEN); - return tc.append(Components.literal("\n" + " x" + amount) + return tc.append(Component.literal("\n" + " x" + amount) .withStyle(ChatFormatting.BLACK)) - .append(Components.literal(" | " + stacks + "\u25A4 +" + remainder + (forBook ? "\n" : "")) + .append(Component.literal(" | " + stacks + "\u25A4 +" + remainder + (forBook ? "\n" : "")) .withStyle(ChatFormatting.GRAY)); } diff --git a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonScreen.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonScreen.java index 9cdb734fb4..55b46b19ca 100644 --- a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonScreen.java @@ -24,12 +24,13 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.lang.FontHelper.Palette; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.renderer.Rect2i; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; @@ -95,17 +96,17 @@ public class SchematicannonScreen extends AbstractSimiContainerScreen { sendOptionUpdate(Option.PLAY, true); }); - playIndicator = new Indicator(x + 75, y + 79, Components.immutableEmpty()); + playIndicator = new Indicator(x + 75, y + 79, Lang.IMMUTABLE_EMPTY); pauseButton = new IconButton(x + 93, y + 85, AllIcons.I_PAUSE); pauseButton.withCallback(() -> { sendOptionUpdate(Option.PAUSE, true); }); - pauseIndicator = new Indicator(x + 93, y + 79, Components.immutableEmpty()); + pauseIndicator = new Indicator(x + 93, y + 79, Lang.IMMUTABLE_EMPTY); resetButton = new IconButton(x + 111, y + 85, AllIcons.I_STOP); resetButton.withCallback(() -> { sendOptionUpdate(Option.STOP, true); }); - resetIndicator = new Indicator(x + 111, y + 79, Components.immutableEmpty()); + resetIndicator = new Indicator(x + 111, y + 79, Lang.IMMUTABLE_EMPTY); resetIndicator.state = State.RED; addRenderableWidgets(playButton, playIndicator, pauseButton, pauseIndicator, resetButton, resetIndicator); @@ -122,7 +123,7 @@ public class SchematicannonScreen extends AbstractSimiContainerScreen { @@ -170,7 +171,7 @@ public class SchematicannonScreen extends AbstractSimiContainerScreen tools, Consumer callback) { - super(Components.literal("Tool Selection")); + super(Component.literal("Tool Selection")); this.minecraft = Minecraft.getInstance(); this.tools = tools; this.callback = callback; diff --git a/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableScreen.java b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableScreen.java index d64edd9d01..13acb4e08c 100644 --- a/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableScreen.java @@ -21,11 +21,12 @@ import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.Util; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.Rect2i; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; @@ -73,8 +74,8 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen s.withColor(0x704630))), false); + sendPrompt(player, CreateLang.translateDirect("train.arrived_at", + Component.literal(currentStation.name).withStyle(s -> s.withColor(0x704630))), false); return true; } @@ -603,8 +603,8 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { if (currentStation != null && targetSpeed != 0) { stationMessage = false; - sendPrompt(player, CreateLang.translateDirect("train.departing_from", - Components.literal(currentStation.name).withStyle(s -> s.withColor(0x704630))), false); + sendPrompt(player, CreateLang.translateDirect("train.departing_from", + Component.literal(currentStation.name).withStyle(s -> s.withColor(0x704630))), false); } if (currentStation == null) { @@ -617,8 +617,8 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { double f = (nav.distanceToDestination / navDistanceTotal); int progress = (int) (Mth.clamp(1 - ((1 - f) * (1 - f)), 0, 1) * 30); boolean arrived = progress == 0; - MutableComponent whiteComponent = Components.literal(Strings.repeat("|", progress)); - MutableComponent greenComponent = Components.literal(Strings.repeat("|", 30 - progress)); + MutableComponent whiteComponent = Component.literal(Strings.repeat("|", progress)); + MutableComponent greenComponent = Component.literal(Strings.repeat("|", 30 - progress)); int fromColor = 0x00_FFC244; int toColor = 0x00_529915; @@ -684,14 +684,14 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { private void displayApproachStationMessage(Player player, GlobalStation station) { sendPrompt(player, CreateLang.translateDirect("contraption.controls.approach_station", - Components.keybind("key.jump"), station.name), false); + Component.keybind("key.jump"), station.name), false); stationMessage = true; } private void cleanUpApproachStationMessage(Player player) { if (!stationMessage) return; - player.displayClientMessage(Components.immutableEmpty(), true); + player.displayClientMessage(Lang.IMMUTABLE_EMPTY, true); stationMessage = false; } diff --git a/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java index 92e7d2335a..e0ff8995a6 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java @@ -8,7 +8,6 @@ import java.util.stream.Stream; import com.google.common.collect.Streams; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -114,20 +113,22 @@ public class TrainStatus { public void crash() { Component component = - Components.literal(" - ").withStyle(ChatFormatting.GRAY) + Component.literal(" - ").withStyle(ChatFormatting.GRAY) .append( CreateLang.translateDirect("train.status.collision").withStyle(st -> st.withColor(0xFFD3B4)) ); List> presentDimensions = train.getPresentDimensions(); Stream locationComponents = presentDimensions.stream().map(key -> - Components.literal(" - ").withStyle(ChatFormatting.GRAY) - .append( - CreateLang.translateDirect( - "train.status.collision.where", - key.location(), - train.getPositionInDimension(key).get().toShortString() - ).withStyle(style -> style.withColor(0xFFD3B4)) - ) + { + return Component.literal(" - ").withStyle(ChatFormatting.GRAY) + .append( + CreateLang.translateDirect( + "train.status.collision.where", + key.location(), + train.getPositionInDimension(key).get().toShortString() + ).withStyle(style -> style.withColor(0xFFD3B4)) + ); + } ); addMessage(new StatusMessage(Streams.concat(Stream.of(component), locationComponents).toArray(Component[]::new))); @@ -159,7 +160,7 @@ public class TrainStatus { } public void displayInformation(String key, boolean itsAGoodThing, Object... args) { - MutableComponent component = Components.literal(" - ").withStyle(ChatFormatting.GRAY) + MutableComponent component = Component.literal(" - ").withStyle(ChatFormatting.GRAY) .append(CreateLang.translateDirect("train.status." + key, args) .withStyle(st -> st.withColor(itsAGoodThing ? 0xD5ECC2 : 0xFFD3B4))); addMessage(new StatusMessage(component)); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java b/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java index 779a5cc133..9345f2ad85 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java @@ -8,7 +8,6 @@ import com.google.common.collect.ImmutableList; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -33,8 +32,8 @@ public interface IScheduleInput { public default List getTitleAs(String type) { ResourceLocation id = getId(); - return ImmutableList - .of(Components.translatable(id.getNamespace() + ".schedule." + type + "." + id.getPath())); + return ImmutableList + .of(Component.translatable(id.getNamespace() + ".schedule." + type + "." + id.getPath())); } public default ItemStack getSecondLineIcon() { diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java b/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java index d8e88e86ce..e859d94197 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java @@ -24,7 +24,6 @@ import com.simibubi.create.content.trains.schedule.destination.ScheduleInstructi import net.createmod.catnip.nbt.NBTHelper; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; @@ -68,7 +67,7 @@ public class Schedule { return list.stream() .map(Pair::getFirst) .map(rl -> rl.getNamespace() + ".schedule." + langSection + rl.getPath()) - .map(Components::translatable) + .map(key -> Component.translatable(key)) .toList(); } diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java index e7b509458b..4c7281342f 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java @@ -13,7 +13,6 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Couple; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -131,8 +130,8 @@ public class ScheduleItem extends Item implements MenuProvider { if (schedule == null || schedule.entries.isEmpty()) return; - MutableComponent caret = Components.literal("> ").withStyle(ChatFormatting.GRAY); - MutableComponent arrow = Components.literal("-> ").withStyle(ChatFormatting.GRAY); + MutableComponent caret = Component.literal("> ").withStyle(ChatFormatting.GRAY); + MutableComponent arrow = Component.literal("-> ").withStyle(ChatFormatting.GRAY); List entries = schedule.entries; for (int i = 0; i < entries.size(); i++) { @@ -142,8 +141,8 @@ public class ScheduleItem extends Item implements MenuProvider { continue; ChatFormatting format = current ? ChatFormatting.YELLOW : ChatFormatting.GOLD; MutableComponent prefix = current ? arrow : caret; - tooltip.add(prefix.copy() - .append(Components.literal(destination.getFilter()).withStyle(format))); + tooltip.add(prefix.copy() + .append(Component.literal(destination.getFilter()).withStyle(format))); } } diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java index aad5dcf717..7e3155118d 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java @@ -18,9 +18,9 @@ import com.simibubi.create.content.trains.schedule.destination.ScheduleInstructi import com.simibubi.create.content.trains.station.GlobalStation; import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; @@ -344,8 +344,9 @@ public class ScheduleRuntime { int size = schedule.entries.size(); if (index >= size) { - if (!schedule.cyclic) - return new TrainDeparturePrediction(train, time, Components.literal(" "), destination); + if (!schedule.cyclic) { + return new TrainDeparturePrediction(train, time, Component.literal(" "), destination); + } index %= size; } @@ -363,7 +364,7 @@ public class ScheduleRuntime { } } - return new TrainDeparturePrediction(train, time, Components.literal(text), destination); + return new TrainDeparturePrediction(train, time, Component.literal(text), destination); } public CompoundTag write() { @@ -422,12 +423,12 @@ public class ScheduleRuntime { public MutableComponent getWaitingStatus(Level level) { List> conditions = schedule.entries.get(currentEntry).conditions; if (conditions.isEmpty() || conditionProgress.isEmpty() || conditionContext.isEmpty()) - return Components.empty(); + return Component.empty(); List list = conditions.get(0); int progress = conditionProgress.get(0); if (progress >= list.size()) - return Components.empty(); + return Component.empty(); CompoundTag tag = conditionContext.get(0); ScheduleWaitCondition condition = list.get(progress); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java index 570b80f9e6..cb3b8360a5 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java @@ -45,7 +45,7 @@ import net.createmod.catnip.data.IntAttached; import net.createmod.catnip.data.Pair; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; @@ -114,9 +114,9 @@ public class ScheduleScreen extends AbstractSimiContainerScreen im confirmButton.withCallback(() -> minecraft.player.closeContainer()); addRenderableWidget(confirmButton); - cyclicIndicator = new Indicator(leftPos + 21, topPos + 196, Components.immutableEmpty()); + cyclicIndicator = new Indicator(leftPos + 21, topPos + 196, Lang.IMMUTABLE_EMPTY); cyclicIndicator.state = schedule.cyclic ? State.ON : State.OFF; - + List tip = new ArrayList<>(); tip.add(CreateLang.translateDirect("schedule.loop")); tip.add(CreateLang.translateDirect("gui.schematicannon.optionDisabled") @@ -125,7 +125,7 @@ public class ScheduleScreen extends AbstractSimiContainerScreen im .withStyle(ChatFormatting.GRAY)); tip.add(CreateLang.translateDirect("schedule.loop2") .withStyle(ChatFormatting.GRAY)); - + List tipEnabled = new ArrayList<>(tip); tipEnabled.set(1, CreateLang.translateDirect("gui.schematicannon.optionEnabled") .withStyle(ChatFormatting.DARK_GREEN)); @@ -179,7 +179,7 @@ public class ScheduleScreen extends AbstractSimiContainerScreen im resetProgress.visible = false; scrollInput = new SelectionScrollInput(leftPos + 56, topPos + 65, 143, 16); - scrollInputLabel = new Label(leftPos + 59, topPos + 69, Components.immutableEmpty()).withShadow(); + scrollInputLabel = new Label(leftPos + 59, topPos + 69, Lang.IMMUTABLE_EMPTY).withShadow(); editorConfirm = new IconButton(leftPos + 56 + 168, topPos + 65 + 22, AllIcons.I_CONFIRM); if (allowDeletion) editorDelete = new IconButton(leftPos + 56 - 45, topPos + 65 + 22, AllIcons.I_TRASH); @@ -653,7 +653,7 @@ public class ScheduleScreen extends AbstractSimiContainerScreen im if (editingCondition != null || editingDestination != null) return false; - Component empty = Components.immutableEmpty(); + Component empty = Lang.IMMUTABLE_EMPTY; int mx = (int) mouseX; int my = (int) mouseY; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java index 13d0162324..f655066b8a 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java @@ -10,7 +10,6 @@ import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; @@ -82,7 +81,7 @@ public abstract class CargoThresholdCondition extends LazyTickedScheduleConditio @Override public Pair getSummary() { - return Pair.of(getIcon(), Components.literal(getOperator().formatted + " " + getThreshold()).append(getUnit())); + return Pair.of(getIcon(), Component.literal(getOperator().formatted + " " + getThreshold()).append(getUnit())); } @Override @@ -122,7 +121,9 @@ public abstract class CargoThresholdCondition extends LazyTickedScheduleConditio builder.addSelectionScrollInput(0, 24, (i, l) -> { i.forOptions(Ops.translatedOptions()) .titled(CreateLang.translateDirect("schedule.condition.threshold.train_holds", "")) - .format(state -> Components.literal(" " + Ops.values()[state].formatted)); + .format(state -> { + return Component.literal(" " + Ops.values()[state].formatted); + }); }, "Operator"); builder.addIntegerTextInput(29, 41, (e, t) -> { }, "Threshold"); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java index 6b9d5740be..327568c520 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java @@ -10,7 +10,6 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -31,7 +30,7 @@ public class FluidThresholdCondition extends CargoThresholdCondition { @Override protected Component getUnit() { - return Components.literal("b"); + return Component.literal("b"); } @Override @@ -125,7 +124,7 @@ public class FluidThresholdCondition extends CargoThresholdCondition { public MutableComponent getWaitingStatus(Level level, Train train, CompoundTag tag) { int lastDisplaySnapshot = getLastDisplaySnapshot(tag); if (lastDisplaySnapshot == -1) - return Components.empty(); + return Component.empty(); int offset = getOperator() == Ops.LESS ? -1 : getOperator() == Ops.GREATER ? 1 : 0; return CreateLang.translateDirect("schedule.condition.threshold.status", lastDisplaySnapshot, Math.max(0, getThreshold() + offset), CreateLang.translateDirect("schedule.condition.threshold.buckets")); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java index 4927f4e18f..b03c29daf0 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java @@ -10,7 +10,6 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; @@ -29,7 +28,7 @@ public class ItemThresholdCondition extends CargoThresholdCondition { @Override protected Component getUnit() { - return Components.literal(inStacks() ? "\u25A4" : ""); + return Component.literal(inStacks() ? "\u25A4" : ""); } @Override @@ -128,7 +127,7 @@ public class ItemThresholdCondition extends CargoThresholdCondition { public MutableComponent getWaitingStatus(Level level, Train train, CompoundTag tag) { int lastDisplaySnapshot = getLastDisplaySnapshot(tag); if (lastDisplaySnapshot == -1) - return Components.empty(); + return Component.empty(); int offset = getOperator() == Ops.LESS ? -1 : getOperator() == Ops.GREATER ? 1 : 0; return CreateLang.translateDirect("schedule.condition.threshold.status", lastDisplaySnapshot, Math.max(0, getThreshold() + offset), diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java index d76c2ee4f6..732ce93caa 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java @@ -10,7 +10,6 @@ import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -50,7 +49,7 @@ public class PlayerPassengerCondition extends ScheduleWaitCondition { int target = getTarget(); return ImmutableList.of(CreateLang.translateDirect("schedule.condition.player_count.seated", CreateLang.translateDirect("schedule.condition.player_count." + (target == 1 ? "summary" : "summary_plural"), - Components.literal("" + target).withStyle(ChatFormatting.DARK_AQUA)))); + Component.literal("" + target).withStyle(ChatFormatting.DARK_AQUA)))); } @Override diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java index 0a9dba3daf..f4d48fbad4 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java @@ -12,7 +12,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -54,13 +53,13 @@ public class RedstoneLinkCondition extends ScheduleWaitCondition { public List getTitleAs(String type) { return ImmutableList.of( CreateLang.translateDirect("schedule.condition.redstone_link.frequency_" + (lowActivation() ? "unpowered" : "powered")), - Components.literal(" #1 ").withStyle(ChatFormatting.GRAY) + Component.literal(" #1 ").withStyle(ChatFormatting.GRAY) .append(freq.getFirst() .getStack() .getHoverName() .copy() .withStyle(ChatFormatting.DARK_AQUA)), - Components.literal(" #2 ").withStyle(ChatFormatting.GRAY) + Component.literal(" #2 ").withStyle(ChatFormatting.GRAY) .append(freq.getSecond() .getStack() .getHoverName() diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java index 51bb5efd78..4c83a91f53 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java @@ -13,7 +13,6 @@ import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.nbt.CompoundTag; @@ -80,7 +79,7 @@ public class TimeOfDayCondition extends ScheduleWaitCondition { public List getTitleAs(String type) { return ImmutableList.of(CreateLang.translateDirect("schedule.condition.time_of_day.scheduled"), getDigitalDisplay(intData("Hour"), intData("Minute"), false).withStyle(ChatFormatting.DARK_AQUA) - .append(Components.literal(" -> ").withStyle(ChatFormatting.DARK_GRAY)) + .append(Component.literal(" -> ").withStyle(ChatFormatting.DARK_GRAY)) .append(CreateLang .translatedOptions("schedule.condition.time_of_day.rotation", "every_24", "every_12", "every_6", "every_4", "every_3", "every_2", "every_1", "every_0_45", "every_0_30", "every_0_15") diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java index bcef265980..15e6efec0b 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java @@ -7,7 +7,6 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -58,15 +57,16 @@ public abstract class TimedWaitCondition extends ScheduleWaitCondition { } protected Component formatTime(boolean compact) { - if (compact) - return Components.literal(getValue() + getUnit().suffix); - return Components.literal(getValue() + " ").append(CreateLang.translateDirect(getUnit().key)); + if (compact) { + return Component.literal(getValue() + getUnit().suffix); + } + return Component.literal(getValue() + " ").append(CreateLang.translateDirect(getUnit().key)); } @Override public List getTitleAs(String type) { return ImmutableList.of( - Components.translatable(getId().getNamespace() + ".schedule." + type + "." + getId().getPath()), + Component.translatable(getId().getNamespace() + ".schedule." + type + "." + getId().getPath()), CreateLang.translateDirect("schedule.condition.for_x_time", formatTime(false)) .withStyle(ChatFormatting.DARK_AQUA)); } @@ -115,8 +115,8 @@ public abstract class TimedWaitCondition extends ScheduleWaitCondition { (int) (showInMinutes ? Math.floor(ticksUntilDeparture / (20 * 60f)) : Math.ceil(ticksUntilDeparture / 100f) * 5); String key = "generic." + (showInMinutes ? num == 1 ? "daytime.minute" : "unit.minutes" : num == 1 ? "daytime.second" : "unit.seconds"); - return CreateLang.translateDirect("schedule.condition." + getId().getPath() + ".status", - Components.literal(num + " ").append(CreateLang.translateDirect(key))); + return CreateLang.translateDirect("schedule.condition." + getId().getPath() + ".status", + Component.literal(num + " ").append(CreateLang.translateDirect(key))); } } diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java index 1fa5c539b8..8e8bc1185a 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java @@ -14,7 +14,6 @@ import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -36,7 +35,7 @@ public class ChangeThrottleInstruction extends ScheduleInstruction { } private MutableComponent formatted() { - return Components.literal(intData("Value") + "%"); + return Component.literal(intData("Value") + "%"); } @Override diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java index 4ffe525f75..369db3419e 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java @@ -12,7 +12,6 @@ import com.simibubi.create.content.trains.schedule.ScheduleRuntime.State; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -23,7 +22,7 @@ public class ChangeTitleInstruction extends TextScheduleInstruction { @Override public Pair getSummary() { - return Pair.of(icon(), Components.literal(getLabelText())); + return Pair.of(icon(), Component.literal(getLabelText())); } @Override diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java index c28beaf7e5..94a2722a00 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java @@ -21,7 +21,6 @@ import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; @@ -34,7 +33,7 @@ public class DestinationInstruction extends TextScheduleInstruction { @Override public Pair getSummary() { - return Pair.of(AllBlocks.TRACK_STATION.asStack(), Components.literal(getLabelText())); + return Pair.of(AllBlocks.TRACK_STATION.asStack(), Component.literal(getLabelText())); } @Override diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java index 478b409fc2..d982699924 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java @@ -26,7 +26,6 @@ import com.simibubi.create.content.trains.station.GlobalStation.GlobalPackagePor import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.core.BlockPos; @@ -50,7 +49,7 @@ public class FetchPackagesInstruction extends TextScheduleInstruction { public List getTitleAs(String type) { return ImmutableList.of(CreateLang.translate("schedule.instruction.package_retrieval.summary") .style(ChatFormatting.GOLD) - .component(), CreateLang.translateDirect("generic.in_quotes", Components.literal(getLabelText())), + .component(), CreateLang.translateDirect("generic.in_quotes", Component.literal(getLabelText())), CreateLang.translateDirect("schedule.instruction.package_retrieval.summary_1") .withStyle(ChatFormatting.GRAY), CreateLang.translateDirect("schedule.instruction.package_retrieval.summary_2") diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java index 8fc78f4e08..eda4b90b11 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java @@ -6,7 +6,6 @@ import com.google.common.collect.ImmutableList; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; @@ -22,7 +21,7 @@ public abstract class TextScheduleInstruction extends ScheduleInstruction { @Override public List getTitleAs(String type) { return ImmutableList.of(CreateLang.translateDirect("schedule." + type + "." + getId().getPath() + ".summary") - .withStyle(ChatFormatting.GOLD), CreateLang.translateDirect("generic.in_quotes", Components.literal(getLabelText()))); + .withStyle(ChatFormatting.GOLD), CreateLang.translateDirect("generic.in_quotes", Component.literal(getLabelText()))); } @Override diff --git a/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java b/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java index 3293e4b9f5..238f567689 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java +++ b/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java @@ -17,8 +17,8 @@ import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.state.properties.BlockStateProperties; public abstract class AbstractStationScreen extends AbstractSimiScreen { @@ -43,8 +43,9 @@ public abstract class AbstractStationScreen extends AbstractSimiScreen { @Override protected void init() { if (blockEntity.computerBehaviour.hasAttachedComputer()) - minecraft.setScreen(new ComputerScreen(title, () -> Components.literal(station.name), - this::renderAdditional, this, blockEntity.computerBehaviour::hasAttachedComputer)); + minecraft.setScreen(new ComputerScreen(title, () -> + Component.literal(station.name), + this::renderAdditional, this, blockEntity.computerBehaviour::hasAttachedComputer)); setWindowSize(background.getWidth(), background.getHeight()); super.init(); @@ -83,8 +84,9 @@ public abstract class AbstractStationScreen extends AbstractSimiScreen { super.tick(); if (blockEntity.computerBehaviour.hasAttachedComputer()) - minecraft.setScreen(new ComputerScreen(title, () -> Components.literal(station.name), - this::renderAdditional, this, blockEntity.computerBehaviour::hasAttachedComputer)); + minecraft.setScreen(new ComputerScreen(title, () -> + Component.literal(station.name), + this::renderAdditional, this, blockEntity.computerBehaviour::hasAttachedComputer)); } @Override diff --git a/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java b/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java index 465e80a94d..a15b83363a 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java +++ b/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.trains.station; import java.util.Objects; import java.util.Optional; +import net.createmod.catnip.lang.Lang; + import org.joml.Matrix4f; import com.mojang.blaze3d.vertex.PoseStack; @@ -13,7 +15,6 @@ import com.simibubi.create.content.trains.track.TrackTargetingBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.map.CustomRenderedMapDecoration; -import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.MultiBufferSource; @@ -47,7 +48,7 @@ public class StationMarker { BlockPos source = NbtUtils.readBlockPos(tag.getCompound("source")); BlockPos target = NbtUtils.readBlockPos(tag.getCompound("target")); Component name = Component.Serializer.fromJson(tag.getString("name")); - if (name == null) name = Components.immutableEmpty(); + if (name == null) name = Lang.IMMUTABLE_EMPTY; return new StationMarker(source, target, name); } @@ -61,7 +62,7 @@ public class StationMarker { String name = stationOption.get() .getStation().name; return new StationMarker(pos, BlockEntityBehaviour.get(stationOption.get(), TrackTargetingBehaviour.TYPE) - .getPositionForMapMarker(), Components.literal(name)); + .getPositionForMapMarker(), Component.literal(name)); } public CompoundTag save() { diff --git a/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java b/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java index 6ce90f1d9b..e0a8bc8a75 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java +++ b/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java @@ -27,7 +27,7 @@ import net.createmod.catnip.gui.UIRenderHelper; import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.data.Pair; import net.createmod.catnip.animation.LerpedFloat; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; @@ -72,7 +72,7 @@ public class StationScreen extends AbstractStationScreen { onTextChanged = s -> nameBox.setX(nameBoxX(s, nameBox)); nameBox = new EditBox(new NoShadowFontWrapper(font), x + 23, y + 4, background.getWidth() - 20, 10, - Components.literal(station.name)); + Component.literal(station.name)); nameBox.setBordered(false); nameBox.setMaxLength(25); nameBox.setTextColor(0x592424); @@ -120,7 +120,7 @@ public class StationScreen extends AbstractStationScreen { addRenderableWidget(colorTypeScroll); onTextChanged = s -> trainNameBox.setX(nameBoxX(s, trainNameBox)); - trainNameBox = new EditBox(font, x + 23, y + 47, background.getWidth() - 75, 10, Components.immutableEmpty()); + trainNameBox = new EditBox(font, x + 23, y + 47, background.getWidth() - 75, 10, Lang.IMMUTABLE_EMPTY); trainNameBox.setBordered(false); trainNameBox.setMaxLength(35); trainNameBox.setTextColor(0xC6C6C6); diff --git a/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java b/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java index 4839ef3f98..8376aabe5d 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java +++ b/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java @@ -8,8 +8,8 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.content.trains.entity.TrainIconType; import com.simibubi.create.foundation.networking.SimplePacketBase; -import net.createmod.catnip.lang.Components; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; @@ -53,8 +53,9 @@ public class TrainEditPacket extends SimplePacketBase { Train train = Create.RAILWAYS.sided(level).trains.get(id); if (train == null) return; - if (!name.isBlank()) - train.name = Components.literal(name); + if (!name.isBlank()) { + train.name = Component.literal(name); + } train.icon = TrainIconType.byId(iconType); train.mapColorIndex = mapColor; if (sender != null) diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java index fc30fae929..01edd65f71 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java @@ -19,6 +19,7 @@ import java.util.Random; import java.util.Set; import java.util.function.Consumer; +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.Nullable; import com.google.common.base.Predicates; @@ -53,7 +54,6 @@ import net.createmod.catnip.math.BlockFace; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.data.Pair; import net.createmod.catnip.math.VecHelper; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.math.AngleHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.multiplayer.ClientLevel; @@ -297,13 +297,13 @@ public class TrackBlock extends Block Player player = level.getNearestPlayer(pos.getX(), pos.getY(), pos.getZ(), 10, Predicates.alwaysTrue()); if (player == null) return; - player.displayClientMessage(Components.literal(" ") + player.displayClientMessage(Component.literal(" ") .append(CreateLang.translateDirect("portal_track.failed")) .withStyle(ChatFormatting.GOLD), false); MutableComponent component = failPos != null ? CreateLang.translateDirect("portal_track." + fail, failPos.getX(), failPos.getY(), failPos.getZ()) : CreateLang.translateDirect("portal_track." + fail); - player.displayClientMessage(Components.literal(" - ") + player.displayClientMessage(Component.literal(" - ") .withStyle(ChatFormatting.GRAY) .append(component.withStyle(st -> st.withColor(0xFFD3B4))), false); } diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java index ee6daa4fef..7d76ce6ff0 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java @@ -3,12 +3,12 @@ package com.simibubi.create.content.trains.track; import com.mojang.blaze3d.platform.Window; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraft.world.level.GameType; @@ -36,7 +36,7 @@ public class TrackPlacementOverlay implements IGuiOverlay { return; boolean active = mc.options.keySprint.isDown(); - MutableComponent text = CreateLang.translateDirect("track.hold_for_smooth_curve", Components.keybind("key.sprint") + MutableComponent text = CreateLang.translateDirect("track.hold_for_smooth_curve", Component.keybind("key.sprint") .withStyle(active ? ChatFormatting.WHITE : ChatFormatting.GRAY)); Window window = mc.getWindow(); diff --git a/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java b/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java index 76c12fe432..cbfd86df9f 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java @@ -7,7 +7,6 @@ import java.util.function.UnaryOperator; import com.simibubi.create.Create; import com.tterrag.registrate.util.entry.ItemProviderEntry; -import net.createmod.catnip.lang.Components; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.CriterionTriggerInstance; import net.minecraft.advancements.FrameType; @@ -17,6 +16,7 @@ import net.minecraft.advancements.critereon.ItemPredicate; import net.minecraft.advancements.critereon.ItemUsedOnLocationTrigger; import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.advancements.critereon.NbtPredicate; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.TagKey; @@ -54,8 +54,8 @@ public class CreateAdvancement { builder.addCriterion("0", builtinTrigger.instance()); } - builder.display(t.icon, Components.translatable(titleKey()), - Components.translatable(descriptionKey()).withStyle(s -> s.withColor(0xDBA213)), + builder.display(t.icon, Component.translatable(titleKey()), + Component.translatable(descriptionKey()).withStyle(s -> s.withColor(0xDBA213)), id.equals("root") ? BACKGROUND : null, t.type.frame, t.type.toast, t.type.announce, t.type.hide); if (t.type == TaskType.SECRET) diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java index bc7511e09a..2834c16d9f 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java @@ -8,8 +8,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform.Si import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions; import com.simibubi.create.foundation.gui.AllIcons; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.render.SuperRenderTypeBuffer; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.outliner.ChasingAABBOutline; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -29,8 +29,8 @@ import net.minecraft.world.phys.Vec3; public class ValueBox extends ChasingAABBOutline { protected Component label; - protected Component sublabel = Components.immutableEmpty(); - protected Component scrollTooltip = Components.immutableEmpty(); + protected Component sublabel = Lang.IMMUTABLE_EMPTY; + protected Component scrollTooltip = Lang.IMMUTABLE_EMPTY; protected Vec3 labelOffset = Vec3.ZERO; public int overrideColor = -1; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java index e2489c4dc5..c6f5bd7775 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java @@ -19,7 +19,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.UIRenderHelper; import net.createmod.catnip.animation.AnimationTickHolder; -import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.core.BlockPos; @@ -138,8 +137,8 @@ public class ValueSettingsScreen extends AbstractSimiScreen { int scale = board.maxValue() > 128 ? 1 : 2; Component title = board.title(); - Component tip = - CreateLang.translateDirect("gui.value_settings.release_to_confirm", Components.keybind("key.use")); + Component tip = + CreateLang.translateDirect("gui.value_settings.release_to_confirm", Component.keybind("key.use")); double fadeIn = Math.pow(Mth.clamp((ticksOpen + partialTicks) / 4.0, 0, 1), 1); int fattestLabel = Math.max(font.width(tip), font.width(title)); diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java index 05b900b4dd..26b7c6ae72 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java @@ -11,8 +11,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.math.VecHelper; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -77,7 +77,7 @@ public class EdgeInteractionRenderer { .scale(.469)) .add(VecHelper.CENTER_OF_ORIGIN); - ValueBox box = new ValueBox(Components.immutableEmpty(), bb, pos).passive(!hit) + ValueBox box = new ValueBox(Lang.IMMUTABLE_EMPTY, bb, pos).passive(!hit) .transform(new EdgeValueBoxTransform(offset)) .wideOutline(); Outliner.getInstance().showOutline("edge", box) diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java index 888d1fd16c..a1264c2155 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java @@ -23,11 +23,11 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.math.VecHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -271,8 +271,8 @@ public class FilteringBehaviour extends BlockEntityBehaviour implements ValueSet if (value.row() == 0 && value.value() == filter.item() .getMaxStackSize()) return CreateLang.translateDirect("logistics.filter.any_amount_short"); - return Components.literal(((value.row() == 0) ? "\u2264" : "=") + Math.max(1, value.value())); - } + return Component.literal(((value.row() == 0) ? "\u2264" : "=") + Math.max(1, value.value())); + } @Override public void onShortInteract(Player player, InteractionHand hand, Direction side, BlockHitResult hitResult) { @@ -341,9 +341,9 @@ public class FilteringBehaviour extends BlockEntityBehaviour implements ValueSet } public MutableComponent getCountLabelForValueBox() { - return Components.literal(isCountVisible() ? upTo && filter.item() - .getMaxStackSize() == count ? "*" : String.valueOf(count) : ""); - } + return Component.literal(isCountVisible() ? upTo && filter.item() + .getMaxStackSize() == count ? "*" : String.valueOf(count) : ""); + } @Override public String getClipboardKey() { diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java index 42f143471c..b3c1c5913c 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java @@ -6,7 +6,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter.ScrollOptionSettingsFormatter; -import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.phys.BlockHitResult; @@ -31,7 +30,7 @@ public class ScrollOptionBehaviour & INamedIconOptions> extend @Override public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) { - return new ValueSettingsBoard(label, max, 1, ImmutableList.of(Components.literal("Select")), + return new ValueSettingsBoard(label, max, 1, ImmutableList.of(Component.literal("Select")), new ScrollOptionSettingsFormatter(options)); } diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java index 9006b5dc8c..08cc4c4ce4 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java @@ -13,10 +13,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBehavio import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter; -import net.createmod.catnip.lang.Components; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; @@ -156,7 +156,7 @@ public class ScrollValueBehaviour extends BlockEntityBehaviour implements ValueS @Override public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) { - return new ValueSettingsBoard(label, max, 10, ImmutableList.of(Components.literal("Value")), + return new ValueSettingsBoard(label, max, 10, ImmutableList.of(Component.literal("Value")), new ValueSettingsFormatter(ValueSettings::format)); } diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java index f390d0a702..ce38a9b641 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java @@ -13,7 +13,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.IconValueBo import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.TextValueBox; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -92,7 +91,7 @@ public class ScrollValueRenderer { if (behaviour instanceof ScrollOptionBehaviour) { box = new IconValueBox(label, ((ScrollOptionBehaviour) behaviour).getIconForSelected(), bb, pos); } else { - box = new TextValueBox(label, bb, pos, Components.literal(behaviour.formatValue())); + box = new TextValueBox(label, bb, pos, Component.literal(behaviour.formatValue())); } box.passive(!highlight) diff --git a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java index 06e4aeb5ea..3aa6ed22a7 100644 --- a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java +++ b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java @@ -26,7 +26,8 @@ import com.simibubi.create.foundation.utility.TickBasedCache; import com.simibubi.create.infrastructure.command.AllCommands; import net.createmod.catnip.data.WorldAttached; -import net.createmod.catnip.lang.Components; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.repository.Pack; @@ -220,7 +221,7 @@ public class CommonEvents { } IModFile modFile = modFileInfo.getFile(); event.addRepositorySource(consumer -> { - Pack pack = Pack.readMetaAndCreate(Create.asResource("legacy_copper").toString(), Components.literal("Create Legacy Copper"), false, id -> new ModFilePackResources(id, modFile, "resourcepacks/legacy_copper"), PackType.CLIENT_RESOURCES, Pack.Position.TOP, PackSource.BUILT_IN); + Pack pack = Pack.readMetaAndCreate(Create.asResource("legacy_copper").toString(), Component.literal("Create Legacy Copper"), false, id -> new ModFilePackResources(id, modFile, "resourcepacks/legacy_copper"), PackType.CLIENT_RESOURCES, Pack.Position.TOP, PackSource.BUILT_IN); if (pack != null) { consumer.accept(pack); } diff --git a/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java b/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java index f6645fe046..845c1887f8 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.gui.widget.TooltipArea; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Pair; -import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.EditBox; @@ -52,7 +52,7 @@ public class ModularGuiLineBuilder { } private void addScrollInput(T input, BiConsumer inputTransform, String dataKey) { - Label label = new Label(input.getX() + 5, y, Components.immutableEmpty()); + Label label = new Label(input.getX() + 5, y, Lang.IMMUTABLE_EMPTY); label.withShadow(); inputTransform.accept(input, label); input.writingTo(label); @@ -76,7 +76,7 @@ public class ModularGuiLineBuilder { public ModularGuiLineBuilder addTextInput(int x, int width, BiConsumer inputTransform, String dataKey) { - EditBox input = new EditBox(font, x + this.x + 5, y, width - 9, 8, Components.immutableEmpty()); + EditBox input = new EditBox(font, x + this.x + 5, y, width - 9, 8, Lang.IMMUTABLE_EMPTY); input.setBordered(false); input.setTextColor(0xffffff); input.setFocused(false); diff --git a/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java b/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java index 99023ebc74..1689edb4ea 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java @@ -5,7 +5,6 @@ import javax.annotation.Nonnull; import com.mojang.blaze3d.systems.RenderSystem; import net.createmod.catnip.gui.widget.AbstractSimiWidget; -import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; @@ -23,7 +22,7 @@ public class Label extends AbstractSimiWidget { public Label(int x, int y, Component text) { super(x, y, Minecraft.getInstance().font.width(text), 10); font = Minecraft.getInstance().font; - this.text = Components.literal("Label"); + this.text = Component.literal("Label"); color = 0xFFFFFF; hasShadow = false; suffix = ""; @@ -63,8 +62,8 @@ public class Label extends AbstractSimiWidget { for (int i = startIndex; i != endIndex; i += step) { String sub = builder.substring(trimFront ? i : startIndex, trimFront ? endIndex + 1 : i + 1); - if (fontRenderer.width(Components.literal(sub).setStyle(newText.getStyle())) + trimWidth <= maxWidthPx) { - text = Components.literal(trimFront ? trim + sub : sub + trim).setStyle(newText.getStyle()); + if (fontRenderer.width(Component.literal(sub).setStyle(newText.getStyle())) + trimWidth <= maxWidthPx) { + text = Component.literal(trimFront ? trim + sub : sub + trim).setStyle(newText.getStyle()); return; } } diff --git a/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java b/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java index 6b959b03fc..55f95a25c6 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java @@ -9,7 +9,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollVa import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.widget.AbstractSimiWidget; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -40,7 +39,9 @@ public class ScrollInput extends AbstractSimiWidget { max = 1; shiftStep = 5; step = standardStep(); - formatter = i -> Components.literal(String.valueOf(i)); + formatter = i -> { + return Component.literal(String.valueOf(i)); + }; soundPlayed = false; } diff --git a/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java b/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java index 105e2bea01..0d5db5f93c 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java @@ -5,7 +5,6 @@ import java.util.List; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -42,26 +41,28 @@ public class SelectionScrollInput extends ScrollInput { max = Math.min(max, this.max); if (this.min + 1 == min) min--; - if (min > this.min) - toolTip.add(Components.literal("> ...") + if (min > this.min) { + toolTip.add(Component.literal("> ...") .withStyle(ChatFormatting.GRAY)); + } if (this.max - 1 == max) max++; for (int i = min; i < max; i++) { if (i == state) - toolTip.add(Components.empty() + toolTip.add(Component.empty() .append("-> ") .append(options.get(i)) .withStyle(ChatFormatting.WHITE)); else - toolTip.add(Components.empty() + toolTip.add(Component.empty() .append("> ") .append(options.get(i)) .withStyle(ChatFormatting.GRAY)); } - if (max < this.max) - toolTip.add(Components.literal("> ...") + if (max < this.max) { + toolTip.add(Component.literal("> ...") .withStyle(ChatFormatting.GRAY)); + } if (hint != null) toolTip.add(hint.plainCopy() diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java index 2e20a50aa5..95e7ba4459 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java @@ -11,6 +11,8 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; +import net.createmod.catnip.lang.Lang; + import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.Nullable; @@ -18,7 +20,6 @@ import com.google.common.collect.ImmutableList; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.lang.FontHelper.Palette; -import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; @@ -143,20 +144,20 @@ public record ItemDescription(ImmutableList lines, ImmutableList behaviourPair : behaviours) { String condition = behaviourPair.getLeft(); String behaviour = behaviourPair.getRight(); - linesOnShift.add(Components.literal(condition).withStyle(GRAY)); + linesOnShift.add(Component.literal(condition).withStyle(GRAY)); linesOnShift.addAll(TooltipHelper.cutStringTextComponent(behaviour, palette.primary(), palette.highlight(), 1)); } for (Pair actionPair : actions) { String condition = actionPair.getLeft(); String action = actionPair.getRight(); - linesOnCtrl.add(Components.literal(condition).withStyle(GRAY)); + linesOnCtrl.add(Component.literal(condition).withStyle(GRAY)); linesOnCtrl.addAll(TooltipHelper.cutStringTextComponent(action, palette.primary(), palette.highlight(), 1)); } @@ -177,30 +178,30 @@ public record ItemDescription(ImmutableList lines, ImmutableList kineticStats = getKineticStats(block, context.getEntity()); if (!kineticStats.isEmpty()) { List tooltip = context.getToolTip(); - tooltip.add(Components.immutableEmpty()); + tooltip.add(Lang.IMMUTABLE_EMPTY); tooltip.addAll(kineticStats); } } diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java index 12f359a2e1..42e80b228c 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java @@ -10,7 +10,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.data.Couple; import net.createmod.catnip.lang.FontHelper; -import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -55,7 +54,7 @@ public class TooltipHelper { } public static List cutStringTextComponent(String s, FontHelper.Palette palette) { - return cutTextComponent(Components.literal(s), palette); + return cutTextComponent(Component.literal(s), palette); } public static List cutTextComponent(Component c, FontHelper.Palette palette) { @@ -64,7 +63,7 @@ public class TooltipHelper { public static List cutStringTextComponent(String s, Style primaryStyle, Style highlightStyle) { - return cutTextComponent(Components.literal(s), primaryStyle, highlightStyle); + return cutTextComponent(Component.literal(s), primaryStyle, highlightStyle); } public static List cutTextComponent(Component c, Style primaryStyle, @@ -74,7 +73,7 @@ public class TooltipHelper { public static List cutStringTextComponent(String c, Style primaryStyle, Style highlightStyle, int indent) { - return cutTextComponent(Components.literal(c), primaryStyle, highlightStyle, indent); + return cutTextComponent(Component.literal(c), primaryStyle, highlightStyle, indent); } public static List cutTextComponent(Component c, Style primaryStyle, @@ -117,7 +116,7 @@ public class TooltipHelper { } // Format - MutableComponent lineStart = Components.literal(Strings.repeat(" ", indent)); + MutableComponent lineStart = Component.literal(Strings.repeat(" ", indent)); lineStart.withStyle(primaryStyle); List formattedLines = new ArrayList<>(lines.size()); Couple