Skip to content

Commit

Permalink
2.7.2
Browse files Browse the repository at this point in the history 
Reduced exception swallowing as much as possible, fixed walls not having all the stuff, added a few helper methods, updated the odds and ends piece pack to remove redstone ore pieces and add nether quartz ore pieces.
  • Loading branch information
@Shnupbups
Shnupbups committed Sep 2, 2019
1 parent 5494b5b commit fa3c8d9
Show file tree
Hide file tree
Showing 14 changed files with 331 additions and 570 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.6.1+build.165

# Mod Properties
mod_version = 2.7.1
mod_version = 2.7.2
maven_group = com.shnupbups
archives_base_name = extrapieces

Expand Down
6 changes: 3 additions & 3 deletions piecepacks/odds.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0",
"version": "1.1.0",
"sets": {
"dirt": {
"base": "minecraft:dirt"
Expand Down Expand Up @@ -50,8 +50,8 @@
"emerald_ore": {
"base": "minecraft:emerald_ore"
},
"redstone_ore": {
"base": "minecraft:redstone_ore"
"quartz_ore": {
"base": "minecraft:quartz_ore"
},
"clay": {
"base": "minecraft:clay"
Expand Down
69 changes: 21 additions & 48 deletions src/main/java/com/shnupbups/extrapieces/blocks/ColumnPieceBlock.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.shnupbups.extrapieces.blocks;

import com.shnupbups.extrapieces.ExtraPieces;
import com.shnupbups.extrapieces.core.PieceSet;
import com.shnupbups.extrapieces.core.PieceType;
import com.shnupbups.extrapieces.core.PieceTypes;
Expand Down Expand Up @@ -132,107 +133,79 @@ public boolean canPlaceAtSide(BlockState blockState_1, BlockView blockView_1, Bl
@Override
public void randomDisplayTick(BlockState blockState_1, World world_1, BlockPos blockPos_1, Random random_1) {
super.randomDisplayTick(blockState_1, world_1, blockPos_1, random_1);
try {
this.getBase().randomDisplayTick(blockState_1, world_1, blockPos_1, random_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().randomDisplayTick(this.getBaseState(), world_1, blockPos_1, random_1);
}

@Override
public void onBlockBreakStart(BlockState blockState_1, World world_1, BlockPos blockPos_1, PlayerEntity playerEntity_1) {
super.onBlockBreakStart(blockState_1, world_1, blockPos_1, playerEntity_1);
try {
this.getBase().getDefaultState().onBlockBreakStart(world_1, blockPos_1, playerEntity_1);
} catch (IllegalArgumentException ignored) {}
this.getBaseState().onBlockBreakStart(world_1, blockPos_1, playerEntity_1);
}

@Override
public void onBroken(IWorld iWorld_1, BlockPos blockPos_1, BlockState blockState_1) {
super.onBroken(iWorld_1, blockPos_1, blockState_1);
try {
this.getBase().onBroken(iWorld_1, blockPos_1, blockState_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().onBroken(iWorld_1, blockPos_1, blockState_1);
}

@Override
public float getBlastResistance() {
try {
return this.getBase().getBlastResistance();
} catch (IllegalArgumentException ignored) {
return super.getBlastResistance();
}
return this.getBase().getBlastResistance();
}

@Override
public BlockRenderLayer getRenderLayer() {
try {
return this.getBase().getRenderLayer();
} catch (IllegalArgumentException ignored) {
return super.getRenderLayer();
}
return this.getBase().getRenderLayer();
}

@Override
public int getTickRate(ViewableWorld viewableWorld_1) {
try {
return this.getBase().getTickRate(viewableWorld_1);
} catch (IllegalArgumentException ignored) {
return super.getTickRate(viewableWorld_1);
}
return this.getBase().getTickRate(viewableWorld_1);
}

@Override
public void onBlockAdded(BlockState blockState_1, World world_1, BlockPos blockPos_1, BlockState blockState_2, boolean boolean_1) {
super.onBlockAdded(blockState_1, world_1, blockPos_1, blockState_2, boolean_1);
try {
if (blockState_1.getBlock() != blockState_1.getBlock()) {
this.getBase().getDefaultState().neighborUpdate(world_1, blockPos_1, Blocks.AIR, blockPos_1, false);
this.getBase().onBlockAdded(this.set.getBase().getDefaultState(), world_1, blockPos_1, blockState_2, false);
}
} catch (IllegalArgumentException ignored) {}
if (blockState_1.getBlock() != blockState_2.getBlock()) {
this.getBase().getDefaultState().neighborUpdate(world_1, blockPos_1, Blocks.AIR, blockPos_1, false);
this.getBase().getDefaultState().onBlockAdded(world_1, blockPos_1, blockState_2, false);
}
}

@Override
public void onBlockRemoved(BlockState blockState_1, World world_1, BlockPos blockPos_1, BlockState blockState_2, boolean boolean_1) {
super.onBlockRemoved(blockState_1, world_1, blockPos_1, blockState_2, boolean_1);
try {
if (blockState_1.getBlock() != blockState_2.getBlock()) {
this.getBase().getDefaultState().onBlockRemoved(world_1, blockPos_1, blockState_2, boolean_1);
}
} catch (IllegalArgumentException ignored) {}
if (blockState_1.getBlock() != blockState_2.getBlock()) {
this.getBaseState().onBlockRemoved(world_1, blockPos_1, blockState_2, boolean_1);
}
}

@Override
public void onSteppedOn(World world_1, BlockPos blockPos_1, Entity entity_1) {
super.onSteppedOn(world_1, blockPos_1, entity_1);
try {
this.getBase().onSteppedOn(world_1, blockPos_1, entity_1);
} catch (IllegalArgumentException ignored) {}
} catch (IllegalArgumentException ignored) {
ExtraPieces.debugLog("Caught an exception in onSteppedOn for "+this.getPieceString());
}
}

@Override
public void onScheduledTick(BlockState blockState_1, World world_1, BlockPos blockPos_1, Random random_1) {
super.onScheduledTick(blockState_1, world_1, blockPos_1, random_1);
try {
this.getBase().onScheduledTick(blockState_1, world_1, blockPos_1, random_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().onScheduledTick(this.getBaseState(), world_1, blockPos_1, random_1);
}

@Override
public boolean activate(BlockState blockState_1, World world_1, BlockPos blockPos_1, PlayerEntity playerEntity_1, Hand hand_1, BlockHitResult blockHitResult_1) {
try {
boolean a = super.activate(blockState_1, world_1, blockPos_1, playerEntity_1, hand_1, blockHitResult_1);
return a || this.getBase().getDefaultState().activate(world_1, playerEntity_1, hand_1, blockHitResult_1);
} catch (IllegalArgumentException ignored) {
return super.activate(blockState_1, world_1, blockPos_1, playerEntity_1, hand_1, blockHitResult_1);
}
boolean a = super.activate(blockState_1, world_1, blockPos_1, playerEntity_1, hand_1, blockHitResult_1);
return a || this.getBaseState().activate(world_1, playerEntity_1, hand_1, blockHitResult_1);
}

@Override
public void onDestroyedByExplosion(World world_1, BlockPos blockPos_1, Explosion explosion_1) {
super.onDestroyedByExplosion(world_1, blockPos_1, explosion_1);
try {
this.getBase().onDestroyedByExplosion(world_1, blockPos_1, explosion_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().onDestroyedByExplosion(world_1, blockPos_1, explosion_1);
}

@Environment(EnvType.CLIENT)
Expand Down
93 changes: 33 additions & 60 deletions src/main/java/com/shnupbups/extrapieces/blocks/CornerPieceBlock.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.shnupbups.extrapieces.blocks;

import com.shnupbups.extrapieces.ExtraPieces;
import com.shnupbups.extrapieces.core.PieceSet;
import com.shnupbups.extrapieces.core.PieceType;
import com.shnupbups.extrapieces.core.PieceTypes;
Expand Down Expand Up @@ -100,112 +101,84 @@ public VoxelShape getOutlineShape(BlockState blockState_1, BlockView blockView_1
return NORTH_SHAPE;
}
}

@Environment(EnvType.CLIENT)
@Override
public void randomDisplayTick(BlockState blockState_1, World world_1, BlockPos blockPos_1, Random random_1) {
super.randomDisplayTick(blockState_1, world_1, blockPos_1, random_1);
try {
this.getBase().randomDisplayTick(blockState_1, world_1, blockPos_1, random_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().randomDisplayTick(this.getBaseState(), world_1, blockPos_1, random_1);
}

@Override
public void onBlockBreakStart(BlockState blockState_1, World world_1, BlockPos blockPos_1, PlayerEntity playerEntity_1) {
super.onBlockBreakStart(blockState_1, world_1, blockPos_1, playerEntity_1);
try {
this.getBase().getDefaultState().onBlockBreakStart(world_1, blockPos_1, playerEntity_1);
} catch (IllegalArgumentException ignored) {}
this.getBaseState().onBlockBreakStart(world_1, blockPos_1, playerEntity_1);
}

@Override
public void onBroken(IWorld iWorld_1, BlockPos blockPos_1, BlockState blockState_1) {
super.onBroken(iWorld_1, blockPos_1, blockState_1);
try {
this.getBase().onBroken(iWorld_1, blockPos_1, blockState_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().onBroken(iWorld_1, blockPos_1, blockState_1);
}

@Override
public float getBlastResistance() {
try {
return this.getBase().getBlastResistance();
} catch (IllegalArgumentException ignored) {
return super.getBlastResistance();
}
return this.getBase().getBlastResistance();
}

@Override
public BlockRenderLayer getRenderLayer() {
try {
return this.getBase().getRenderLayer();
} catch (IllegalArgumentException ignored) {
return super.getRenderLayer();
}
return this.getBase().getRenderLayer();
}

@Override
public int getTickRate(ViewableWorld viewableWorld_1) {
try {
return this.getBase().getTickRate(viewableWorld_1);
} catch (IllegalArgumentException ignored) {
return super.getTickRate(viewableWorld_1);
}
return this.getBase().getTickRate(viewableWorld_1);
}

@Override
public void onBlockAdded(BlockState blockState_1, World world_1, BlockPos blockPos_1, BlockState blockState_2, boolean boolean_1) {
super.onBlockAdded(blockState_1, world_1, blockPos_1, blockState_2, boolean_1);
try {
if (blockState_1.getBlock() != blockState_1.getBlock()) {
this.getBase().getDefaultState().neighborUpdate(world_1, blockPos_1, Blocks.AIR, blockPos_1, false);
this.getBase().onBlockAdded(this.set.getBase().getDefaultState(), world_1, blockPos_1, blockState_2, false);
}
} catch (IllegalArgumentException ignored) {}
if (blockState_1.getBlock() != blockState_2.getBlock()) {
this.getBase().getDefaultState().neighborUpdate(world_1, blockPos_1, Blocks.AIR, blockPos_1, false);
this.getBase().getDefaultState().onBlockAdded(world_1, blockPos_1, blockState_2, false);
}
}

@Override
public void onBlockRemoved(BlockState blockState_1, World world_1, BlockPos blockPos_1, BlockState blockState_2, boolean boolean_1) {
super.onBlockRemoved(blockState_1, world_1, blockPos_1, blockState_2, boolean_1);
try {
if (blockState_1.getBlock() != blockState_2.getBlock()) {
this.getBase().getDefaultState().onBlockRemoved(world_1, blockPos_1, blockState_2, boolean_1);
}
} catch (IllegalArgumentException ignored) {}
if (blockState_1.getBlock() != blockState_2.getBlock()) {
this.getBaseState().onBlockRemoved(world_1, blockPos_1, blockState_2, boolean_1);
}
}

@Override
public void onSteppedOn(World world_1, BlockPos blockPos_1, Entity entity_1) {
super.onSteppedOn(world_1, blockPos_1, entity_1);
try {
this.getBase().onSteppedOn(world_1, blockPos_1, entity_1);
} catch (IllegalArgumentException ignored) {}
} catch (IllegalArgumentException ignored) {
ExtraPieces.debugLog("Caught an exception in onSteppedOn for "+this.getPieceString());
}
}

@Override
public void onScheduledTick(BlockState blockState_1, World world_1, BlockPos blockPos_1, Random random_1) {
super.onScheduledTick(blockState_1, world_1, blockPos_1, random_1);
try {
this.getBase().onScheduledTick(blockState_1, world_1, blockPos_1, random_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().onScheduledTick(this.getBaseState(), world_1, blockPos_1, random_1);
}

@Override
public boolean activate(BlockState blockState_1, World world_1, BlockPos blockPos_1, PlayerEntity playerEntity_1, Hand hand_1, BlockHitResult blockHitResult_1) {
try {
boolean a = super.activate(blockState_1, world_1, blockPos_1, playerEntity_1, hand_1, blockHitResult_1);
return a || this.getBase().getDefaultState().activate(world_1, playerEntity_1, hand_1, blockHitResult_1);
} catch (IllegalArgumentException ignored) {
return super.activate(blockState_1, world_1, blockPos_1, playerEntity_1, hand_1, blockHitResult_1);
}
boolean a = super.activate(blockState_1, world_1, blockPos_1, playerEntity_1, hand_1, blockHitResult_1);
return a || this.getBaseState().activate(world_1, playerEntity_1, hand_1, blockHitResult_1);
}

@Override
public void onDestroyedByExplosion(World world_1, BlockPos blockPos_1, Explosion explosion_1) {
super.onDestroyedByExplosion(world_1, blockPos_1, explosion_1);
try {
this.getBase().onDestroyedByExplosion(world_1, blockPos_1, explosion_1);
} catch (IllegalArgumentException ignored) {}
this.getBase().onDestroyedByExplosion(world_1, blockPos_1, explosion_1);
}

public BlockState getPlacementState(ItemPlacementContext itemPlacementContext_1) {
Expand Down
Loading

0 comments on commit fa3c8d9

Please sign in to comment.