This commit is contained in:
glowredman authored and GitHub committed 2024-12-29 19:51:31 -06:00
1 parent 4a39cf4ece
commit 0df88f2305
63 files changed
+123 -187

No files matched your search

@@ -218,7 +218,8 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
}
@Override
public void updateSetting(IConfigManager manager, Enum settingName, Enum newValue) {}
public void updateSetting(IConfigManager manager, @SuppressWarnings("rawtypes") Enum settingName,
@SuppressWarnings("rawtypes") Enum newValue) {}
@Override
public void onFluidInventoryChanged(IAEFluidTank inventory, int slot) {
@@ -3,6 +3,7 @@ package com.glodblock.github.util;
import java.util.Comparator;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import com.glodblock.github.common.item.ItemFluidDrop;
@@ -20,16 +21,20 @@ public class FluidSorters {
@Override
public int compare(final IAEItemStack o1, final IAEItemStack o2) {
final Fluid f1 = ItemFluidDrop.getAeFluidStack(o1).getFluid();
final Fluid f2 = ItemFluidDrop.getAeFluidStack(o2).getFluid();
final FluidStack fs1 = ItemFluidDrop.getAeFluidStack(o1).getFluidStack();
final FluidStack fs2 = ItemFluidDrop.getAeFluidStack(o2).getFluidStack();
final Fluid f1 = fs1.getFluid();
final Fluid f2 = fs2.getFluid();
if (getDirection() == SortDir.ASCENDING) {
return this
.secondarySort(Util.getFluidModName(f2).compareToIgnoreCase(Util.getFluidModName(f1)), f1, f2);
return this.secondarySort(
Util.getFluidModName(f2).compareToIgnoreCase(Util.getFluidModName(f1)),
fs1,
fs2);
}
return this.secondarySort(Util.getFluidModName(f1).compareToIgnoreCase(Util.getFluidModName(f2)), f2, f1);
return this.secondarySort(Util.getFluidModName(f1).compareToIgnoreCase(Util.getFluidModName(f2)), fs2, fs1);
}
private int secondarySort(final int compareToIgnoreCase, final Fluid f1, final Fluid f2) {
private int secondarySort(final int compareToIgnoreCase, final FluidStack f1, final FluidStack f2) {
if (compareToIgnoreCase == 0) {
return f2.getLocalizedName().compareToIgnoreCase(f1.getLocalizedName());
}
@@ -73,7 +73,6 @@ public final class RenderUtil {
}
}
@SuppressWarnings("unchecked")
public static List<String> listFormattedStringToWidth(String str) {
return Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(str, 150);
}
@@ -287,8 +287,9 @@ public final class Util {
}
}
@SuppressWarnings("deprecation")
public static ModContainer getFluidMod(Fluid fluid) {
return GameData.findModOwner(String.format("%s:%s", getFluidModID(fluid), fluid.getName()));
return GameData.findModOwner(FluidRegistry.getDefaultFluidName(fluid));
}
public static int getFluidID(Fluid fluid) {