forked from Sinytra/ForgifiedFabricAPI
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
50 changed files
with
916 additions
and
353 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
...i-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FluidStorageFluidHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package net.fabricmc.fabric.impl.transfer.compat; | ||
|
|
||
| import it.unimi.dsi.fastutil.ints.Int2ObjectMap; | ||
| import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; | ||
| import net.minecraftforge.fluids.FluidStack; | ||
| import net.minecraftforge.fluids.capability.IFluidHandler; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; | ||
| import net.fabricmc.fabric.api.transfer.v1.storage.Storage; | ||
| import net.fabricmc.fabric.api.transfer.v1.storage.StorageView; | ||
| import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; | ||
|
|
||
| public class FluidStorageFluidHandler implements IFluidHandler { | ||
| private final Storage<FluidVariant> storage; | ||
| private final Int2ObjectMap<StorageView<FluidVariant>> slots; | ||
|
|
||
| public FluidStorageFluidHandler(Storage<FluidVariant> storage) { | ||
| this.storage = storage; | ||
| this.slots = new Int2ObjectOpenHashMap<>(); | ||
| int i = 0; | ||
| for (StorageView<FluidVariant> view : storage) { | ||
| slots.put(i++, view); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public int getTanks() { | ||
| return slots.size(); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull FluidStack getFluidInTank(int tank) { | ||
| return ForgeCompatUtil.toForgeFluidStack(slots.get(tank)); | ||
| } | ||
|
|
||
| @Override | ||
| public int getTankCapacity(int tank) { | ||
| StorageView<FluidVariant> view = slots.get(tank); | ||
| return view != null ? (int) view.getCapacity() : 0; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isFluidValid(int tank, @NotNull FluidStack stack) { | ||
| return storage.simulateInsert(ForgeCompatUtil.toFluidStorageView(stack), ForgeCompatUtil.toFabricBucket(stack.getAmount()), null) > 0; | ||
| } | ||
|
|
||
| @Override | ||
| public int fill(FluidStack resource, FluidAction action) { | ||
| try (Transaction transaction = Transaction.openOuter()) { | ||
| FluidVariant variant = ForgeCompatUtil.toFluidStorageView(resource); | ||
| int filled = (int) storage.insert(variant, ForgeCompatUtil.toFabricBucket(resource.getAmount()), transaction); | ||
| if (action.execute()) { | ||
| transaction.commit(); | ||
| } | ||
| return ForgeCompatUtil.toForgeBucket(filled); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull FluidStack drain(FluidStack resource, FluidAction action) { | ||
| if (!resource.isEmpty()) { | ||
| try (Transaction transaction = Transaction.openOuter()) { | ||
| FluidVariant variant = ForgeCompatUtil.toFluidStorageView(resource); | ||
| int drained = (int) storage.extract(variant, ForgeCompatUtil.toFabricBucket(resource.getAmount()), transaction); | ||
| if (action.execute()) { | ||
| transaction.commit(); | ||
| } | ||
| return ForgeCompatUtil.toForgeFluidStack(variant, drained); | ||
| } | ||
| } | ||
| return FluidStack.EMPTY; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull FluidStack drain(int maxDrain, FluidAction action) { | ||
| for (StorageView<FluidVariant> view : storage.nonEmptyViews()) { | ||
| try (Transaction transaction = Transaction.openOuter()) { | ||
| FluidVariant resource = view.getResource(); | ||
| int drained = (int) storage.extract(resource, maxDrain, transaction); | ||
| if (action.execute()) { | ||
| transaction.commit(); | ||
| } | ||
| return ForgeCompatUtil.toForgeFluidStack(resource, drained); | ||
| } | ||
| } | ||
| return FluidStack.EMPTY; | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
.../src/main/java/net/fabricmc/fabric/impl/transfer/compat/FluidStorageFluidHandlerItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package net.fabricmc.fabric.impl.transfer.compat; | ||
|
|
||
| import net.minecraftforge.fluids.capability.IFluidHandlerItem; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import net.minecraft.item.ItemStack; | ||
|
|
||
| import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; | ||
| import net.fabricmc.fabric.api.transfer.v1.storage.Storage; | ||
|
|
||
| public class FluidStorageFluidHandlerItem extends FluidStorageFluidHandler implements IFluidHandlerItem { | ||
| private final ItemStack container; | ||
|
|
||
| public FluidStorageFluidHandlerItem(Storage<FluidVariant> storage, ItemStack container) { | ||
| super(storage); | ||
|
|
||
| this.container = container; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull ItemStack getContainer() { | ||
| return container; | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
...ansfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/ForgeCompatUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package net.fabricmc.fabric.impl.transfer.compat; | ||
|
|
||
| import net.minecraftforge.fluids.FluidStack; | ||
| import net.minecraftforge.fluids.FluidType; | ||
|
|
||
| import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; | ||
| import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; | ||
| import net.fabricmc.fabric.api.transfer.v1.storage.StorageView; | ||
|
|
||
| public final class ForgeCompatUtil { | ||
|
|
||
| public static int toForgeBucket(int amount) { | ||
| return (int) (amount / FluidConstants.BUCKET * FluidType.BUCKET_VOLUME); | ||
| } | ||
|
|
||
| public static int toFabricBucket(int amount) { | ||
| return (int) (amount / FluidType.BUCKET_VOLUME * FluidConstants.BUCKET); | ||
| } | ||
|
|
||
| public static FluidStack toForgeFluidStack(StorageView<FluidVariant> view) { | ||
| if (view != null && !view.isResourceBlank()) { | ||
| FluidVariant resource = view.getResource(); | ||
| return new FluidStack(resource.getFluid(), toForgeBucket((int) view.getAmount()), resource.getNbt()); | ||
| } | ||
| return FluidStack.EMPTY; | ||
| } | ||
|
|
||
| public static FluidStack toForgeFluidStack(FluidVariant variant, int amount) { | ||
| return !variant.isBlank() && amount > 0 ? new FluidStack(variant.getFluid(), ForgeCompatUtil.toForgeBucket(amount), variant.getNbt()) : FluidStack.EMPTY; | ||
| } | ||
|
|
||
| public static FluidVariant toFluidStorageView(FluidStack stack) { | ||
| return !stack.isEmpty() ? FluidVariant.of(stack.getFluid(), stack.getTag()) : FluidVariant.blank(); | ||
| } | ||
|
|
||
| private ForgeCompatUtil() { | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...sfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/ForgeFluidStorage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package net.fabricmc.fabric.impl.transfer.compat; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
|
|
||
| import net.minecraftforge.fluids.FluidStack; | ||
| import net.minecraftforge.fluids.capability.IFluidHandler; | ||
|
|
||
| import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; | ||
| import net.fabricmc.fabric.api.transfer.v1.storage.Storage; | ||
| import net.fabricmc.fabric.api.transfer.v1.storage.StorageView; | ||
| import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; | ||
|
|
||
| public class ForgeFluidStorage implements Storage<FluidVariant> { | ||
| private final IFluidHandler handler; | ||
|
|
||
| public ForgeFluidStorage(IFluidHandler handler) { | ||
| this.handler = handler; | ||
| } | ||
|
|
||
| @Override | ||
| public long insert(FluidVariant resource, long maxAmount, TransactionContext transaction) { | ||
| FluidStack stack = ForgeCompatUtil.toForgeFluidStack(resource, (int) maxAmount); | ||
| int filled = handler.fill(stack, IFluidHandler.FluidAction.SIMULATE); | ||
| transaction.addCloseCallback((context, result) -> { | ||
| if (result.wasCommitted()) { | ||
| handler.fill(stack, IFluidHandler.FluidAction.EXECUTE); | ||
| } | ||
| }); | ||
| return ForgeCompatUtil.toFabricBucket(filled); | ||
| } | ||
|
|
||
| @Override | ||
| public long extract(FluidVariant resource, long maxAmount, TransactionContext transaction) { | ||
| FluidStack stack = ForgeCompatUtil.toForgeFluidStack(resource, (int) maxAmount); | ||
| FluidStack drained = handler.drain(stack, IFluidHandler.FluidAction.SIMULATE); | ||
| transaction.addCloseCallback((context, result) -> { | ||
| if (result.wasCommitted()) { | ||
| handler.drain(stack, IFluidHandler.FluidAction.EXECUTE); | ||
| } | ||
| }); | ||
| return ForgeCompatUtil.toFabricBucket(drained.getAmount()); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<StorageView<FluidVariant>> iterator() { | ||
| List<StorageView<FluidVariant>> views = new ArrayList<>(); | ||
| for (int i = 0; i < handler.getTanks(); i++) { | ||
| views.add(new ForgeFluidView(handler, i)); | ||
| } | ||
| return views.iterator(); | ||
| } | ||
| } |
Oops, something went wrong.