Skip to content

Commit d7c02de

Browse files
committed
moved reactor block entity classes
1 parent 1f75626 commit d7c02de

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

src/main/java/org/gtreimagined/gt4r/reactor/tile/BlockEntityReactorChamber.java src/main/java/org/gtreimagined/gt4r/blockentity/multi/BlockEntityReactorChamber.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
package org.gtreimagined.gt4r.reactor.tile;
1+
package org.gtreimagined.gt4r.blockentity.multi;
22

33
import lombok.Getter;
44
import muramasa.antimatter.Ref;
5-
import muramasa.antimatter.blockentity.BlockEntityFakeBlock;
65
import muramasa.antimatter.blockentity.BlockEntityMachine;
7-
import muramasa.antimatter.machine.Tier;
86
import muramasa.antimatter.machine.types.Machine;
97
import muramasa.antimatter.tool.AntimatterToolType;
108
import muramasa.antimatter.util.Utils;
119
import net.minecraft.core.BlockPos;
1210
import net.minecraft.core.Direction;
13-
import net.minecraft.nbt.CompoundTag;
1411
import net.minecraft.server.level.ServerPlayer;
1512
import net.minecraft.world.InteractionHand;
1613
import net.minecraft.world.InteractionResult;
@@ -22,7 +19,6 @@
2219
import net.minecraftforge.common.capabilities.Capability;
2320
import net.minecraftforge.common.util.LazyOptional;
2421
import net.minecraftforge.network.NetworkHooks;
25-
import org.gtreimagined.gt4r.data.Machines;
2622
import org.jetbrains.annotations.NotNull;
2723
import org.jetbrains.annotations.Nullable;
2824
import tesseract.TesseractCapUtils;

src/main/java/org/gtreimagined/gt4r/reactor/tile/BlockEntityReactorCore.java src/main/java/org/gtreimagined/gt4r/blockentity/multi/BlockEntityReactorCore.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.gtreimagined.gt4r.reactor.tile;
1+
package org.gtreimagined.gt4r.blockentity.multi;
22

3-
import dev.architectury.networking.NetworkManager;
43
import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine;
54
import muramasa.antimatter.capability.IFilterableHandler;
65
import muramasa.antimatter.capability.fluid.FluidTanks;
@@ -16,9 +15,7 @@
1615
import muramasa.antimatter.util.FluidUtils;
1716
import muramasa.antimatter.util.int2;
1817
import net.minecraft.core.BlockPos;
19-
import net.minecraft.core.BlockPos.MutableBlockPos;
2018
import net.minecraft.core.Direction;
21-
import net.minecraft.core.particles.BlockParticleOption;
2219
import net.minecraft.core.particles.ParticleTypes;
2320
import net.minecraft.nbt.CompoundTag;
2421
import net.minecraft.resources.ResourceLocation;
@@ -31,11 +28,9 @@
3128
import net.minecraft.world.level.Explosion.BlockInteraction;
3229
import net.minecraft.world.level.Level;
3330
import net.minecraft.world.level.block.Blocks;
34-
import net.minecraft.world.level.block.entity.BlockEntity;
3531
import net.minecraft.world.level.block.state.BlockState;
3632
import net.minecraft.world.phys.AABB;
3733
import net.minecraftforge.fluids.FluidStack;
38-
import net.minecraftforge.fluids.IFluidBlock;
3934
import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
4035
import net.minecraftforge.fluids.capability.templates.FluidTank;
4136
import org.gtreimagined.gt4r.GT4RRef;
@@ -46,12 +41,12 @@
4641
import org.gtreimagined.gt4r.reactor.components.IReactorGrid;
4742
import org.gtreimagined.gt4r.reactor.fluids.CoolantRegistry;
4843
import org.gtreimagined.gt4r.reactor.fluids.CoolantRegistry.Coolant;
44+
import org.gtreimagined.gt4r.reactor.tile.IReactorBlock;
4945
import org.gtreimagined.gt4r.reactor.tile.IReactorBlock.ReactorEnableState;
5046
import org.jetbrains.annotations.NotNull;
5147

5248
import javax.annotation.Nullable;
5349
import java.util.ArrayList;
54-
import java.util.Arrays;
5550

5651
import static org.gtreimagined.gt4r.data.Materials.DistilledWater;
5752

src/main/java/org/gtreimagined/gt4r/data/Machines.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import net.minecraft.world.level.block.Block;
2020
import org.gtreimagined.gt4r.block.BlockReactorChamber;
2121
import org.gtreimagined.gt4r.items.ReactorChamberBlockItem;
22-
import org.gtreimagined.gt4r.reactor.tile.BlockEntityReactorChamber;
23-
import org.gtreimagined.gt4r.reactor.tile.BlockEntityReactorCore;
22+
import org.gtreimagined.gt4r.blockentity.multi.BlockEntityReactorChamber;
23+
import org.gtreimagined.gt4r.blockentity.multi.BlockEntityReactorCore;
2424
import org.gtreimagined.gtcore.data.GTCoreBlocks;
2525
import org.gtreimagined.gtcore.machine.DrumMachine;
2626
import org.gtreimagined.gtcore.machine.MultiblockTankMachine;

src/main/java/org/gtreimagined/gt4r/reactor/tile/IReactorBlock.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.gtreimagined.gt4r.reactor.tile;
22

3+
import org.gtreimagined.gt4r.blockentity.multi.BlockEntityReactorCore;
34
import org.gtreimagined.gt4r.reactor.components.IReactorGrid;
45

56
import javax.annotation.Nullable;

0 commit comments

Comments
 (0)