fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fabric port in progress

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 23:25:38 +02:00
parent 80fbb58d4f
commit b79cd732b2
368 changed files with 2498 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
final List<String> list = new ArrayList<>();
list.add(fluidStack.getFluidStack().getDisplayName().getFormattedText());
list.add(fluidStack.getFluidStack().getName().getFormattedText());
list.add(formattedAmount);
list.add(modName);
src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
+2 -2
View File
@@ -4,7 +4,7 @@ import java.util.Collections;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.Minecraft;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.I18n;
@@ -35,7 +35,7 @@ public class FluidSlotWidget extends CustomSlotWidget {
}
@Override
public void drawContent(final Minecraft mc, final int mouseX, final int mouseY, final float partialTicks) {
public void drawContent(final MinecraftClient mc, final int mouseX, final int mouseY, final float partialTicks) {
final IAEFluidStack fs = this.getFluidStack();
if (fs != null) {
RenderSystem.disableBlend();
src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java
+3 -3
View File
@@ -21,7 +21,7 @@ package appeng.fluids.client.gui.widgets;
import com.mojang.blaze3d.systems.RenderSystem;
import net.fabricmc.api.EnvType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.widget.Widget;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -62,7 +62,7 @@ public class FluidTankWidget extends Widget implements ITooltip {
float blue = (attributes.getColor() & 255) / 255.0F;
RenderSystem.color3f(red, green, blue);
Minecraft mc = Minecraft.getInstance();
MinecraftClient mc = MinecraftClient.getInstance();
mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
final TextureAtlasSprite sprite = mc.getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE)
.apply(attributes.getStillTexture(fluidStack.getFluidStack()));
@@ -88,7 +88,7 @@ public class FluidTankWidget extends Widget implements ITooltip {
public String getMessage() {
final IAEFluidStack fluid = this.tank.getFluidInSlot(this.slot);
if (fluid != null && fluid.getStackSize() > 0) {
String desc = fluid.getFluid().getAttributes().getDisplayName(fluid.getFluidStack()).getFormattedText();
String desc = fluid.getFluid().getAttributes().getName(fluid.getFluidStack()).getFormattedText();
String amountToText = fluid.getStackSize() + "mB";
return desc + "\n" + amountToText;