Skip to content

Commit

Permalink
fix crash with latest NCO (#109)
Browse files Browse the repository at this point in the history
  • Loading branch information
Wizzerinus authored Sep 4, 2024
1 parent b5fccce commit be36da6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ dependencies {
compileOnly "curse.maven:lightningcraft-237422:2872478"
compileOnly 'curse.maven:mcmultipart-239431:2615930'
compileOnly 'curse.maven:mekanism-268560:2835175'
compileOnly 'curse.maven:nuclearcraft-overhauled-336895:3386487' // Not very latest, requires Forge 2860
compileOnly 'curse.maven:qmd-362056:3662442'
compileOnly 'curse.maven:nuclearcraft-overhauled-336895:5446445'
compileOnly 'curse.maven:qmd-362056:5681949'
compileOnly 'curse.maven:thaumcraft-223628:2629023'
compileOnly 'curse.maven:thaumic-jei-285492:2705304'
compileOnly 'curse.maven:prodigy-tech-297414:2769520'
Expand All @@ -109,6 +109,9 @@ dependencies {
compileOnly 'curse.maven:mystical-mechanics-300742:3006392'
compileOnly 'me.desht.pneumaticcraft:pneumaticcraft-repressurized:1.12.2-0.11.9-384'
compileOnly 'hellfirepvp.astralsorcery:astralsorcery:1.12.2-1.10.23-v161'

runtimeOnly 'com.cleanroommc:strip-latest-forge-requirements:1.0'

}

def at = file("${projectDir}/src/main/resources/multiblocked_at.cfg")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
import lach_01298.qmd.particle.Particle;
import lach_01298.qmd.particle.ParticleStack;
import lach_01298.qmd.util.Units;
import nc.util.Lang;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import org.lwjgl.opengl.GL11;

public class ParticleStackWidget extends ContentWidget<ParticleStack> {

@Override
protected void onContentUpdate() {
if (Multiblocked.isClient() && content != null) {
String tips = Lang.localise(content.getParticle().getUnlocalizedName()) + '\n' +
TextFormatting.YELLOW + Lang.localise("gui.qmd.particlestack.amount", Units.getSIFormat(content.getAmount(), "pu")) + '\n' +
TextFormatting.DARK_GREEN + Lang.localise("gui.qmd.particlestack.mean_energy", Units.getParticleEnergy(content.getMeanEnergy())) + '\n' +
TextFormatting.RED + Lang.localise("gui.qmd.particlestack.focus", Units.getSIFormat(content.getFocus(), ""));
String tips = I18n.translateToLocal(content.getParticle().getUnlocalizedName()) + '\n' +
TextFormatting.YELLOW + I18n.translateToLocalFormatted("gui.qmd.particlestack.amount", Units.getSIFormat(content.getAmount(), "pu")) + '\n' +
TextFormatting.DARK_GREEN + I18n.translateToLocalFormatted("gui.qmd.particlestack.mean_energy", Units.getParticleEnergy(content.getMeanEnergy())) + '\n' +
TextFormatting.RED + I18n.translateToLocalFormatted("gui.qmd.particlestack.focus", Units.getSIFormat(content.getFocus(), ""));
this.setHoverTooltip(tips);
}
}
Expand Down

0 comments on commit be36da6

Please sign in to comment.