Skip to content
This repository has been archived by the owner on Apr 28, 2021. It is now read-only.

Commit

Permalink
Fix #29
Browse files Browse the repository at this point in the history
  • Loading branch information
quat1024 committed Aug 23, 2019
1 parent d4e180f commit e9e5373
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 66 deletions.
1 change: 1 addition & 0 deletions _static/forge_update.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"homepage": "https://github.com/quat1024/incorporeal/releases",
"1.12.2": {
"1.2.2": "Fix crash lol again",
"1.2.1": "Fix crash lol",
"1.2.0": "Internal reorganizations, and a new Frame Screw item!",
"1.1.4": "Fix Cygnus networks instantly crashing on servers and another IR crash. Sorry about that!",
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ buildscript {

apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.2.1"
group = "quaternary.incorporeal" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
version = "1.2.2"
group = "quaternary.incorporeal"
archivesBaseName = "incorporeal"

sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
Expand Down Expand Up @@ -105,4 +105,4 @@ processResources {
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public abstract class BlockSlabPiece extends BlockSlab implements ILexiconable {
public BlockSlabPiece(Block block, Material mat, MapColor color, boolean cutout) {
super(mat, color);
this.mainBlock = block;
this.specialLokiWHacks = cutout;
this.cutout = cutout;

setHardness(block.blockHardness);
setResistance(block.getExplosionResistance(null) * 5 / 3f);
Expand All @@ -52,8 +52,8 @@ public BlockSlabPiece(Block block, Material mat, MapColor color, boolean cutout)

public static final PropertyEnum<Variant> DUMMY_VARIANT = PropertyEnum.create("variant", Variant.class);

protected final Block mainBlock;
protected final boolean specialLokiWHacks;
public final Block mainBlock;
public final boolean cutout;

@Override
public String getTranslationKey(int meta) {
Expand All @@ -73,31 +73,31 @@ public Comparable<?> getTypeForItem(ItemStack stack) {
@SideOnly(Side.CLIENT)
@Override
public BlockRenderLayer getRenderLayer() {
if(specialLokiWHacks) return BlockRenderLayer.CUTOUT_MIPPED;
if(cutout) return BlockRenderLayer.CUTOUT_MIPPED;
else return super.getRenderLayer();
}

@Override
public boolean isFullBlock(IBlockState state) {
if(specialLokiWHacks) return false;
if(cutout) return false;
else return super.isFullBlock(state);
}

@Override
public boolean isFullCube(IBlockState state) {
if(specialLokiWHacks) return false;
if(cutout) return false;
else return super.isFullCube(state);
}

@Override
public boolean isOpaqueCube(IBlockState state) {
if(specialLokiWHacks) return false;
if(cutout) return false;
else return super.isOpaqueCube(state);
}

@Override
public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face) {
if(specialLokiWHacks) return false;
if(cutout) return false;
else return super.doesSideBlockRendering(state, world, pos, face);
}

Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/META-INF/incorporeal_at.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public net.minecraft.block.Block field_149782_v #blockHardness

public net.minecraft.entity.item.EntityItem field_70292_b # age

public net.minecraft.entity.Entity field_70178_ae # isImmuneToFire

public net.minecraft.item.EnumDyeColor field_193351_w # colorValue
55 changes: 0 additions & 55 deletions src/main/resources/assets/META-INF/incorporeal_at.cfg

This file was deleted.

0 comments on commit e9e5373

Please sign in to comment.