Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

Commit b4ad963

Browse files
committed
update to gt 2.0.3
1 parent a797a28 commit b4ad963

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ repositories {
5454

5555
dependencies {
5656
deobfCompile("mezz.jei:jei_1.12.2:+")
57-
provided(files("libs/gregtech-1.12.2-2.0.2-beta.jar"))
57+
provided(files("libs/gregtech-1.12.2-2.0.3-beta.jar"))
5858
deobfCompile("codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal")
5959
deobfCompile("codechicken:ChickenASM:1.12-1.0.2.9")
6060
deobfCompile("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16")

src/main/java/net/htmlcsjs/htmlTech/api/unification/materials/HTMaterials.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import gregtech.api.unification.material.Material;
44
import gregtech.api.unification.material.info.MaterialFlag;
5+
import gregtech.api.unification.material.properties.DustProperty;
56
import gregtech.api.unification.material.properties.PropertyKey;
67

78
import static gregtech.api.GTValues.*;
89
import static gregtech.api.unification.material.Materials.*;
910
import static gregtech.api.unification.material.info.MaterialFlags.*;
1011
import static gregtech.api.unification.material.info.MaterialIconSet.SHINY;
12+
import static gregtech.api.unification.material.properties.PropertyKey.DUST;
1113

1214
public class HTMaterials {
1315

@@ -56,8 +58,8 @@ public static void register() {
5658

5759

5860
// Adding Flags to Materials
59-
Protactinium.setHidden(false);
60-
Flerovium.setHidden(false);
61+
Protactinium.setProperty(DUST, new DustProperty());
62+
Flerovium.setProperty(DUST, new DustProperty());
6163
RhodiumPlatedPalladium.addFlags(GENERATE_FOIL);
6264
Trinium.addFlags(GENERATE_FRAME);
6365
Titanium.addFlags(GENERATE_FOIL);

src/main/java/net/htmlcsjs/htmlTech/common/laserpipe/BlockLaserPipe.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraft.block.state.IBlockState;
1212
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1313
import net.minecraft.creativetab.CreativeTabs;
14+
import net.minecraft.entity.player.EntityPlayer;
1415
import net.minecraft.item.ItemStack;
1516
import net.minecraft.tileentity.TileEntity;
1617
import net.minecraft.util.EnumBlockRenderType;
@@ -61,6 +62,15 @@ public void getSubBlocks(@Nonnull CreativeTabs creativeTabs, @Nonnull NonNullLis
6162
}
6263
}
6364

65+
@Override
66+
public boolean isHoldingPipe(EntityPlayer player) {
67+
if (player == null) {
68+
return false;
69+
}
70+
ItemStack stack = player.getHeldItemMainhand();
71+
return stack != ItemStack.EMPTY && stack.getItem() instanceof ItemBlockLaserPipe;
72+
}
73+
6474
@Override
6575
public boolean canPipeConnectToBlock(IPipeTile iPipeTile, EnumFacing enumFacing, @Nullable TileEntity tileEntity) {
6676
return tileEntity != null && tileEntity.hasCapability(HtmlTechCapabilities.LASER_CONTAINER, enumFacing.getOpposite());

0 commit comments

Comments
 (0)