Skip to content

Commit 3186478

Browse files
authored
Fix #1052: Render correct Quantum Tank fill level in Jade (#1081)
1 parent 14903d9 commit 3186478

File tree

3 files changed

+65
-0
lines changed

3 files changed

+65
-0
lines changed

src/client/java/aztech/modern_industrialization/compat/jade/client/MIJadeClientPlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
package aztech.modern_industrialization.compat.jade.client;
2525

2626
import aztech.modern_industrialization.compat.jade.server.MachineComponentProvider;
27+
import aztech.modern_industrialization.compat.jade.server.TankComponentProvider;
2728
import aztech.modern_industrialization.machines.MachineBlock;
2829
import aztech.modern_industrialization.pipes.MIPipes;
2930
import aztech.modern_industrialization.pipes.impl.PipeBlock;
@@ -47,6 +48,8 @@ public void registerClient(IWailaClientRegistration registration) {
4748
registration.registerFluidStorageClient(new MachineComponentProvider.Fluids());
4849
registration.registerItemStorageClient(new MachineComponentProvider.Items());
4950
registration.registerProgressClient(new MachineComponentProvider.Progress());
51+
52+
registration.registerFluidStorageClient(new TankComponentProvider());
5053
}
5154

5255
static float ratio(double current, double max) {

src/main/java/aztech/modern_industrialization/compat/jade/server/MIJadeCommonPlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*/
2424
package aztech.modern_industrialization.compat.jade.server;
2525

26+
import aztech.modern_industrialization.blocks.storage.tank.TankBlockEntity;
2627
import aztech.modern_industrialization.machines.MachineBlockEntity;
2728
import aztech.modern_industrialization.pipes.impl.PipeBlockEntity;
2829
import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant;
@@ -43,6 +44,8 @@ public void register(IWailaCommonRegistration registration) {
4344
registration.registerFluidStorage(new MachineComponentProvider.Fluids(), MachineBlockEntity.class);
4445
registration.registerItemStorage(new MachineComponentProvider.Items(), MachineBlockEntity.class);
4546
registration.registerProgress(new MachineComponentProvider.Progress(), MachineBlockEntity.class);
47+
48+
registration.registerFluidStorage(new TankComponentProvider(), TankBlockEntity.class);
4649
}
4750

4851
public static JadeFluidObject fluidStack(FluidVariant variant, long amount) {
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* MIT License
3+
*
4+
* Copyright (c) 2020 Azercoco & Technici4n
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
*/
24+
package aztech.modern_industrialization.compat.jade.server;
25+
26+
import aztech.modern_industrialization.MI;
27+
import aztech.modern_industrialization.blocks.storage.tank.TankBlockEntity;
28+
import java.util.List;
29+
import net.minecraft.nbt.CompoundTag;
30+
import net.minecraft.resources.ResourceLocation;
31+
import snownee.jade.api.Accessor;
32+
import snownee.jade.api.view.ClientViewGroup;
33+
import snownee.jade.api.view.FluidView;
34+
import snownee.jade.api.view.IClientExtensionProvider;
35+
import snownee.jade.api.view.IServerExtensionProvider;
36+
import snownee.jade.api.view.ViewGroup;
37+
38+
/**
39+
* Provider for the stored fluid of a tank.
40+
* Mainly exists because of the quantum tank which stores more fluid than can be queried through IFluidHandler.
41+
*/
42+
public class TankComponentProvider implements IServerExtensionProvider<CompoundTag>, IClientExtensionProvider<CompoundTag, FluidView> {
43+
@Override
44+
public List<ViewGroup<CompoundTag>> getGroups(Accessor<?> accessor) {
45+
var tank = (TankBlockEntity) accessor.getTarget();
46+
return List.of(new ViewGroup<>(List.of(
47+
FluidView.writeDefault(MIJadeCommonPlugin.fluidStack(tank.getResource(), tank.getAmount()), tank.getCapacity()))));
48+
}
49+
50+
@Override
51+
public List<ClientViewGroup<FluidView>> getClientGroups(Accessor<?> accessor, List<ViewGroup<CompoundTag>> list) {
52+
return ClientViewGroup.map(list, FluidView::readDefault, null);
53+
}
54+
55+
@Override
56+
public ResourceLocation getUid() {
57+
return MI.id("tank");
58+
}
59+
}

0 commit comments

Comments
 (0)