mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-16 18:44:42 +00:00
Cleanup (#253)
This commit is contained in:
1 parent
4a39cf4ece
commit
0df88f2305
63 files changed
+123
-187
No files matched your search
@@ -294,7 +294,6 @@ public class ItemReplacements {
|
||||
double idleDrain, int types) {
|
||||
if (replacement.isEnabled()) {
|
||||
ProxyItemStorageCell item = getOrBuildItemStorage();
|
||||
int meta = replacement.maybeStack(1).get().getItemDamage();
|
||||
ProxyItem.ProxyItemEntry storage = new ProxyItem.ProxyStorageEntry(
|
||||
replacement.maybeItem().get(),
|
||||
kilobytes,
|
||||
|
||||
@@ -55,7 +55,7 @@ public class ProxyItem extends FCBaseItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List info, boolean p_77624_4_) {
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List<String> info, boolean p_77624_4_) {
|
||||
int meta = stack.getItemDamage();
|
||||
ProxyItemEntry itemRepl = replacements.get(meta);
|
||||
if (itemRepl != null) {
|
||||
@@ -63,7 +63,7 @@ public class ProxyItem extends FCBaseItem {
|
||||
info.add(EnumChatFormatting.AQUA + itemRepl.replacement.getUnlocalizedName());
|
||||
info.add(EnumChatFormatting.GOLD + "Put in your inventory to get a replacement.");
|
||||
info.add(EnumChatFormatting.GOLD + "It will disappear if no replacement was found.");
|
||||
info.add(EnumChatFormatting.RED + "Report missing conversions on the Github.");
|
||||
info.add(EnumChatFormatting.RED + "Report missing conversions on the GitHub.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+5
-1
@@ -16,6 +16,10 @@ public class ProxyVoidStorageCell extends ItemVoidStorageCell {
|
||||
private final String name = AEApi.instance().definitions().items().cellVoid().maybeStack(1).get()
|
||||
.getUnlocalizedName();
|
||||
|
||||
public ProxyVoidStorageCell() {
|
||||
this.setUnlocalizedName("ec2placeholder.storage.physical.void");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> info,
|
||||
boolean displayMoreInfo) {
|
||||
@@ -23,7 +27,7 @@ public class ProxyVoidStorageCell extends ItemVoidStorageCell {
|
||||
info.add(EnumChatFormatting.AQUA + name);
|
||||
info.add(EnumChatFormatting.GOLD + "Put in your inventory to get a replacement.");
|
||||
info.add(EnumChatFormatting.GOLD + "It will disappear if no replacement was found.");
|
||||
info.add(EnumChatFormatting.RED + "Report missing conversions on the Github.");
|
||||
info.add(EnumChatFormatting.RED + "Report missing conversions on the GitHub.");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -48,11 +48,11 @@ public class Tooltip {
|
||||
public static String partFluidTerminalFluidFormat(FluidStack fs) {
|
||||
int fid = Util.getFluidID(fs.getFluid());
|
||||
if (fid == -1) {
|
||||
return fs.getFluid().getLocalizedName();
|
||||
return fs.getLocalizedName();
|
||||
} else if (Minecraft.getMinecraft().gameSettings.advancedItemTooltips) {
|
||||
return String.format("%s (#%s) %s", fs.getFluid().getLocalizedName(), fid, fid);
|
||||
return String.format("%s (#%s) %s", fs.getLocalizedName(), fid, fid);
|
||||
} else {
|
||||
return String.format("%s %s", fs.getFluid().getLocalizedName(), fid);
|
||||
return String.format("%s %s", fs.getLocalizedName(), fid);
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -28,7 +28,7 @@ public class FluidInvWailaDataProvider extends BasePartWailaDataProvider {
|
||||
for (int i = 0; i < fluidInventory.getSlots(); i++) {
|
||||
FluidStack fs = fluidInventory.getFluidStackInSlot(i);
|
||||
if (fs == null) continue;
|
||||
currentToolTip.add(Tooltip.fluidFormat(fs.getFluid().getLocalizedName(), fs.amount));
|
||||
currentToolTip.add(Tooltip.fluidFormat(fs.getLocalizedName(), fs.amount));
|
||||
}
|
||||
}
|
||||
return currentToolTip;
|
||||
|
||||
+3
-1
@@ -27,7 +27,9 @@ public class FluidMonitorWailaDataProvider extends BasePartWailaDataProvider {
|
||||
if (part instanceof FCPartMonitor && accessor.getNBTData().hasKey(key)) {
|
||||
IAEFluidStack iaeFluidStack = Util.loadFluidStackFromNBT(accessor.getNBTData().getCompoundTag(key));
|
||||
if (iaeFluidStack != null) currentToolTip.add(
|
||||
Tooltip.fluidFormat(iaeFluidStack.getFluid().getLocalizedName(), iaeFluidStack.getStackSize()));
|
||||
Tooltip.fluidFormat(
|
||||
iaeFluidStack.getFluidStack().getLocalizedName(),
|
||||
iaeFluidStack.getStackSize()));
|
||||
}
|
||||
return currentToolTip;
|
||||
}
|
||||
|
||||
+3
-3
@@ -41,7 +41,7 @@ public class FluidInvWailaDataProvider extends BaseWailaDataProvider {
|
||||
ItemStack is = inv.getStackInSlot(i);
|
||||
if (is != null && is.getItem() instanceof ItemFluidPacket) {
|
||||
FluidStack fs = ItemFluidPacket.getFluidStack(is);
|
||||
currentToolTip.add(Tooltip.fluidFormat(fs.getFluid().getLocalizedName(), fs.amount));
|
||||
currentToolTip.add(Tooltip.fluidFormat(fs.getLocalizedName(), fs.amount));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -53,9 +53,9 @@ public class FluidInvWailaDataProvider extends BaseWailaDataProvider {
|
||||
if (ft.getFluidInSlot(i) == null) continue;
|
||||
FluidStack fs = ft.getFluidInSlot(i).getFluidStack();
|
||||
if (prefix) {
|
||||
currentToolTip.add(Tooltip.tileFluidInterfaceFormat(fs.getFluid().getLocalizedName(), fs.amount, i));
|
||||
currentToolTip.add(Tooltip.tileFluidInterfaceFormat(fs.getLocalizedName(), fs.amount, i));
|
||||
} else {
|
||||
currentToolTip.add(Tooltip.fluidFormat(fs.getFluid().getLocalizedName(), fs.amount));
|
||||
currentToolTip.add(Tooltip.fluidFormat(fs.getLocalizedName(), fs.amount));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user