Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated fluids to use new api #58

Open
wants to merge 3 commits into
base: 1.21-potentials
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move utils package
Fej1Dev committed Jan 3, 2025
commit ab2f679c3e8da485847530afe54ba6970af57f24
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.st0x0ef.stellaris.Stellaris;
import com.st0x0ef.stellaris.client.screens.components.GaugeWidget;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.blocks.entities.machines.FuelRefineryBlockEntity;
import com.st0x0ef.stellaris.common.menus.FuelRefineryMenu;
import net.minecraft.client.gui.GuiGraphics;
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.st0x0ef.stellaris.Stellaris;
import com.st0x0ef.stellaris.client.screens.components.GaugeWidget;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.blocks.entities.machines.OxygenDistributorBlockEntity;
import com.st0x0ef.stellaris.common.menus.OxygenGeneratorMenu;
import net.fabricmc.api.EnvType;
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.st0x0ef.stellaris.Stellaris;
import com.st0x0ef.stellaris.client.screens.components.GaugeWidget;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.blocks.entities.machines.PumpjackBlockEntity;
import com.st0x0ef.stellaris.common.menus.PumpjackMenu;
import com.st0x0ef.stellaris.common.utils.Utils;
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.st0x0ef.stellaris.Stellaris;
import com.st0x0ef.stellaris.client.screens.components.GaugeWidget;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.blocks.entities.machines.WaterPumpBlockEntity;
import com.st0x0ef.stellaris.common.menus.WaterPumpMenu;
import net.minecraft.client.gui.GuiGraphics;
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.st0x0ef.stellaris.Stellaris;
import com.st0x0ef.stellaris.client.screens.components.GaugeWidget;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.blocks.entities.machines.WaterSeparatorBlockEntity;
import com.st0x0ef.stellaris.common.menus.WaterSeparatorMenu;
import net.fabricmc.api.EnvType;
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

import com.fej1fun.potentials.energy.BaseEnergyStorage;
import com.fej1fun.potentials.providers.EnergyProvider;
import com.st0x0ef.stellaris.common.capabilities.energy.OnChangeEnergyStorage;
import com.st0x0ef.stellaris.common.utils.capabilities.energy.OnChangeEnergyStorage;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import com.fej1fun.potentials.energy.BaseEnergyStorage;
import com.fej1fun.potentials.providers.EnergyProvider;
import com.st0x0ef.stellaris.common.blocks.entities.ImplementedInventory;
import com.st0x0ef.stellaris.common.capabilities.energy.OnChangeEnergyStorage;
import com.st0x0ef.stellaris.common.utils.capabilities.energy.OnChangeEnergyStorage;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.st0x0ef.stellaris.common.capabilities.energy.EnergyUtil;
import com.st0x0ef.stellaris.common.utils.capabilities.energy.EnergyUtil;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.st0x0ef.stellaris.common.capabilities.energy.EnergyUtil;
import com.st0x0ef.stellaris.common.utils.capabilities.energy.EnergyUtil;
import com.st0x0ef.stellaris.common.registry.BlockEntityRegistry;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.state.BlockState;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.st0x0ef.stellaris.common.blocks.machines.CoalGeneratorBlock;
import com.st0x0ef.stellaris.common.capabilities.energy.EnergyUtil;
import com.st0x0ef.stellaris.common.utils.capabilities.energy.EnergyUtil;
import com.st0x0ef.stellaris.common.menus.CoalGeneratorMenu;
import com.st0x0ef.stellaris.common.registry.BlockEntityRegistry;
import com.st0x0ef.stellaris.common.registry.TagRegistry;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.data_components.CappedLongComponent;
import com.st0x0ef.stellaris.common.registry.DataComponentsRegistry;
import com.st0x0ef.stellaris.common.registry.FluidRegistry;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.fej1fun.potentials.providers.FluidProvider;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.data.recipes.FuelRefineryRecipe;
import com.st0x0ef.stellaris.common.data.recipes.input.FluidInput;
import com.st0x0ef.stellaris.common.items.armors.JetSuit;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.fej1fun.potentials.providers.FluidProvider;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.menus.OxygenGeneratorMenu;
import com.st0x0ef.stellaris.common.oxygen.GlobalOxygenManager;
import com.st0x0ef.stellaris.common.registry.BlockEntityRegistry;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.fej1fun.potentials.providers.FluidProvider;
import com.st0x0ef.stellaris.common.capabilities.fluid.OnChangeFluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.OnChangeFluidTank;
import com.st0x0ef.stellaris.common.registry.BlockEntityRegistry;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

import com.fej1fun.potentials.providers.FluidProvider;
import com.st0x0ef.stellaris.common.blocks.machines.CoalGeneratorBlock;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.menus.PumpjackMenu;
import com.st0x0ef.stellaris.common.registry.BlockEntityRegistry;
import com.st0x0ef.stellaris.common.registry.FluidRegistry;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.fej1fun.potentials.providers.FluidProvider;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.registry.BlockEntityRegistry;
import dev.architectury.fluid.FluidStack;
import net.minecraft.core.BlockPos;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.st0x0ef.stellaris.common.blocks.entities.machines;

import com.fej1fun.potentials.providers.FluidProvider;
import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.data.recipes.WaterSeparatorRecipe;
import com.st0x0ef.stellaris.common.data.recipes.input.FluidInput;
import com.st0x0ef.stellaris.common.menus.WaterSeparatorMenu;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.st0x0ef.stellaris.common.menus;

import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.blocks.entities.machines.WaterPumpBlockEntity;
import com.st0x0ef.stellaris.common.network.packets.SyncWidgetsTanksPacket;
import com.st0x0ef.stellaris.common.registry.BlocksRegistry;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.st0x0ef.stellaris.common.menus;

import com.st0x0ef.stellaris.common.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.utils.capabilities.fluid.FluidTank;
import com.st0x0ef.stellaris.common.blocks.entities.machines.WaterSeparatorBlockEntity;
import com.st0x0ef.stellaris.common.menus.slot.FluidContainerSlot;
import com.st0x0ef.stellaris.common.menus.slot.ResultSlot;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.st0x0ef.stellaris.common.capabilities.energy;
package com.st0x0ef.stellaris.common.utils.capabilities.energy;

import com.fej1fun.potentials.capabilities.Capabilities;
import com.fej1fun.potentials.energy.UniversalEnergyStorage;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.st0x0ef.stellaris.common.capabilities.energy;
package com.st0x0ef.stellaris.common.utils.capabilities.energy;

import com.fej1fun.potentials.energy.BaseEnergyStorage;

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.st0x0ef.stellaris.common.capabilities.fluid;
package com.st0x0ef.stellaris.common.utils.capabilities.fluid;

import dev.architectury.fluid.FluidStack;
import net.minecraft.world.level.material.Fluid;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.st0x0ef.stellaris.common.capabilities.fluid;
package com.st0x0ef.stellaris.common.utils.capabilities.fluid;

import com.fej1fun.potentials.fluid.UniversalFluidStorage;
import dev.architectury.fluid.FluidStack;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.st0x0ef.stellaris.common.capabilities.fluid;
package com.st0x0ef.stellaris.common.utils.capabilities.fluid;

import dev.architectury.fluid.FluidStack;

30 changes: 15 additions & 15 deletions common/src/main/resources/data/stellaris/recipe/fuel_refining.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"type": "stellaris:fuel_refinery",
"isFluidMB": true,
"energy": 10,
"ingredient": {
"fluid": "stellaris:oil",
"id": "stellaris:oil",
"amount": 1
},
"result": {
"fluid": "stellaris:fuel",
"id": "stellaris:fuel",
"amount": 1
}
}
//{
// "type": "stellaris:fuel_refinery",
// "isFluidMB": true,
// "energy": 10,
// "ingredient": {
// "fluid": "stellaris:oil",
// "id": "stellaris:oil",
// "amount": 1
// },
// "result": {
// "fluid": "stellaris:fuel",
// "id": "stellaris:fuel",
// "amount": 1
// }
//}
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"type": "stellaris:water_seperator",
"isFluidMB": true,
"energy": 10,
"ingredient": {
"fluid": "minecraft:water",
"id": "minecraft:water",
"amount": 2
},
"results": [
{
"fluid": "stellaris:hydrogen",
"id": "stellaris:hydrogen",
"amount": 2
},
{
"fluid": "stellaris:oxygen",
"id": "stellaris:oxygen",
"amount": 1
}
]
}
//{
// "type": "stellaris:water_seperator",
// "isFluidMB": true,
// "energy": 10,
// "ingredient": {
// "fluid": "minecraft:water",
// "id": "minecraft:water",
// "amount": 2
// },
// "results": [
// {
// "fluid": "stellaris:hydrogen",
// "id": "stellaris:hydrogen",
// "amount": 2
// },
// {
// "fluid": "stellaris:oxygen",
// "id": "stellaris:oxygen",
// "amount": 1
// }
// ]
//}