, Object> CACHE = new HashMap<>();
// ==================================================
private EntityProvider() {}
static {
//clear cache when world-related events happen
- ClientEvent.PLAYER_JOIN.addListener(__ -> CACHE.clear());
- ClientEvent.PLAYER_QUIT.addListener(__ -> CACHE.clear());
- ClientEvent.LEVEL_INIT.addListener(__ -> CACHE.clear());
+ ClientEvent.PLAYER_JOIN.addListener(_ -> CACHE.clear());
+ ClientEvent.PLAYER_QUIT.addListener(_ -> CACHE.clear());
+ ClientEvent.LEVEL_INIT.addListener(_ -> CACHE.clear());
}
// ==================================================
/**
@@ -206,8 +208,11 @@ else if(cached instanceof RuntimeException error)
Level level = client.level;
if(level == null) level = SandboxLevel.INSTANCE;
- final var entity = entityType.create(level, MOB_SUMMONED);
- CACHE.put(entityType, Objects.requireNonNull(entity, "'EntityType#create(...)' returned 'null' for " + entityType));
+ final var entity = Objects.requireNonNull(
+ entityType.create(level, MOB_SUMMONED),
+ "'EntityType#create(...)' returned 'null' for " + entityType);
+ entity.setId(nextEntityId());
+ CACHE.put(entityType, entity);
return entity;
} catch (Exception e) {
final var error = new RuntimeException("Failed to create 'Entity' instance of type " + entityType, e);
@@ -215,6 +220,16 @@ else if(cached instanceof RuntimeException error)
throw error;
}
}
+ // --------------------------------------------------
+ /**
+ * Generate next ID integer for a created {@link Entity} instance.
+ * @see Entity#setId(int)
+ */
+ private static final int nextEntityId() {
+ NEXT_ID++; //increment next id
+ if(NEXT_ID < 1048576) NEXT_ID = 1048576; //counteract overflows (values '< 1' are prohibited)
+ return NEXT_ID; //return next id
+ }
// ==================================================
}
// ================================================== ==================================================
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/misc/TItemElement.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/misc/TItemElement.java
deleted file mode 100644
index da96c41..0000000
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/misc/TItemElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.thecsdev.commonmc.api.client.gui.misc;
-
-import com.thecsdev.common.properties.NotNullProperty;
-import com.thecsdev.common.util.annotations.Virtual;
-import com.thecsdev.commonmc.api.client.gui.TElement;
-import com.thecsdev.commonmc.api.client.gui.render.TGuiGraphics;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * {@link TElement} that renders a given {@link ItemStack} on the screen,
- * like how the game does it in the inventory screen.
- *
- * {@link Deprecated}. Please use {@link TItemStackElement} instead.
- */
-@Environment(EnvType.CLIENT)
-@Deprecated(since = "5.3.0", forRemoval = true)
-public @Virtual class TItemElement extends TElement
-{
- // ==================================================
- private final NotNullProperty itemStack = new NotNullProperty<>(Items.AIR.getDefaultInstance());
- // ==================================================
- public TItemElement() { this(Items.AIR.getDefaultInstance()); }
- public TItemElement(@Nullable ItemStack itemStack)
- {
- //this element should not be focusable or hoverable
- focusableProperty().set(false, TItemElement.class);
- hoverableProperty().set(false, TItemElement.class);
- //initialize properties
- this.itemStack.set(itemStack, TItemElement.class);
- }
- // ==================================================
- /**
- * Returns the {@link NotNullProperty} holding the {@link ItemStack}
- * that is to be rendered by this {@link TItemElement}.
- */
- public final NotNullProperty itemStackProperty() { return this.itemStack; }
- // ==================================================
- public @Virtual @Override void renderCallback(@NotNull TGuiGraphics pencil) {
- final var bb = getBounds();
- pencil.renderItem(this.itemStack.get(), bb.x, bb.y, bb.width, bb.height);
- }
- // ==================================================
-}
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/misc/TItemStackElement.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/misc/TItemStackElement.java
index 00f058a..99c7f7f 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/misc/TItemStackElement.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/misc/TItemStackElement.java
@@ -1,10 +1,14 @@
package com.thecsdev.commonmc.api.client.gui.misc;
+import com.thecsdev.common.properties.NotNullProperty;
import com.thecsdev.common.util.annotations.Virtual;
import com.thecsdev.commonmc.api.client.gui.TElement;
+import com.thecsdev.commonmc.api.client.gui.render.TGuiGraphics;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -12,8 +16,30 @@
* like how the game does it in the inventory screen.
*/
@Environment(EnvType.CLIENT)
-public @Virtual class TItemStackElement extends TItemElement
+public @Virtual class TItemStackElement extends TElement
{
- public TItemStackElement() { super(); }
- public TItemStackElement(@Nullable ItemStack itemStack) { super(itemStack); }
+ // ==================================================
+ private final NotNullProperty itemStack = new NotNullProperty<>(Items.AIR.getDefaultInstance());
+ // ==================================================
+ public TItemStackElement() { this(Items.AIR.getDefaultInstance()); }
+ public TItemStackElement(@Nullable ItemStack itemStack)
+ {
+ //this element should not be focusable or hoverable
+ focusableProperty().set(false, TItemStackElement.class);
+ hoverableProperty().set(false, TItemStackElement.class);
+ //initialize properties
+ this.itemStack.set(itemStack, TItemStackElement.class);
+ }
+ // ==================================================
+ /**
+ * Returns the {@link NotNullProperty} holding the {@link ItemStack}
+ * that is to be rendered by this {@link TItemStackElement}.
+ */
+ public final NotNullProperty itemStackProperty() { return this.itemStack; }
+ // ==================================================
+ public @Virtual @Override void renderCallback(@NotNull TGuiGraphics pencil) {
+ final var bb = getBounds();
+ pencil.renderItem(this.itemStack.get(), bb.x, bb.y, bb.width, bb.height);
+ }
+ // ==================================================
}
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/render/TGuiGraphics.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/render/TGuiGraphics.java
index a84e965..672fc09 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/render/TGuiGraphics.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/render/TGuiGraphics.java
@@ -8,7 +8,6 @@
import com.thecsdev.commonmc.api.client.gui.screen.TScreen;
import com.thecsdev.commonmc.api.client.gui.screen.TScreenWrapper;
import com.thecsdev.commonmc.client.mixin.hooks.AccessorGuiGraphicsExtractor;
-import com.thecsdev.commonmc.client.mixin.hooks.AccessorGuiRenderer;
import com.thecsdev.commonmc.resource.TSprites;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@@ -16,7 +15,6 @@
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.render.GuiRenderer;
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
-import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.data.AtlasIds;
import net.minecraft.resources.Identifier;
@@ -32,7 +30,6 @@
import java.util.Objects;
-import static com.thecsdev.commonmc.api.client.gui.util.TGuiUtils.getGuiRenderer;
import static net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED;
/**
@@ -59,10 +56,9 @@ public static final TGuiGraphics createInstance(@NotNull GuiGraphicsExtractor dr
return new TGuiGraphicsDefault(drawContext, mouseX, mouseY, deltaTicks);
}
// ==================================================
- private final GuiGraphicsExtractor drawContext;
- private final Minecraft client;
- private final Matrix3x2fStack matrices;
- private final MultiBufferSource.BufferSource bufferSource;
+ private final GuiGraphicsExtractor drawContext;
+ private final Minecraft client;
+ private final Matrix3x2fStack matrices;
// --------------------------------------------------
private final int mouseX, mouseY;
private final float deltaTicks;
@@ -76,7 +72,6 @@ protected TGuiGraphics(GuiGraphicsExtractor drawContext, int mouseX, int mouseY,
this.drawContext = drawContext;
this.client = aDrawContext.getClient();
this.matrices = aDrawContext.getMatrices();
- this.bufferSource = ((AccessorGuiRenderer)(Object)getGuiRenderer(aDrawContext.getClient())).getVertexConsumers();
this.mouseX = mouseX;
this.mouseY = mouseY;
this.deltaTicks = deltaTicks;
@@ -98,12 +93,6 @@ protected TGuiGraphics(GuiGraphicsExtractor drawContext, int mouseX, int mouseY,
@ApiStatus.Experimental
public final Minecraft getNativeClient() { return this.client; }
- /**
- * Returns the game-{@link GuiRenderer}'s {@link MultiBufferSource.BufferSource}.
- */
- @ApiStatus.Experimental
- public final MultiBufferSource.BufferSource getNativeBufferSource() { return this.bufferSource; }
-
/**
* Returns the native {@link GuiRenderer}'s {@link Matrix3x2fStack}.
*/
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreen.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreen.java
index 790d7b0..06e5e43 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreen.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreen.java
@@ -49,14 +49,14 @@ public TScreen()
this.dragged.addFilter(el -> (el != null && el.screenProperty().get() != this) ? null : el, TScreen.class);
//invalidate tooltip caches for hovered/focused elements as they change
- this.hovered.addChangeListener((p, o, n) -> {
+ this.hovered.addChangeListener((_, o, n) -> {
if(o != null) ((AccessorTElement)(Object)o)._hoverLostCallback();
if(n != null) {
n.invalidateTooltipCache();
((AccessorTElement)(Object)n)._hoverGainedCallback();
}
});
- this.focused.addChangeListener((p, o, n) -> {
+ this.focused.addChangeListener((_, o, n) -> {
if(o != null) ((AccessorTElement)(Object)o)._focusLostCallback();
if(n != null) {
n.invalidateTooltipCache();
@@ -64,7 +64,7 @@ public TScreen()
TGuiUtils.scrollToElement(n); //scroll to element AFTER notifying it
}
});
- this.dragged.addChangeListener((p, o, n) -> {
+ this.dragged.addChangeListener((_, o, n) -> {
if(o != null) ((AccessorTElement)(Object)o)._dragEndCallback();
if(n != null) ((AccessorTElement)(Object)n)._dragStartCallback();
});
@@ -74,7 +74,7 @@ public TScreen()
bb -> (bb.x != 0 || bb.y != 0) ? new Bounds2i(0, 0, bb.width, bb.height) : bb,
TScreen.class);
//handle stuff on resize
- boundsProperty().addChangeListener((p, o, n) -> {
+ boundsProperty().addChangeListener((_, _, _) -> {
//clear hovered and focused elements on resize, as they are no longer valid
this.hovered.set(null, TScreen.class); //clear and init is what makes it invalid
this.focused.set(null, TScreen.class); //clear and init is what makes it invalid
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreenWrapper.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreenWrapper.java
index dec44ee..27c3359 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreenWrapper.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/screen/TScreenWrapper.java
@@ -59,6 +59,12 @@ protected TScreenWrapper(@NotNull T target) {
super(Component.empty());
this.target = Objects.requireNonNull(target);
}
+ // --------------------------------------------------
+ public @Override String toString() {
+ final var bb = this.target.getBounds();
+ return String.format("%s[x=%d,y=%d,width=%d,height=%d]",
+ super.toString(), bb.x, bb.y, bb.width, bb.height);
+ }
// ==================================================
/**
* Returns the {@link #target} {@link TScreen} for this {@link TScreenWrapper}.
@@ -92,7 +98,7 @@ protected TScreenWrapper(@NotNull T target) {
// --------------------------------------------------
protected final @Override void init() {
this.minecraft.schedule(() -> {
- if(this.minecraft.screen != this) return;
+ //if(this.minecraft.gui.screen() != this) return; -- line dropped; breaks hud-screens
//begin measuring initialization time
final var ns = nanoTime();
//trigger (re/)initialization by updating the bounds
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltip.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltip.java
index f629444..d428a77 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltip.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltip.java
@@ -51,7 +51,19 @@ public static final TTooltip of(@NotNull CustomStat stat) throws NullPointerExce
* @throws NullPointerException If the argument is {@code null}.
*/
public static final TTooltip of(@NotNull SubjectStats stats) throws NullPointerException {
- return new TTooltipSubjectStats(stats);
+ return of(stats, false);
+ }
+
+ /**
+ * A tooltip that shows the player statistics for a given {@link SubjectStats}.
+ * @param stats The {@link SubjectStats} whose statistics are to be shown.
+ * @param showItemDescription Whether to include texts from Item Descriptions where possible.
+ * @throws NullPointerException If the argument is {@code null}.
+ */
+ public static final TTooltip of(
+ @NotNull SubjectStats stats, boolean showItemDescription)
+ throws NullPointerException {
+ return new TTooltipSubjectStats(stats, showItemDescription);
}
// ==================================================
}
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipCustomStat.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipCustomStat.java
index 20e622e..dba43d4 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipCustomStat.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipCustomStat.java
@@ -3,6 +3,7 @@
import com.thecsdev.commonmc.api.stats.util.CustomStat;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
+import net.minecraft.client.Minecraft;
import net.minecraft.resources.Identifier;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@@ -33,10 +34,16 @@
//start constructing the tooltip text
final var tt = literal("");
tt.append(literal("").append(stat.getSubjectDisplayName()).withStyle(YELLOW)).append("\n");
- tt.append(literal("K: " + stat.getSubjectID()).withStyle(GRAY)).append("\n");
- tt.append(literal("V: " + stat.getSubject()).withStyle(GRAY));
- tt.append("\n\n");
+ //add advanced tooltips
+ if(Minecraft.getInstance().options.advancedItemTooltips) {
+ tt.append(literal("K: " + stat.getSubjectID()).withStyle(DARK_GRAY)).append("\n");
+ tt.append(literal("V: " + stat.getSubject()).withStyle(DARK_GRAY));
+ tt.append("\n");
+ }
+
+ //add stat value
+ tt.append("\n");
tt.append(literal(stat.getValueF()).withStyle(GOLD));
if(FLAG_DEV_ENV) tt.append(literal(" (" + stat.getValue() + ")").withStyle(GRAY));
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipLabel.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipLabel.java
index be08314..ec4a9c5 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipLabel.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipLabel.java
@@ -30,7 +30,7 @@
TTooltipLabel(Component text)
{
//reinit whenever text property changes
- textProperty().addChangeListener((p, o, n) -> clearAndInit());
+ textProperty().addChangeListener((_, _, _) -> clearAndInit());
//initialize properties
this.label.wrapTextProperty().set(true, TTooltipLabel.class);
this.label.parentProperty() .set(this, TTooltipLabel.class);
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipSubjectStats.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipSubjectStats.java
index 09e356e..7f20f8b 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipSubjectStats.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/tooltip/TTooltipSubjectStats.java
@@ -3,14 +3,24 @@
import com.thecsdev.commonmc.api.stats.util.SubjectStats;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
-import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.locale.Language;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import java.util.Objects;
+import java.util.Optional;
import static com.thecsdev.commonmc.api.stats.IStatsProvider.getStatTypeName;
+import static net.minecraft.ChatFormatting.*;
import static net.minecraft.network.chat.Component.literal;
+import static net.minecraft.network.chat.Component.translatable;
/**
* {@link TTooltip} that shows statistics related to a given {@link SubjectStats}.
@@ -21,7 +31,8 @@
// ==================================================
private final @NotNull SubjectStats stats;
// ==================================================
- public TTooltipSubjectStats(@NotNull SubjectStats stats) throws NullPointerException
+ public TTooltipSubjectStats(@NotNull SubjectStats stats, boolean showItemDescription)
+ throws NullPointerException
{
//initialize fields
this.stats = Objects.requireNonNull(stats);
@@ -30,19 +41,26 @@ public TTooltipSubjectStats(@NotNull SubjectStats stats) throws NullPointerEx
{
//start constructing the tooltip text
final var tt = literal("");
- tt.append(literal("").append(stats.getSubjectDisplayName()).withStyle(ChatFormatting.YELLOW)).append("\n");
- tt.append(literal(stats.getSubjectID().toString()).withStyle(ChatFormatting.GRAY));
- tt.append("\n\n");
+ tt.append(literal("").append(stats.getSubjectDisplayName()).withStyle(YELLOW)).append("\n");
- //add block stats
+ //add subject description
+ if(showItemDescription && computeItemDescription(stats) instanceof MutableComponent desc)
+ tt.append(desc.withStyle(GRAY)).append("\n");
+
+ //add advanced tooltips
+ if(Minecraft.getInstance().options.advancedItemTooltips)
+ tt.append(literal(stats.getSubjectID().toString()).withStyle(DARK_GRAY)).append("\n");
+
+ //add subject stats
+ tt.append("\n");
final var entries = stats.getValuesF().entrySet().iterator();
while(entries.hasNext()) {
final var entry = entries.next();
final var stName = getStatTypeName(entry.getKey().getType());
- tt.append(literal("- ").withStyle(ChatFormatting.YELLOW));
+ tt.append(literal("- ").withStyle(YELLOW));
tt.append(stName);
- tt.append(literal(" - ").withStyle(ChatFormatting.YELLOW));
- tt.append(literal(entry.getValue()).withStyle(ChatFormatting.GOLD));
+ tt.append(literal(": ").withStyle(YELLOW));
+ tt.append(literal(entry.getValue()).withStyle(GOLD));
if(entries.hasNext()) tt.append("\n");
}
@@ -56,4 +74,69 @@ public TTooltipSubjectStats(@NotNull SubjectStats stats) throws NullPointerEx
*/
public final @NotNull SubjectStats getStats() { return this.stats; }
// ==================================================
+ /**
+ * Attempts to pull an "item description" for a given {@link SubjectStats#getSubject()}.
+ * @param stats The item to obtain the description for.
+ * @throws NullPointerException If the argument is {@code null}.
+ */
+ @ApiStatus.Internal
+ private static final @Nullable MutableComponent computeItemDescription(
+ @NotNull SubjectStats stats) throws NullPointerException
+ {
+ //general preparation for all cases
+ final var lang = Language.getInstance();
+
+ //handle items
+ if(stats.getSubject() instanceof Item item)
+ return (MutableComponent) Optional.empty()
+ .or(() -> {
+ final var sid = stats.getSubjectID();
+ final var key = String.format("lore.%s.%s", sid.getNamespace(), sid.getPath());
+ return Optional.ofNullable(lang.has(key) ? translatable(key) : null);
+ })
+ .or(() -> item.getDefaultInstance().tags()
+ .map(TagKey::location)
+ .map(id -> String.format("tag.%s.%s.description", id.getNamespace(), id.getPath()))
+ .map(key -> lang.has(key) ? translatable(key) : null)
+ .filter(Objects::nonNull)
+ .findFirst()
+ )
+ .orElse(null);
+ //handle blocks
+ else if(stats.getSubject() instanceof Block block)
+ return (MutableComponent) Optional.empty()
+ .or(() -> {
+ final var sid = stats.getSubjectID();
+ final var key = String.format("lore.%s.%s", sid.getNamespace(), sid.getPath());
+ return Optional.ofNullable(lang.has(key) ? translatable(key) : null);
+ })
+ .or(() -> block.defaultBlockState().tags()
+ .map(TagKey::location)
+ .map(id -> String.format("tag.%s.%s.description", id.getNamespace(), id.getPath()))
+ .map(key -> lang.has(key) ? translatable(key) : null)
+ .filter(Objects::nonNull)
+ .findFirst()
+ )
+ .orElse(null);
+ //handle entities
+ else if(stats.getSubject() instanceof EntityType entityType) {
+ return (MutableComponent) Optional.empty()
+ .or(() -> {
+ final var sid = stats.getSubjectID();
+ final var key = String.format("entity.%s.%s.description", sid.getNamespace(), sid.getPath());
+ return Optional.ofNullable(lang.has(key) ? translatable(key) : null);
+ })
+ .or(() -> entityType.builtInRegistryHolder().tags()
+ .map(TagKey::location)
+ .map(id -> String.format("tag.%s.%s.description", id.getNamespace(), id.getPath()))
+ .map(key -> lang.has(key) ? translatable(key) : null)
+ .filter(Objects::nonNull)
+ .findFirst()
+ )
+ .orElse(null);
+ }
+ //all other types return nothing
+ else return null;
+ }
+ // ==================================================
}
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/util/TGuiUtils.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/util/TGuiUtils.java
index a98f7df..82042cb 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/util/TGuiUtils.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/util/TGuiUtils.java
@@ -25,8 +25,7 @@
import java.util.Objects;
import java.util.Random;
-import static org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_SHIFT;
-import static org.lwjgl.glfw.GLFW.GLFW_KEY_RIGHT_SHIFT;
+import static org.lwjgl.glfw.GLFW.*;
/**
* {@link TCDCommons} API's GUI-related utility methods.
@@ -92,7 +91,16 @@ public static final boolean isKeyDown(int keyCode) {
}
/**
- * Returns {@code true} is the left or right shift key is currently held down
+ * Returns {@code true} is either the left or right control key is currently held down
+ * for the current game window.
+ * @see #isKeyDown(int)
+ */
+ public static final boolean isCtrlDown() {
+ return isKeyDown(GLFW_KEY_LEFT_CONTROL) || isKeyDown(GLFW_KEY_RIGHT_CONTROL);
+ }
+
+ /**
+ * Returns {@code true} is either the left or right shift key is currently held down
* for the current game window.
* @see #isKeyDown(int)
*/
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TBlockStatsWidget.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TBlockStatsWidget.java
index 5f9fa04..13a8bc5 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TBlockStatsWidget.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TBlockStatsWidget.java
@@ -5,6 +5,7 @@
import com.thecsdev.commonmc.api.client.gui.TElement;
import com.thecsdev.commonmc.api.client.gui.render.TGuiGraphics;
import com.thecsdev.commonmc.api.client.gui.tooltip.TTooltip;
+import com.thecsdev.commonmc.api.client.gui.util.TGuiUtils;
import com.thecsdev.commonmc.api.stats.IStatsProvider;
import com.thecsdev.commonmc.api.stats.util.BlockStats;
import net.fabricmc.api.EnvType;
@@ -34,7 +35,7 @@ public final class TBlockStatsWidget extends TStatsWidget
final var isw = (TBlockStatsWidget) el;
final var stats = isw.stats.get();
Objects.requireNonNull(stats, "Stats value is missing while constructing tooltip.");
- return TTooltip.of(stats);
+ return TTooltip.of(stats, TGuiUtils.isCtrlDown());
};
// ==================================================
private final ObjectProperty stats = new ObjectProperty<>();
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TEntityStatsWidget.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TEntityStatsWidget.java
index 387a28a..6bae490 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TEntityStatsWidget.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TEntityStatsWidget.java
@@ -6,6 +6,7 @@
import com.thecsdev.commonmc.api.client.gui.TElement;
import com.thecsdev.commonmc.api.client.gui.misc.TEntityElement;
import com.thecsdev.commonmc.api.client.gui.tooltip.TTooltip;
+import com.thecsdev.commonmc.api.client.gui.util.TGuiUtils;
import com.thecsdev.commonmc.api.stats.IStatsProvider;
import com.thecsdev.commonmc.api.stats.util.EntityStats;
import net.fabricmc.api.EnvType;
@@ -32,7 +33,7 @@ public final class TEntityStatsWidget extends TStatsWidget
final var mstw = (TEntityStatsWidget) el;
final var stats = mstw.stats.get();
Objects.requireNonNull(stats, "Stats value is missing while constructing tooltip.");
- return TTooltip.of(stats);
+ return TTooltip.of(stats, TGuiUtils.isCtrlDown());
};
// ==================================================
private final ObjectProperty stats = new ObjectProperty<>();
@@ -44,7 +45,7 @@ public final class TEntityStatsWidget extends TStatsWidget
public TEntityStatsWidget(@Nullable EntityStats stats)
{
//initialize properties
- this.stats.addChangeListener((p, o, n) -> refresh());
+ this.stats.addChangeListener((_, _, _) -> refresh());
this.stats.getHandle().set(stats);
//initialize elements
this.el_entity.entityScaleProperty().set(0.7d, TEntityStatsWidget.class);
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TItemStatsWidget.java b/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TItemStatsWidget.java
index 6a4c04b..d402295 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TItemStatsWidget.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/gui/widget/stats/TItemStatsWidget.java
@@ -5,6 +5,7 @@
import com.thecsdev.commonmc.api.client.gui.TElement;
import com.thecsdev.commonmc.api.client.gui.render.TGuiGraphics;
import com.thecsdev.commonmc.api.client.gui.tooltip.TTooltip;
+import com.thecsdev.commonmc.api.client.gui.util.TGuiUtils;
import com.thecsdev.commonmc.api.stats.EmptyStatsProvider;
import com.thecsdev.commonmc.api.stats.IStatsProvider;
import com.thecsdev.commonmc.api.stats.util.ItemStats;
@@ -31,7 +32,7 @@ public final class TItemStatsWidget extends TStatsWidget
final var isw = (TItemStatsWidget) el;
final var stats = isw.stats.get();
Objects.requireNonNull(stats, "Stats value is missing while constructing tooltip.");
- return TTooltip.of(stats);
+ return TTooltip.of(stats, TGuiUtils.isCtrlDown());
};
// ==================================================
private final ObjectProperty stats = new ObjectProperty<>();
diff --git a/src/main/java/com/thecsdev/commonmc/api/client/registry/TClientRegistries.java b/src/main/java/com/thecsdev/commonmc/api/client/registry/TClientRegistries.java
index 6129925..a789b7b 100644
--- a/src/main/java/com/thecsdev/commonmc/api/client/registry/TClientRegistries.java
+++ b/src/main/java/com/thecsdev/commonmc/api/client/registry/TClientRegistries.java
@@ -9,7 +9,9 @@
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.Identifier;
import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
import static com.mojang.serialization.Lifecycle.stable;
import static com.thecsdev.commonmc.TCDCommons.MOD_ID;
@@ -41,8 +43,14 @@ public static final void bootstrap() { /*invokes */ }
HUD_SCREEN = new MappedRegistry<>(createRegistryKey(id("hud_screen")), stable());
}
// --------------------------------------------------
- private static final @ApiStatus.Internal Identifier id(@NotNull String id) {
- return fromNamespaceAndPath(MOD_ID, id);
+ /**
+ * Creates an {@link Identifier} instance that uses this mod's
+ * ID as the namespace.
+ * @param path The {@link Identifier#getPath()} value.
+ */
+ @Contract("_ -> new")
+ private static final @ApiStatus.Internal @NonNull Identifier id(@NotNull String path) {
+ return fromNamespaceAndPath(MOD_ID, path);
}
// ==================================================
}
diff --git a/src/main/java/com/thecsdev/commonmc/api/stats/util/SubjectStats.java b/src/main/java/com/thecsdev/commonmc/api/stats/util/SubjectStats.java
index 8d216dd..2f7ae83 100644
--- a/src/main/java/com/thecsdev/commonmc/api/stats/util/SubjectStats.java
+++ b/src/main/java/com/thecsdev/commonmc/api/stats/util/SubjectStats.java
@@ -27,8 +27,8 @@ public sealed abstract class SubjectStats permits CustomStat, ItemStats, Bloc
{
// ==================================================
private final @NotNull IStatsProvider statsProvider;
- private final @NotNull S subject;
- private final @NotNull Identifier subjectID;
+ private final @NotNull S subject;
+ private final @NotNull Identifier subjectID;
// ==================================================
/**
* @throws NullPointerException If an argument is {@code null}.
@@ -118,7 +118,11 @@ protected SubjectStats(
* Returns {@code true} if all {@link StatType}s for the given
* {@link #getSubject()} have the value {@code 0}.
*/
- public @Virtual boolean isEmpty() { return getValues().values().stream().noneMatch(val -> val != 0); }
+ public @Virtual boolean isEmpty() {
+ for(final int value : getValues().values())
+ if(value != 0) return false;
+ return true;
+ }
// --------------------------------------------------
/**
* Returns {@code true} if this {@link #getSubject()} matches a given search query.
diff --git a/src/main/java/com/thecsdev/commonmc/client/TCDCommonsClient.java b/src/main/java/com/thecsdev/commonmc/client/TCDCommonsClient.java
index 43be2de..1de8702 100644
--- a/src/main/java/com/thecsdev/commonmc/client/TCDCommonsClient.java
+++ b/src/main/java/com/thecsdev/commonmc/client/TCDCommonsClient.java
@@ -58,7 +58,7 @@ public TCDCommonsClient()
try { Thread.sleep(1000); } catch (Exception _) {}
//open the testing screen on the game's main thread
final var client = Minecraft.getInstance();
- client.execute(() -> client.setScreen(new TTestScreen(client.screen).getAsScreen()));
+ client.execute(() -> client.gui.setScreen(new TTestScreen(client.gui.screen()).getAsScreen()));
}, TUtils.getVirtualThreadPerTaskExecutor()));
*/
}
diff --git a/src/main/java/com/thecsdev/commonmc/client/mixin/events/MixinGui.java b/src/main/java/com/thecsdev/commonmc/client/mixin/events/MixinGui.java
index 819fc0d..b10ca25 100644
--- a/src/main/java/com/thecsdev/commonmc/client/mixin/events/MixinGui.java
+++ b/src/main/java/com/thecsdev/commonmc/client/mixin/events/MixinGui.java
@@ -25,7 +25,7 @@ public abstract class MixinGui
// ==================================================
private @Final @Shadow Minecraft minecraft;
// ==================================================
- @Inject(method = "extractRenderState", at = @At("HEAD"), cancellable = true)
+ @Inject(method = "extractRenderState", at = @At("HEAD"), cancellable = true, require = 0)
private void onPreRender(GuiGraphicsExtractor pencil, DeltaTracker tickCounter, CallbackInfo ci)
{
//cancel HUD rendering if a currently opened t-screen does not allow this
diff --git a/src/main/java/com/thecsdev/commonmc/client/mixin/hooks/AccessorGuiRenderer.java b/src/main/java/com/thecsdev/commonmc/client/mixin/hooks/AccessorGuiRenderer.java
deleted file mode 100644
index 9d11b97..0000000
--- a/src/main/java/com/thecsdev/commonmc/client/mixin/hooks/AccessorGuiRenderer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.thecsdev.commonmc.client.mixin.hooks;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.client.gui.render.GuiRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-
-@Mixin(GuiRenderer.class)
-public interface AccessorGuiRenderer
-{
- public @Accessor("bufferSource") MultiBufferSource.BufferSource getVertexConsumers();
-}
\ No newline at end of file
diff --git a/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCommands.java b/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCommands.java
index 733366f..fdafb7f 100644
--- a/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCommands.java
+++ b/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCommands.java
@@ -19,8 +19,8 @@ public abstract class MixinCommands
private @Final @Shadow CommandDispatcher dispatcher;
// ==================================================
@Inject(method = "", at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/CommandDispatcher;setConsumer(Lcom/mojang/brigadier/ResultConsumer;)V"))
- private void onInit(Commands.CommandSelection sel, CommandBuildContext ctx, CallbackInfo ci) {
- CommandEvent.INIT_COMMANDS.invoker().invoke(dispatcher, ctx, sel);
+ private void onInit(Commands.CommandSelection commandSelection, CommandBuildContext context, CallbackInfo ci) {
+ CommandEvent.INIT_COMMANDS.invoker().invoke(dispatcher, context, commandSelection);
}
// ==================================================
}
diff --git a/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCreativeModeTabs.java b/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCreativeModeTabs.java
index 93a9d3c..ac43db3 100644
--- a/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCreativeModeTabs.java
+++ b/src/main/java/com/thecsdev/commonmc/mixin/events/MixinCreativeModeTabs.java
@@ -16,7 +16,7 @@ public abstract class MixinCreativeModeTabs
@Inject(method = "tryRebuildTabContents", at = @At("RETURN"))
private static void onRebuildTabContents(
FeatureFlagSet enabledFeatures,
- boolean operatorEnabled,
+ boolean hasPermissions,
HolderLookup.Provider lookup,
CallbackInfoReturnable callback)
{
@@ -25,6 +25,6 @@ private static void onRebuildTabContents(
//rebuild the internal map and invoke the event
TItemUtils.rebuildI2TMap();
- CreativeModeTabEvent.REBUILD_CONTENTS.invoker().invoke(enabledFeatures, operatorEnabled, lookup);
+ CreativeModeTabEvent.REBUILD_CONTENTS.invoker().invoke(enabledFeatures, hasPermissions, lookup);
}
}
diff --git a/src/main/java/com/thecsdev/commonmc/resource/TComponent.java b/src/main/java/com/thecsdev/commonmc/resource/TComponent.java
index d37acea..c0c3e09 100644
--- a/src/main/java/com/thecsdev/commonmc/resource/TComponent.java
+++ b/src/main/java/com/thecsdev/commonmc/resource/TComponent.java
@@ -29,25 +29,22 @@ private TComponent() {}
public static final MutableComponent air() { return literal("").append(object(new AtlasSprite(AtlasIds.GUI, Identifier.fromNamespaceAndPath(MOD_ID, "air")))); }
public static final MutableComponent missingNo() { return literal("").append(object(new AtlasSprite(AtlasSprite.DEFAULT_ATLAS, TextureManager.INTENTIONAL_MISSING_TEXTURE))); }
// --------------------------------------------------
+ public static final MutableComponent head(@NotNull UUID uuid) { return literal("").append(object(new PlayerSprite(ResolvableProfile.createUnresolved(uuid), true))); }
+ public static final MutableComponent head(@NotNull String username) { return literal("").append(object(new PlayerSprite(ResolvableProfile.createUnresolved(username), true))); }
+ // ==================================================
public static final MutableComponent block(@NotNull String texId) { return literal("").append(object(new AtlasSprite(AtlasIds.BLOCKS, Identifier.parse(texId)))); }
public static final MutableComponent block(@NotNull Identifier texId) { return literal("").append(object(new AtlasSprite(AtlasIds.BLOCKS, texId))); }
// --------------------------------------------------
public static final MutableComponent item(@NotNull String texId) { return literal("").append(object(new AtlasSprite(AtlasIds.ITEMS, Identifier.parse(texId)))); }
public static final MutableComponent item(@NotNull Identifier texId) { return literal("").append(object(new AtlasSprite(AtlasIds.ITEMS, texId))); }
// --------------------------------------------------
+ public static final MutableComponent gui(@NotNull String texId) { return literal("").append(object(new AtlasSprite(AtlasIds.GUI, Identifier.parse(texId)))); }
+ public static final MutableComponent gui(@NotNull Identifier texId) { return literal("").append(object(new AtlasSprite(AtlasIds.GUI, texId))); }
+ // --------------------------------------------------
public static final MutableComponent painting(@NotNull String texId) { return literal("").append(object(new AtlasSprite(AtlasIds.PAINTINGS, Identifier.parse(texId)))); }
public static final MutableComponent painting(@NotNull Identifier texId) { return literal("").append(object(new AtlasSprite(AtlasIds.PAINTINGS, texId))); }
// --------------------------------------------------
public static final MutableComponent particle(@NotNull String texId) { return literal("").append(object(new AtlasSprite(AtlasIds.PARTICLES, Identifier.parse(texId)))); }
public static final MutableComponent particle(@NotNull Identifier texId) { return literal("").append(object(new AtlasSprite(AtlasIds.PARTICLES, texId))); }
- // --------------------------------------------------
- public static final MutableComponent gui(@NotNull String texId) { return literal("").append(object(new AtlasSprite(AtlasIds.GUI, Identifier.parse(texId)))); }
- public static final MutableComponent gui(@NotNull Identifier texId) { return literal("").append(object(new AtlasSprite(AtlasIds.GUI, texId))); }
- // --------------------------------------------------
- public static final MutableComponent sign(@NotNull String texId) { return literal("").append(object(new AtlasSprite(AtlasIds.SIGNS, Identifier.parse(texId)))); }
- public static final MutableComponent sign(@NotNull Identifier texId) { return literal("").append(object(new AtlasSprite(AtlasIds.SIGNS, texId))); }
- // --------------------------------------------------
- public static final MutableComponent head(@NotNull UUID uuid) { return literal("").append(object(new PlayerSprite(ResolvableProfile.createUnresolved(uuid), true))); }
- public static final MutableComponent head(@NotNull String username) { return literal("").append(object(new PlayerSprite(ResolvableProfile.createUnresolved(username), true))); }
// ==================================================
}
diff --git a/src/main/java/com/thecsdev/commonmc/world/sandbox/SandboxLevel.java b/src/main/java/com/thecsdev/commonmc/world/sandbox/SandboxLevel.java
index 7ac52d9..dab8a71 100644
--- a/src/main/java/com/thecsdev/commonmc/world/sandbox/SandboxLevel.java
+++ b/src/main/java/com/thecsdev/commonmc/world/sandbox/SandboxLevel.java
@@ -122,7 +122,7 @@ public SandboxLevel(WritableLevelData properties, ResourceKey registryRef
public @Virtual @Override void playSeededSound(@Nullable Entity source, Entity entity, Holder sound, SoundSource category, float volume, float pitch, long speed) {}
public @Virtual @Override void explode(@Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, ExplosionInteraction explosionSourceType, ParticleOptions smallParticle, ParticleOptions largeParticle, WeightedList blockParticles, Holder soundEvent) {}
public @Virtual @Override String gatherChunkSourceStats() {
- return "Chunks[C] W: " + getChunkSource().gatherStats() + " E: " + this.entityManager.gatherStats();
+ return "Chunks[C] W: " + getChunkSource().gatherStats() + " E: " + this.entityManager.gatherStats();
}
public @Virtual @Override void setRespawnData(LevelData.RespawnData spawnPoint) {}
public @Virtual @Override LevelData.RespawnData getRespawnData() { return getLevelData().getRespawnData(); }
diff --git a/src/main/resources/assets/tcdcommons/lang/bs_ba.json b/src/main/resources/assets/tcdcommons/lang/bs_ba.json
new file mode 100644
index 0000000..83cb857
--- /dev/null
+++ b/src/main/resources/assets/tcdcommons/lang/bs_ba.json
@@ -0,0 +1,42 @@
+{
+ "modmenu.nameTranslation.tcdcommons": "TCDCommons API",
+ "modmenu.summaryTranslation.tcdcommons": "TheCSDev-ova lična biblioteka za modovanje Minecraft-a.",
+
+ "tcdcommons.config.common": "Klijent/server postavke",
+ "tcdcommons.config.client": "Klijent postavke",
+ "tcdcommons.config.client.update_item_groups_on_join": "Ažuriraj grupe predmeta pri pridruživanju",
+ "tcdcommons.config.client.update_item_groups_on_join.tooltip": "Funkcija za poboljšanje performanse. Vanilla igra ažurira grupe predmeta prilikom otvaranja inventara, što uzrokuje lag kod velikih modpack-ova. Ova funkcija izvršava tu radnju tokom ekrana učitavanja, tako da se lag ne pojavljuje tokom igre.",
+ "tcdcommons.config.server": "Server postavke",
+ "tcdcommons.config.property_value": "Vrijednost",
+
+ "tcdcommons.stat_type.minecraft.custom": "Uopšteno",
+ "tcdcommons.stat_type.minecraft.killed": "Ubijeno",
+ "tcdcommons.stat_type.minecraft.killed_by": "Ubilo te",
+ "tcdcommons.stat_type.morestats.damaged": "Nanesena šteta",
+ "tcdcommons.stat_type.morestats.damaged_by": "Primljena šteta",
+ "tcdcommons.stat_type.morestats.totem_popped_by": "Potrošeni totemi zbog",
+
+ "tcdcommons.gui.screen.text_dialog.default_title": "Dijalog",
+ "tcdcommons.gui.screen.text_dialog.error_title": "Nešto je pošlo po zlu",
+
+ "tcdcommons.gui.dropdown.default_label": "Izaberi opciju...",
+
+ "tcdcommons.gui.filechooser.mode.explore": "Pregled datoteka",
+ "tcdcommons.gui.filechooser.mode.choose_file": "Izaberi datoteku",
+ "tcdcommons.gui.filechooser.mode.create_file": "Kreiraj datoteku",
+ "tcdcommons.gui.filechooser.quick_access": "Brzi pristup",
+ "tcdcommons.gui.filechooser.quick_access.mount_points": "Tačke montiranja",
+ "tcdcommons.gui.filechooser.ctxmenu.select": "Izaberi",
+ "tcdcommons.gui.filechooser.ctxmenu.open": "Otvori",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with": "Otvori pomoću",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app": "Povezana aplikacija",
+ "tcdcommons.gui.filechooser.action.file_name": "Naziv datoteke",
+ "tcdcommons.gui.filechooser.action.file_type": "Vrsta datoteke",
+
+ "tcdcommons.misc.loading": "Učitavanje...",
+ "tcdcommons.misc.something_went_wrong": "Nešto je pošlo po zlu",
+ "tcdcommons.misc.coming_soon": "Dolazi uskoro",
+ "tcdcommons.misc.preview": "Pregled",
+ "tcdcommons.misc.from": "Od",
+ "tcdcommons.misc.to": "Do"
+}
diff --git a/src/main/resources/assets/tcdcommons/lang/de_de.json b/src/main/resources/assets/tcdcommons/lang/de_de.json
new file mode 100644
index 0000000..6e591c6
--- /dev/null
+++ b/src/main/resources/assets/tcdcommons/lang/de_de.json
@@ -0,0 +1,42 @@
+{
+ "modmenu.nameTranslation.tcdcommons": "TCDCommons API",
+ "modmenu.summaryTranslation.tcdcommons": "TheCSDev's Persönliche Minecraft-Modding-Bibliothek.",
+
+ "tcdcommons.config.common": "Klient/Server Eigenschaften",
+ "tcdcommons.config.client": "Klient Eigenschaften",
+ "tcdcommons.config.client.update_item_groups_on_join": "Artikelgruppen beim Betritt aktualisieren",
+ "tcdcommons.config.client.update_item_groups_on_join.tooltip": "Leistungs-Funktion. Das Basisspiel aktualisiert beim Öffnen des Inventars die Item-Gruppen, was bei größeren Modpacks zur einer Verzögerungsspitze führen kann. Diese Funktion führt den Vorgang während des Ladebildschirms aus, damit es im Spiel nicht zum Verzögern auftretet.",
+ "tcdcommons.config.server": "Server Eigenschaften",
+ "tcdcommons.config.property_value": "Wert",
+
+ "tcdcommons.stat_type.minecraft.custom": "Allgemein",
+ "tcdcommons.stat_type.minecraft.killed": "Getötet",
+ "tcdcommons.stat_type.minecraft.killed_by": "Getötet an",
+ "tcdcommons.stat_type.morestats.damaged": "Schaden verursacht",
+ "tcdcommons.stat_type.morestats.damaged_by": "Schaden erlitten",
+ "tcdcommons.stat_type.morestats.totem_popped_by": "Totems Ausgelöst von",
+
+ "tcdcommons.gui.screen.text_dialog.default_title": "Dialog",
+ "tcdcommons.gui.screen.text_dialog.error_title": "Etwas ist schiefaufgelaufen",
+
+ "tcdcommons.gui.dropdown.default_label": "Wähle eine Option...",
+
+ "tcdcommons.gui.filechooser.mode.explore": "Datei-Explorer",
+ "tcdcommons.gui.filechooser.mode.choose_file": "Datei auswählen",
+ "tcdcommons.gui.filechooser.mode.create_file": "Datei erstellen",
+ "tcdcommons.gui.filechooser.quick_access": "Schnellzugriff",
+ "tcdcommons.gui.filechooser.quick_access.mount_points": "Einhängepunkte",
+ "tcdcommons.gui.filechooser.ctxmenu.select": "Auswählen",
+ "tcdcommons.gui.filechooser.ctxmenu.open": "Öffnen",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with": "Öffnen mit",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app": "Zugehörige Anwendung",
+ "tcdcommons.gui.filechooser.action.file_name": "Dateiname",
+ "tcdcommons.gui.filechooser.action.file_type": "Dateityp",
+
+ "tcdcommons.misc.loading": "Wird Geladen...",
+ "tcdcommons.misc.something_went_wrong": "Etwas ist schiefaufgelaufen",
+ "tcdcommons.misc.coming_soon": "Bald verfügbar",
+ "tcdcommons.misc.preview": "Vorschau",
+ "tcdcommons.misc.from": "Von",
+ "tcdcommons.misc.to": "Zu"
+}
diff --git a/src/main/resources/assets/tcdcommons/lang/docs/index.html b/src/main/resources/assets/tcdcommons/lang/docs/index.html
new file mode 100644
index 0000000..61b0cf1
--- /dev/null
+++ b/src/main/resources/assets/tcdcommons/lang/docs/index.html
@@ -0,0 +1,304 @@
+
+
+
+ TCDCommons API | Language documentation
+
+
+
+
+
+ Mod description for 'Mod Menu' Name and descriptions for this mod, that show up in Mod Menu .
+
+
modmenu.nameTranslation.tcdcommons
+ The display name of the mod within the 'Mod Menu' interface.
+
+
modmenu.summaryTranslation.tcdcommons
+ The summary description of the mod within the 'Mod Menu' interface.
+
+
+ Configurations/Settings related to this mod Language texts used when presenting the user with a GUI interface to configure this mod.
+
+
tcdcommons.config.common
+ Configuration section for common client and server properties.
+
+
tcdcommons.config.client
+ Configuration section for client-side properties.
+
+
tcdcommons.config.client.update_item_groups_on_join
+ Name of the "Update item groups on join" configuration property.
+
+
tcdcommons.config.client.update_item_groups_on_join.tooltip
+ Explanation for how "Update item groups on join" works.
+
+
tcdcommons.config.server
+ Configuration section for server-side properties.
+
+
tcdcommons.config.property_value
+ Generic word "Value" that shows up in configuration GUIs to indicate the value of a given property.
+
+
+ Stat types
+ A "stat type" refers to a "type" of statistic the game tracks for a given player. Examples include "Times used", "Times mined",
+ "Times crafted", etc. Some stat types are related to items, some to entities, and some to something else. Each stat type
+ is related to a certain aspect of the game.
+
+
+
tcdcommons.stat_type.minecraft.custom
+ Name of the
minecraft:custom stat type.
+ This stat type refers to "General" statistics (ex. "Distance walked", "Time since last death", etc.). Internally, the
+ game calls it "custom" in its code, but we players call it "General" in font-end GUIs.
+
+
tcdcommons.stat_type.minecraft.killed
+ Name of the
minecraft:killed stat type.
+ This stat type is for tracking how many of a given entity a player killed.
+
+
tcdcommons.stat_type.minecraft.killed_by
+ Name of the
minecraft:killed_by stat type.
+ This stat type is for tracking how many times a player got killed by a given entity.
+
+
tcdcommons.stat_type.morestats.damaged
+ Name of the
morestats:damaged stat type.
+ This stat type is for tracking how much damage a player dealt to a given entity.
+
+
tcdcommons.stat_type.morestats.damaged_by
+ Name of the
morestats:damaged_by stat type.
+ This stat type is for tracking how much damage a given entity dealt to a player.
+
+
tcdcommons.stat_type.morestats.totem_popped_by
+ Name of the
morestats:totem_popped_by stat type.
+ This stat type is for tracking how many times a given entity caused a player to use their totem of undying.
+
+
+ GUI textual dialog
+ This API mod offers mod developers a GUI textual dialog they could use to display messages on screen in dialog form.
+ This "template" dialog has some default texts associated with it.
+
+
+
tcdcommons.gui.screen.text_dialog.default_title
+ Default title for textual dialogs. This text is used as dialog title only if a mod developer does not assign a
+ name themselves.
+
+
tcdcommons.gui.screen.text_dialog.error_title
+ This text is used as title of textual dialogs that display error information on screen. For example you could
+ have a textual dialog appear with title "Something went wrong" and then the contents of the dialog explain
+ what exactly went wrong.
+
+
+ GUI dropdown widget
+ This API mod offers a GUI dropdown widget that other mod developers could use to then display dropdowns that allow
+ users to select an option from a list of options.
+
+
+
tcdcommons.gui.dropdown.default_label
+ Default placeholder text for when a dropdown widget does not have an option selected yet.
+ Here is what that (sort of) looks like in practice:
+
+ Select an option...
+ Option 1
+ Option 2
+ Option 3
+
+ That "Select an option..." is the placeholder text this translation key is for.
+
+
+ GUI File chooser / File explorer
+ This API mod offers mod developers a GUI file explorer they could use to have the user select/open/create files
+ on their machine. Think of it like an in-game implementation of explorer.exe.
+
+
tcdcommons.gui.filechooser.mode.explore
+ The text that appears in the title-bar (top left side of the in-game file explorer dialog), when the file explorer
+ is in "explore" mode.
+ In this mode, the file explorer is just that. It lets the user interact with their files without prompting them
+ to select or create one.
+
+
tcdcommons.gui.filechooser.mode.choose_file
+ The text that appears in the title-bar (top left side of the in-game file explorer dialog), when the file explorer
+ is in "choose a file" mode.
+ In this mode, the file explorer prompts the user to choose an existing file from their device. Usually done when
+ opening/loading files from disk.
+
+
tcdcommons.gui.filechooser.mode.create_file
+ The text that appears in the title-bar (top left side of the in-game file explorer dialog), when the file explorer
+ is in "create a file" mode.
+ In this mode, the file explorer prompts the user to choose where a new file will be created and what said file's name
+ will be. Usually done when saving files to disk.
+
+
tcdcommons.gui.filechooser.quick_access
+ On the left side of the file explorer, the "Quick access" section that contains useful shortcuts to quickly navigate
+ to specific directories.
+
+
tcdcommons.gui.filechooser.quick_access.mount_points
+ Below the "Quick access" section, there's another section of shortcuts, this time featuring "mount points" aka
+ external storage disks (like
D:/,
E:/,
F:/,
G:/, etc.).
+
+
tcdcommons.gui.filechooser.ctxmenu.select
+ When the user right-clicks a file, a context menu appears. This is the "Select" option that may appear
+ in that context menu.
+ It selects a given file.
+
+
tcdcommons.gui.filechooser.ctxmenu.open
+ When the user right-clicks a file, a context menu appears. This is the "Open" option that may appear
+ in that context menu.
+ It opens a given file.
+
+
tcdcommons.gui.filechooser.ctxmenu.open_with
+ When the user right-clicks a file, a context menu appears. This is the "Open in" option that may appear
+ in that context menu.
+ It brings up another context menu prompting the user to select where they wish to open a given file.
+
+
tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app
+ When the user right-clicks a file and then clicks on "Open in", this option may appear.
+ When clicked, the file is opened with the default installed program that handles files of that type.
+
+
tcdcommons.gui.filechooser.action.file_name
+ File name field label or column header.
+
+
tcdcommons.gui.filechooser.action.file_type
+ File type field label or column header.
+
+
+ Miscellaneous Miscellaneous texts, usually simple generic words and short phrases that could be used anywhere in any context.
+
+
tcdcommons.misc.loading
+ Generic loading indicator.
+
+
tcdcommons.misc.something_went_wrong
+ Generic "Something went wrong" label.
+
+
tcdcommons.misc.coming_soon
+ Generic "Coming soon" label.
+
+
tcdcommons.misc.preview
+ Generic word "Preview".
+
+
tcdcommons.misc.from
+ Generic word "For".
+
+
tcdcommons.misc.to
+ Generic word "To".
+
+
+
diff --git a/src/main/resources/assets/tcdcommons/lang/pl_pl.json b/src/main/resources/assets/tcdcommons/lang/pl_pl.json
new file mode 100644
index 0000000..09df5e9
--- /dev/null
+++ b/src/main/resources/assets/tcdcommons/lang/pl_pl.json
@@ -0,0 +1,42 @@
+{
+ "modmenu.nameTranslation.tcdcommons": "TCDCommons API",
+ "modmenu.summaryTranslation.tcdcommons": "Personalna biblioteka TheCSDev do tworzenia modów do Minecrafta.",
+
+ "tcdcommons.config.common": "Ustawienia klienta/serwera",
+ "tcdcommons.config.client": "Ustawienia klienta",
+ "tcdcommons.config.client.update_item_groups_on_join": "Aktualizuj grupy przedmiotów po dołączeniu",
+ "tcdcommons.config.client.update_item_groups_on_join.tooltip": "Funkcja poprawiająca wydajność. Domyślna gra aktualizuje grupy przedmiotów podczas otwierania ekwipunku, co powoduje chwilowe przycięcie na dużych paczkach modów. Ta funkcja wykonuje tą operację podczas ekranu ładowania, dzięki czemu przycięcie nie występuje podczas rozgrywki.",
+ "tcdcommons.config.server": "Ustawienia Serwera",
+ "tcdcommons.config.property_value": "Wartość",
+
+ "tcdcommons.stat_type.minecraft.custom": "Ogólne",
+ "tcdcommons.stat_type.minecraft.killed": "Zabito",
+ "tcdcommons.stat_type.minecraft.killed_by": "Zabity przez",
+ "tcdcommons.stat_type.morestats.damaged": "Obrażenia zadane",
+ "tcdcommons.stat_type.morestats.damaged_by": "Obrażenia otrzymane",
+ "tcdcommons.stat_type.morestats.totem_popped_by": "Zużyte totemy przez",
+
+ "tcdcommons.gui.screen.text_dialog.default_title": "Dialog",
+ "tcdcommons.gui.screen.text_dialog.error_title": "Coś poszło nie tak",
+
+ "tcdcommons.gui.dropdown.default_label": "Wybierz opcję...",
+
+ "tcdcommons.gui.filechooser.mode.explore": "Eksplorator plików",
+ "tcdcommons.gui.filechooser.mode.choose_file": "Wybierz plik",
+ "tcdcommons.gui.filechooser.mode.create_file": "Utwórz plik",
+ "tcdcommons.gui.filechooser.quick_access": "Szybki dostęp",
+ "tcdcommons.gui.filechooser.quick_access.mount_points": "Punkty montowania",
+ "tcdcommons.gui.filechooser.ctxmenu.select": "Wybierz",
+ "tcdcommons.gui.filechooser.ctxmenu.open": "Otwórz",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with": "Otwórz w",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app": "Powiązanej aplikacji",
+ "tcdcommons.gui.filechooser.action.file_name": "Nazwa pliku",
+ "tcdcommons.gui.filechooser.action.file_type": "Typ pliku",
+
+ "tcdcommons.misc.loading": "Ładowanie...",
+ "tcdcommons.misc.something_went_wrong": "Coś poszło nie tak",
+ "tcdcommons.misc.coming_soon": "Wkrótce",
+ "tcdcommons.misc.preview": "Podgląd",
+ "tcdcommons.misc.from": "Od",
+ "tcdcommons.misc.to": "Do"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tcdcommons/lang/ru_ru.json b/src/main/resources/assets/tcdcommons/lang/ru_ru.json
new file mode 100644
index 0000000..c0c4b87
--- /dev/null
+++ b/src/main/resources/assets/tcdcommons/lang/ru_ru.json
@@ -0,0 +1,42 @@
+{
+ "modmenu.nameTranslation.tcdcommons" : "TCDCommons API",
+ "modmenu.summaryTranslation.tcdcommons" : "Персональная библиотека для моддинга Minecraft от TheCSDev.",
+
+ "tcdcommons.config.common" : "Настройки клиента и сервера",
+ "tcdcommons.config.client" : "Настройки клиента",
+ "tcdcommons.config.client.update_item_groups_on_join" : "Обновлять группы предметов при входе",
+ "tcdcommons.config.client.update_item_groups_on_join.tooltip" : "Функция оптимизации быстродействия. Ванильная версия игры обновляет группы предметов при открытии инвентаря, что вызывает скачки задержки в крупных сборках модов. Эта функция выполняет данную операцию во время отображения экранов загрузки, что позволяет избежать просадок производительности в игровом процессе.",
+ "tcdcommons.config.server" : "Настройки сервера",
+ "tcdcommons.config.property_value" : "Значение",
+
+ "tcdcommons.stat_type.minecraft.custom" : "Общие",
+ "tcdcommons.stat_type.minecraft.killed" : "Убийств",
+ "tcdcommons.stat_type.minecraft.killed_by" : "Погиб от",
+ "tcdcommons.stat_type.morestats.damaged" : "Нанесённый урон",
+ "tcdcommons.stat_type.morestats.damaged_by" : "Полученный урон",
+ "tcdcommons.stat_type.morestats.totem_popped_by" : "Использовано тотемов бессмертия от",
+
+ "tcdcommons.gui.screen.text_dialog.default_title" : "Диалог",
+ "tcdcommons.gui.screen.text_dialog.error_title" : "Произошла ошибка",
+
+ "tcdcommons.gui.dropdown.default_label" : "Выберите вариант...",
+
+ "tcdcommons.gui.filechooser.mode.explore" : "Проводник",
+ "tcdcommons.gui.filechooser.mode.choose_file" : "Выбор файла",
+ "tcdcommons.gui.filechooser.mode.create_file" : "Создание файла",
+ "tcdcommons.gui.filechooser.quick_access" : "Быстрый доступ",
+ "tcdcommons.gui.filechooser.quick_access.mount_points" : "Точки монтирования",
+ "tcdcommons.gui.filechooser.ctxmenu.select" : "Выбрать",
+ "tcdcommons.gui.filechooser.ctxmenu.open" : "Открыть",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with" : "Открыть с помощью",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app" : "Ассоциированное приложение",
+ "tcdcommons.gui.filechooser.action.file_name" : "Имя файла",
+ "tcdcommons.gui.filechooser.action.file_type" : "Тип файла",
+
+ "tcdcommons.misc.loading" : "Загрузка...",
+ "tcdcommons.misc.something_went_wrong" : "Что-то пошло не так",
+ "tcdcommons.misc.coming_soon" : "Ожидается в будущем",
+ "tcdcommons.misc.preview" : "Предпросмотр",
+ "tcdcommons.misc.from" : "От",
+ "tcdcommons.misc.to" : "До"
+}
diff --git a/src/main/resources/assets/tcdcommons/lang/zh_cn.json b/src/main/resources/assets/tcdcommons/lang/zh_cn.json
index dfb8afa..b2496d7 100644
--- a/src/main/resources/assets/tcdcommons/lang/zh_cn.json
+++ b/src/main/resources/assets/tcdcommons/lang/zh_cn.json
@@ -1,20 +1,20 @@
{
"modmenu.nameTranslation.tcdcommons": "TCDCommons API",
- "modmenu.summaryTranslation.tcdcommons": "TheCSDev's personal Minecraft modding library.",
+ "modmenu.summaryTranslation.tcdcommons": "TheCSDev 的个人 Minecraft 模组开发库。",
"tcdcommons.config.common": "客户端/服务端属性",
"tcdcommons.config.client": "客户端属性",
"tcdcommons.config.client.update_item_groups_on_join": "加入游戏时更新物品组",
"tcdcommons.config.client.update_item_groups_on_join.tooltip": "性能优化功能。原版游戏在打开物品栏时更新物品组，这在大型模组包中会导致卡顿。此功能在加载界面期间执行该操作，使游戏内不再会因此发生卡顿。",
"tcdcommons.config.server": "服务端属性",
- "tcdcommons.config.property_value": "Value",
+ "tcdcommons.config.property_value": "值",
- "tcdcommons.stat_type.minecraft.custom": "General",
+ "tcdcommons.stat_type.minecraft.custom": "通用",
"tcdcommons.stat_type.minecraft.killed": "击杀",
"tcdcommons.stat_type.minecraft.killed_by": "被击杀",
"tcdcommons.stat_type.morestats.damaged": "造成伤害",
"tcdcommons.stat_type.morestats.damaged_by": "受到伤害",
- "tcdcommons.stat_type.morestats.totem_popped_by": "触发图腾",
+ "tcdcommons.stat_type.morestats.totem_popped_by": "触发不死图腾",
"tcdcommons.gui.screen.text_dialog.default_title": "对话框",
"tcdcommons.gui.screen.text_dialog.error_title": "出现错误",
@@ -22,21 +22,21 @@
"tcdcommons.gui.dropdown.default_label": "选择一个选项……",
"tcdcommons.gui.filechooser.mode.explore": "文件浏览器",
- "tcdcommons.gui.filechooser.mode.choose_file": "先择文件",
+ "tcdcommons.gui.filechooser.mode.choose_file": "选择文件",
"tcdcommons.gui.filechooser.mode.create_file": "创建文件",
"tcdcommons.gui.filechooser.quick_access": "快速访问",
"tcdcommons.gui.filechooser.quick_access.mount_points": "设备和驱动器",
"tcdcommons.gui.filechooser.ctxmenu.select": "选择",
"tcdcommons.gui.filechooser.ctxmenu.open": "打开",
"tcdcommons.gui.filechooser.ctxmenu.open_with": "打开方式",
- "tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app": "关联的应用程序",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app": "关联应用",
"tcdcommons.gui.filechooser.action.file_name": "文件名",
"tcdcommons.gui.filechooser.action.file_type": "文件类型",
"tcdcommons.misc.loading": "加载中……",
"tcdcommons.misc.something_went_wrong": "出现错误",
- "tcdcommons.misc.coming_soon": "即将到来",
- "tcdcommons.misc.preview": "Preview",
- "tcdcommons.misc.from": "From",
- "tcdcommons.misc.to": "To"
-}
+ "tcdcommons.misc.coming_soon": "即将推出",
+ "tcdcommons.misc.preview": "预览",
+ "tcdcommons.misc.from": "从",
+ "tcdcommons.misc.to": "到"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tcdcommons/lang/zh_tw.json b/src/main/resources/assets/tcdcommons/lang/zh_tw.json
new file mode 100644
index 0000000..bdff6ae
--- /dev/null
+++ b/src/main/resources/assets/tcdcommons/lang/zh_tw.json
@@ -0,0 +1,42 @@
+{
+ "modmenu.nameTranslation.tcdcommons": "TCDCommons API",
+ "modmenu.summaryTranslation.tcdcommons": "TheCSDev 的個人 Minecraft 模組開發庫。",
+
+ "tcdcommons.config.common": "用戶端／伺服器端屬性",
+ "tcdcommons.config.client": "用戶端屬性",
+ "tcdcommons.config.client.update_item_groups_on_join": "加入遊戲時更新物品組",
+ "tcdcommons.config.client.update_item_groups_on_join.tooltip": "效能最佳化功能。原版遊戲在開啟物品欄時更新物品組，這在大型模組包中會導致延遲。此功能在載入畫面期間執行該操作，使遊戲內不再因此發生卡頓。",
+ "tcdcommons.config.server": "伺服器端屬性",
+ "tcdcommons.config.property_value": "值",
+
+ "tcdcommons.stat_type.minecraft.custom": "一般",
+ "tcdcommons.stat_type.minecraft.killed": "擊殺",
+ "tcdcommons.stat_type.minecraft.killed_by": "被擊殺",
+ "tcdcommons.stat_type.morestats.damaged": "造成傷害",
+ "tcdcommons.stat_type.morestats.damaged_by": "受到傷害",
+ "tcdcommons.stat_type.morestats.totem_popped_by": "觸發不死圖騰",
+
+ "tcdcommons.gui.screen.text_dialog.default_title": "對話框",
+ "tcdcommons.gui.screen.text_dialog.error_title": "發生錯誤",
+
+ "tcdcommons.gui.dropdown.default_label": "選擇一個選項……",
+
+ "tcdcommons.gui.filechooser.mode.explore": "檔案瀏覽器",
+ "tcdcommons.gui.filechooser.mode.choose_file": "選取檔案",
+ "tcdcommons.gui.filechooser.mode.create_file": "建立檔案",
+ "tcdcommons.gui.filechooser.quick_access": "快速存取",
+ "tcdcommons.gui.filechooser.quick_access.mount_points": "裝置和磁碟機",
+ "tcdcommons.gui.filechooser.ctxmenu.select": "選取",
+ "tcdcommons.gui.filechooser.ctxmenu.open": "開啟",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with": "開啟方式",
+ "tcdcommons.gui.filechooser.ctxmenu.open_with.assoc_app": "關聯應用程式",
+ "tcdcommons.gui.filechooser.action.file_name": "檔案名稱",
+ "tcdcommons.gui.filechooser.action.file_type": "檔案類型",
+
+ "tcdcommons.misc.loading": "載入中……",
+ "tcdcommons.misc.something_went_wrong": "發生錯誤",
+ "tcdcommons.misc.coming_soon": "即將推出",
+ "tcdcommons.misc.preview": "預覽",
+ "tcdcommons.misc.from": "從",
+ "tcdcommons.misc.to": "到"
+}
\ No newline at end of file
diff --git a/src/main/resources/tcdcommons.client.mixin.hooks.json b/src/main/resources/tcdcommons.client.mixin.hooks.json
index 08150e7..99fa94e 100644
--- a/src/main/resources/tcdcommons.client.mixin.hooks.json
+++ b/src/main/resources/tcdcommons.client.mixin.hooks.json
@@ -4,10 +4,10 @@
"minVersion": "0.8",
"compatibilityLevel": "JAVA_25",
"injectors": { "defaultRequire": 1 },
- "client": [
+ "client":
+ [
"AccessorGuiGraphicsExtractor",
"AccessorGameRenderer",
- "AccessorGuiRenderer",
"AccessorNativeImage",
"AccessorScreen",
"AccessorTElement",