Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ org.gradle.daemon=false
org.gradle.caching=true

# Dependencies
cyclopscore_version=1.25.5-974
cyclopscore_version=1.29.0-984
integrateddynamics_version=1.24.1-1707
integratedterminalscompat_version=1.0.0-162
integratedcrafting_version=1.1.13-545
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.RenderPipelines;
import net.minecraft.network.chat.Component;
import org.cyclops.cyclopscore.client.gui.GuiGraphicsExtended;
import org.cyclops.cyclopscore.helper.IGuiHelpers;
import org.cyclops.cyclopscore.helper.IModHelpers;
import org.cyclops.integratedterminals.api.ingredient.IIngredientComponentTerminalStorageHandlerClient;
Expand Down Expand Up @@ -53,8 +52,12 @@ public void drawInstance(GuiGraphicsExtractor guiGraphics, Long instance, long m
16, 240, IGuiHelpers.ProgressDirection.UP, progressScaled, progressMaxScaled);

// Draw amount
GuiGraphicsExtended renderItem = new GuiGraphicsExtended(guiGraphics);
renderItem.drawSlotText(Minecraft.getInstance().font, label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance), x, y);
float scale = 0.5f;
guiGraphics.pose().pushMatrix();
guiGraphics.pose().scale(scale, scale);
String amountLabel = label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance);
guiGraphics.text(Minecraft.getInstance().font, amountLabel, (int) ((x + 17) / scale - Minecraft.getInstance().font.width(amountLabel)), (int) ((y + 12) / scale), -1, true);
guiGraphics.pose().popMatrix();
} else {
IModHelpers.get().getGuiHelpers().renderTooltip(gui, guiGraphics, x, y, IModHelpers.get().getGuiHelpers().getSlotSizeInner(), IModHelpers.get().getGuiHelpers().getSlotSizeInner(),
mouseX, mouseY, () -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.Style;
import net.neoforged.neoforge.fluids.FluidStack;
import org.cyclops.cyclopscore.client.gui.GuiGraphicsExtended;
import org.cyclops.cyclopscore.helper.IModHelpers;
import org.cyclops.cyclopscore.helper.IModHelpersNeoForge;
import org.cyclops.integratedterminals.api.ingredient.IIngredientComponentTerminalStorageHandlerClient;
Expand Down Expand Up @@ -43,8 +42,12 @@ public void drawInstance(GuiGraphicsExtractor guiGraphics, FluidStack instance,
IModHelpersNeoForge.get().getGuiHelpers().renderFluidSlot(guiGraphics, instance, x, y);

// Draw amount
GuiGraphicsExtended renderItem = new GuiGraphicsExtended(guiGraphics);
renderItem.drawSlotText(Minecraft.getInstance().font, label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance.getAmount()), x, y);
float scale = 0.5f;
guiGraphics.pose().pushMatrix();
guiGraphics.pose().scale(scale, scale);
String amountLabel = label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance.getAmount());
guiGraphics.text(Minecraft.getInstance().font, amountLabel, (int) ((x + 17) / scale - Minecraft.getInstance().font.width(amountLabel)), (int) ((y + 12) / scale), -1, true);
guiGraphics.pose().popMatrix();
} else {
IModHelpers.get().getGuiHelpers().renderTooltip(gui, guiGraphics, x, y, IModHelpers.get().getGuiHelpers().getSlotSizeInner(), IModHelpers.get().getGuiHelpers().getSlotSizeInner(), mouseX, mouseY, () -> {
List<Component> lines = Lists.newArrayList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import net.minecraft.network.chat.Component;
import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
import org.cyclops.cyclopscore.client.gui.GuiGraphicsExtended;
import org.cyclops.cyclopscore.helper.IModHelpers;
import org.cyclops.integratedterminals.api.ingredient.IIngredientComponentTerminalStorageHandler;
import org.cyclops.integratedterminals.api.terminalstorage.ITerminalStorageTabClient;
Expand Down Expand Up @@ -72,8 +71,12 @@ public HandlerWrappedTerminalCraftingOption<T> getCraftingOption() {
}

private void drawCraftLabel(GuiGraphicsExtractor guiGraphics, int x, int y) {
new GuiGraphicsExtended(guiGraphics).drawSlotText(Minecraft.getInstance().font,
ChatFormatting.GOLD + IModHelpers.get().getL10NHelpers().localize("gui.integratedterminals.terminal_storage.craft"), x, y - 11);
String text = ChatFormatting.GOLD + IModHelpers.get().getL10NHelpers().localize("gui.integratedterminals.terminal_storage.craft");
float scale = 0.5f;
guiGraphics.pose().pushMatrix();
guiGraphics.pose().scale(scale, scale);
guiGraphics.text(Minecraft.getInstance().font, text, (int) ((x + 17) / scale - Minecraft.getInstance().font.width(text)), (int) ((y + 1) / scale), -1, true);
guiGraphics.pose().popMatrix();
}

}
Loading