Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ dependencies {
compileOnly("curse.maven:journeymap-32274:5172461") // Journeymap 5.7.1p3
compileOnly("curse.maven:voxelmap-225179:3029445") // VoxelMap 1.9.28
compileOnly("curse.maven:xaeros-263420:5394758") // Xaero's Minimap 24.2.0
compileOnly("maven.modrinth:fluidlogged-api:ArR5epY9") // Fluidlogged API 3.0.6
compileOnly rfg.deobf("curse.maven:opencomputers-223008:5274236") // OpenComputers 1.8.5+179e1c3
compileOnly rfg.deobf("curse.maven:hwyla-253449:2568751") // HWYLA 1.8.26-B41
compileOnly rfg.deobf("curse.maven:baubles-227083:2518667") // Baubles 1.5.2
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/items/metaitem/MetaItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ public void addAdditionalCreativeTabs(@NotNull CreativeTabs @NotNull... tabs) {
}

@Override
protected boolean isInCreativeTab(@NotNull CreativeTabs tab) {
public boolean isInCreativeTab(@NotNull CreativeTabs tab) {
return tab == CreativeTabs.SEARCH ||
ArrayUtils.contains(defaultCreativeTabs, tab) ||
additionalCreativeTabs.contains(tab);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gregtech/api/pipenet/block/BlockPipe.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import gregtech.common.blocks.BlockFrame;
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.items.MetaItems;
import gregtech.integration.fluidlogged_api.IFluidloggableWrapper;
import gregtech.integration.ctm.IFacadeWrapper;

import net.minecraft.block.Block;
Expand Down Expand Up @@ -66,7 +67,7 @@
@SuppressWarnings("deprecation")
public abstract class BlockPipe<PipeType extends Enum<PipeType> & IPipeType<NodeDataType>, NodeDataType,
WorldPipeNetType extends WorldPipeNet<NodeDataType, ? extends PipeNet<NodeDataType>>> extends BuiltInRenderBlock
implements ITileEntityProvider, IFacadeWrapper, IBlockAppearance {
implements ITileEntityProvider, IFacadeWrapper, IBlockAppearance, IFluidloggableWrapper {

protected final ThreadLocal<IPipeTile<PipeType, NodeDataType>> tileEntities = new ThreadLocal<>();

Expand Down
1 change: 1 addition & 0 deletions src/main/java/gregtech/api/util/Mods.java
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ public static class Names {
public static final String EXTRA_BEES = "extrabees";
public static final String EXTRA_TREES = "extratrees";
public static final String EXTRA_UTILITIES2 = "extrautils2";
public static final String FLUIDLOGGED_API = "fluidlogged_api";
public static final String FORESTRY = "forestry";
public static final String FORESTRY_APICULTURE = "apiculture";
public static final String FORESTRY_ARBORICULTURE = "arboriculture";
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/gregtech/common/blocks/BlockFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import gregtech.common.blocks.properties.PropertyMaterial;
import gregtech.common.creativetab.GTCreativeTabs;

import gregtech.integration.fluidlogged_api.IFluidloggableWrapper;

import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.EnumPushReaction;
Expand Down Expand Up @@ -47,7 +49,7 @@

import java.util.List;

public abstract class BlockFrame extends BlockMaterialBase {
public abstract class BlockFrame extends BlockMaterialBase implements IFluidloggableWrapper {

public static final AxisAlignedBB COLLISION_BOX = new AxisAlignedBB(0.05, 0.0, 0.05, 0.95, 1.0, 0.95);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ protected WireProperties createProperties(Insulation insulation, Material materi
return insulation.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
}

@Override
public boolean isFluidloggable(IBlockState state, World world, BlockPos pos) {
return pipeType.thickness < 1.0f;
}

@SideOnly(Side.CLIENT)
@NotNull
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package gregtech.integration.fluidlogged_api;

import git.jbredwards.fluidlogged_api.api.block.IFluidloggable;

import gregtech.api.util.Mods;

import net.minecraftforge.fml.common.Optional;

@Optional.Interface(modid = Mods.Names.FLUIDLOGGED_API, iface = "git.jbredwards.fluidlogged_api.api.block.IFluidloggable")
public interface IFluidloggableWrapper extends IFluidloggable {}