@@ -21,6 +21,7 @@ public class DualHandler implements IItemHandlerModifiable, IMultipleTankHandler
2121 .compareItem (true )
2222 .compareDamage (true )
2323 .compareTag (true )
24+ .compareCount (true )
2425 .build ();
2526 @ NotNull
2627 IItemHandlerModifiable itemDelegate ;
@@ -173,24 +174,25 @@ public void removeNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
173174
174175 public static class DualEntry implements ITankEntry , INotifiableHandler {
175176
176- private final DualHandler delegate ;
177+ @ NotNull
178+ private final DualHandler tank ;
177179
178180 @ NotNull
179- private final ITankEntry tank ;
181+ private final ITankEntry delegate ;
180182
181- public DualEntry (DualHandler delegate , ITankEntry tank ) {
183+ public DualEntry (@ NotNull DualHandler tank , @ NotNull ITankEntry delegate ) {
182184 this .delegate = delegate ;
183185 this .tank = tank ;
184186 }
185187
186188 @ Override
187189 public @ NotNull IMultipleTankHandler getParent () {
188- return this .delegate ;
190+ return this .tank ;
189191 }
190192
191193 @ Override
192194 public @ NotNull IFluidTank getDelegate () {
193- return this .tank ;
195+ return this .delegate ;
194196 }
195197
196198 @ Override
@@ -202,38 +204,39 @@ public IFluidTankProperties[] getTankProperties() {
202204 public int fill (FluidStack resource , boolean doFill ) {
203205 int filled = getTank ().fill (resource , doFill );
204206 if (doFill && filled > 0 )
205- delegate .onContentsChanged (this );
207+ tank .onContentsChanged (this );
206208 return filled ;
207209 }
208210
209211 @ Override
210212 public FluidStack drain (FluidStack resource , boolean doDrain ) {
211213 var drained = getTank ().drain (resource , doDrain );
212214 if (doDrain && drained != null )
213- delegate .onContentsChanged (this );
215+ tank .onContentsChanged (this );
214216 return drained ;
215217 }
216218
217219 @ Override
218220 public FluidStack drain (int maxDrain , boolean doDrain ) {
219221 var drained = getTank ().drain (maxDrain , doDrain );
220222 if (doDrain && drained != null )
221- delegate .onContentsChanged (this );
223+ tank .onContentsChanged (this );
222224 return drained ;
223225 }
224226
227+ // this method might be redundant
225228 private @ NotNull ITankEntry getTank () {
226- return this .tank ;
229+ return this .delegate ;
227230 }
228231
229232 @ Override
230233 public void addNotifiableMetaTileEntity (MetaTileEntity metaTileEntity ) {
231- this .delegate .addNotifiableMetaTileEntity (metaTileEntity );
234+ this .tank .addNotifiableMetaTileEntity (metaTileEntity );
232235 }
233236
234237 @ Override
235238 public void removeNotifiableMetaTileEntity (MetaTileEntity metaTileEntity ) {
236- this .delegate .removeNotifiableMetaTileEntity (metaTileEntity );
239+ this .tank .removeNotifiableMetaTileEntity (metaTileEntity );
237240 }
238241 }
239242}
0 commit comments