diff --git a/Common/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/TimeSliderWidget.java b/Common/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/TimeSliderWidget.java index d934701..ac5d8e7 100644 --- a/Common/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/TimeSliderWidget.java +++ b/Common/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/TimeSliderWidget.java @@ -2,7 +2,6 @@ package me.hypherionmc.craterlib.client.gui.widgets; import net.minecraft.client.gui.components.AbstractSliderButton; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; /** * A custom slider widget used for Time. Mostly used by the Hyper Lighting Smoke Machine @@ -35,9 +34,9 @@ public class TimeSliderWidget extends AbstractSliderButton { if (this.value * this.maxValue >= 1200) { String appendString = (minutes == 1) ? "Minute" : "Minutes"; String doSeconds = ((seconds - (minutes * 60)) > 0) ? ", " + (seconds - (minutes * 60)) + " Seconds" : ""; - return new TextComponent(minutes + " " + appendString + doSeconds); + return Component.literal(minutes + " " + appendString + doSeconds); } else { - return new TextComponent(seconds + " Seconds"); + return Component.literal(seconds + " Seconds"); } } diff --git a/Common/src/main/java/me/hypherionmc/craterlib/common/item/DyableWaterBottle.java b/Common/src/main/java/me/hypherionmc/craterlib/common/item/DyableWaterBottle.java index 7ef1335..19dde8d 100644 --- a/Common/src/main/java/me/hypherionmc/craterlib/common/item/DyableWaterBottle.java +++ b/Common/src/main/java/me/hypherionmc/craterlib/common/item/DyableWaterBottle.java @@ -94,7 +94,7 @@ public class DyableWaterBottle extends DyeItem implements ItemDyable { playerEntity.getInventory().add(new ItemStack(Items.GLASS_BOTTLE)); } } - level.gameEvent(user, GameEvent.DRINKING_FINISH, user.getOnPos()); + level.gameEvent(user, GameEvent.DRINK, user.getOnPos()); return stack; } diff --git a/Common/src/main/java/me/hypherionmc/craterlib/common/network/BaseNetworkPacket.java b/Common/src/main/java/me/hypherionmc/craterlib/common/network/BaseNetworkPacket.java index e9813b6..7c01b75 100644 --- a/Common/src/main/java/me/hypherionmc/craterlib/common/network/BaseNetworkPacket.java +++ b/Common/src/main/java/me/hypherionmc/craterlib/common/network/BaseNetworkPacket.java @@ -1,28 +1,6 @@ package me.hypherionmc.craterlib.common.network; -import me.hypherionmc.craterlib.Constants; -import net.minecraft.Util; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.level.Level; - -import java.util.HashMap; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.function.Function; - // TODO: FINISH NETWORK IMPLEMENTATION public interface BaseNetworkPacket { - Map> PACKETS = Util.make(new HashMap<>(), map -> { - Constants.LOG.info("Registering Config Packets"); - }); - - void write(FriendlyByteBuf buf); - - void handle(Level level); - - record Handler(Class clazz, BiConsumer write, - Function read, - BiConsumer handle) { - } } diff --git a/Common/src/main/java/me/hypherionmc/craterlib/util/LangUtils.java b/Common/src/main/java/me/hypherionmc/craterlib/util/LangUtils.java index 539304e..25e3699 100644 --- a/Common/src/main/java/me/hypherionmc/craterlib/util/LangUtils.java +++ b/Common/src/main/java/me/hypherionmc/craterlib/util/LangUtils.java @@ -2,25 +2,23 @@ package me.hypherionmc.craterlib.util; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.network.chat.TranslatableComponent; public class LangUtils { public static Component getTooltipTitle(String key) { - return new TextComponent(ChatFormatting.YELLOW + new TranslatableComponent(key).getString()); + return Component.literal(ChatFormatting.YELLOW + Component.translatable(key).getString()); } public static String resolveTranslation(String key) { - return new TranslatableComponent(key).getString(); + return Component.translatable(key).getString(); } public static Component getTranslation(String key) { - return new TranslatableComponent(key); + return Component.translatable(key); } public static Component makeComponent(String text) { - return new TranslatableComponent(text); + return Component.translatable(text); } } diff --git a/Common/src/main/java/me/hypherionmc/craterlib/util/RenderUtils.java b/Common/src/main/java/me/hypherionmc/craterlib/util/RenderUtils.java index ab5639b..b8fe9e6 100644 --- a/Common/src/main/java/me/hypherionmc/craterlib/util/RenderUtils.java +++ b/Common/src/main/java/me/hypherionmc/craterlib/util/RenderUtils.java @@ -3,7 +3,6 @@ package me.hypherionmc.craterlib.util; import com.mojang.math.Vector4f; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; public class RenderUtils { @@ -20,7 +19,7 @@ public class RenderUtils { amount = amount / 81; capacity = capacity / 81; String text = "" + (int) (((float) amount / capacity) * 100); - return amount > 0 ? new TextComponent(ChatFormatting.AQUA + text + "%") : new TextComponent(text + "%"); + return amount > 0 ? Component.literal(ChatFormatting.AQUA + text + "%") : Component.literal(text + "%"); } public static Component getTimeDisplayString(double value) { @@ -29,9 +28,9 @@ public class RenderUtils { if (seconds >= 60) { String appendString = (minutes == 1) ? "Minute" : "Minutes"; String doSeconds = ((seconds - (minutes * 60)) > 0) ? ", " + (seconds - (minutes * 60)) + " Seconds" : ""; - return new TextComponent(minutes + " " + appendString + doSeconds); + return Component.literal(minutes + " " + appendString + doSeconds); } else { - return new TextComponent(seconds + " Seconds"); + return Component.literal(seconds + " Seconds"); } } diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 8c0509c..d2dea89 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' id 'idea' } diff --git a/Fabric/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java b/Fabric/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java index a9c66b1..5b0052f 100644 --- a/Fabric/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java +++ b/Fabric/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java @@ -14,7 +14,7 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import java.util.Arrays; import java.util.Optional; @@ -31,7 +31,7 @@ public class FluidStackWidget extends AbstractWidget { private final String toolTipTitle; public FluidStackWidget(Screen displayOn, Supplier getFluid, int pX, int pY, int pWidth, int pHeight, String tooltipTitle) { - super(pX, pY, pWidth, pHeight, TextComponent.EMPTY); + super(pX, pY, pWidth, pHeight, Component.empty()); this.displayOn = displayOn; this.getFluid = getFluid; this.toolTipTitle = tooltipTitle; @@ -85,7 +85,7 @@ public class FluidStackWidget extends AbstractWidget { @Override public void renderToolTip(PoseStack poseStack, int mouseX, int mouseY) { if (this.visible && this.isFocused() && isHoveredOrFocused()) { - displayOn.renderTooltip(poseStack, Arrays.asList(LangUtils.getTooltipTitle(toolTipTitle), new TextComponent((int) (((float) this.getFluid.get().getAmount() / this.getFluid.get().getCapacity()) * 100) + "%")), Optional.empty(), mouseX, mouseY); + displayOn.renderTooltip(poseStack, Arrays.asList(LangUtils.getTooltipTitle(toolTipTitle), Component.literal((int) (((float) this.getFluid.get().getAmount() / this.getFluid.get().getCapacity()) * 100) + "%")), Optional.empty(), mouseX, mouseY); } } diff --git a/Fabric/src/main/java/me/hypherionmc/craterlib/systems/fluid/FluidTank.java b/Fabric/src/main/java/me/hypherionmc/craterlib/systems/fluid/FluidTank.java index d4fcea0..df6abaf 100644 --- a/Fabric/src/main/java/me/hypherionmc/craterlib/systems/fluid/FluidTank.java +++ b/Fabric/src/main/java/me/hypherionmc/craterlib/systems/fluid/FluidTank.java @@ -4,7 +4,6 @@ import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions; import net.fabricmc.fabric.api.transfer.v1.storage.StorageView; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleViewIterator; import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; import net.minecraft.nbt.CompoundTag; @@ -61,6 +60,12 @@ public class FluidTank implements Storage, StorageView> iterator() { + // TODO: FIX THIS! + return null; + } + @Override public boolean isResourceBlank() { return fluid.isBlank(); @@ -81,11 +86,6 @@ public class FluidTank implements Storage, StorageView> iterator(TransactionContext transaction) { - return SingleViewIterator.create(this, transaction); - } - public CompoundTag writeNbt(CompoundTag compound) { FluidUtils.putFluid(compound, "fluid", getResource()); compound.putLong("amt", level); diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index ac7372b..b936bf0 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -5,7 +5,8 @@ "name": "CraterLib", "description": "A library mod used by HypherionSA's Mods", "authors": [ - "Me!" + "HypherionSA", + "Misha" ], "contact": { "homepage": "https://fabricmc.net/", @@ -28,12 +29,9 @@ ], "accessWidener": "craterlib.aw", "depends": { - "fabricloader": ">=0.12", + "fabricloader": ">=0.14", "fabric": "*", - "minecraft": "1.18.x", + "minecraft": "1.19.x", "java": ">=17" - }, - "suggests": { - "another-mod": "*" } } diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index 5c66957..27e402d 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[40,)" +loaderVersion = "[41,)" license = "MIT" #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" @@ -19,13 +19,13 @@ A library mod used by HypherionSA's Mods [[dependencies.craterlib]] modId = "forge" mandatory = true -versionRange = "[40,)" +versionRange = "[41,)" ordering = "NONE" side = "BOTH" [[dependencies.craterlib]] modId = "minecraft" mandatory = true -versionRange = "[1.18.2,1.19)" +versionRange = "[1.19,1.20)" ordering = "NONE" side = "BOTH" diff --git a/build.gradle b/build.gradle index 3ecfc78..471bdc9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'com.matyrobbrt.mc.registrationutils' version '0.2.6' + id 'com.matyrobbrt.mc.registrationutils' version '1.19-1.0.0' } registrationUtils { @@ -15,7 +15,7 @@ registrationUtils { subprojects { ext { - isSnapshot: false + isSnapshot = false } def version_base = "${project.version_major}.${project.version_minor}" diff --git a/gradle.properties b/gradle.properties index fb0e617..5edcb2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,22 @@ # Project version_major=1 version_minor=0 -version_patch=5 +version_patch=0 group=me.hypherionmc.craterlib # Common -minecraft_version=1.18.2 +minecraft_version=1.19 common_runs_enabled=false common_client_run_name=Common Client common_server_run_name=Common Server # Forge -forge_version=40.1.0 +forge_version=41.0.16 forge_ats_enabled=true # Fabric -fabric_version=0.51.1+1.18.2 -fabric_loader_version=0.13.3 +fabric_version=0.55.3+1.19 +fabric_loader_version=0.14.7 # Mod options mod_name=CraterLib