Motschen/Decorative
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/Decorative.git synced 2025-12-16 21:15:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decorative 4.1.1 - Bugfixes

Browse Source 
Fixed #9
Fixed bath tires having wrong colors
Update MidnightLib
This commit is contained in:
Motschen
2021-06-09 19:48:32 +02:00
parent 57c92dbcba
commit 370a802886
6 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java
View File

@@ -72,24 +72,28 @@ public class Springboard extends HorizontalFacingBlock {
} else {
arg.setBlockState(pos.north(), state.with(PART, Part.FRONT).with(FACING, Direction.NORTH));
}
break;
case EAST:
if (!arg.getBlockState(pos.east()).isAir()) {
arg.breakBlock(pos, true);
} else {
arg.setBlockState(pos.east(), state.with(PART, Part.FRONT).with(FACING, Direction.EAST));
}
break;
case SOUTH:
if (!arg.getBlockState(pos.south()).isAir()) {
arg.breakBlock(pos, true);
} else {
arg.setBlockState(pos.south(), state.with(PART, Part.FRONT).with(FACING, Direction.SOUTH));
}
break;
case WEST:
if (!arg.getBlockState(pos.west()).isAir()) {
arg.breakBlock(pos, true);
} else {
arg.setBlockState(pos.west(), state.with(PART, Part.FRONT).with(FACING, Direction.WEST));
}
break;
}
}
}
@@ -98,23 +102,47 @@ public class Springboard extends HorizontalFacingBlock {
switch (state.get(PART)) {
case BACK: switch (state.get(FACING)) {
case NORTH:
if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.north(), true);}
if (world.getBlockState(pos.north()).contains(PART)) {
world.breakBlock(pos.north(), true);
break;
}
case EAST:
if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.east(), true);}
if (world.getBlockState(pos.east()).contains(PART)) {
world.breakBlock(pos.east(), true);
break;
}
case SOUTH:
if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true);}
if (world.getBlockState(pos.south()).contains(PART)) {
world.breakBlock(pos.south(), true);
break;
}
case WEST:
if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.west(), true);}
if (world.getBlockState(pos.west()).contains(PART)) {
world.breakBlock(pos.west(), true);
break;
}
}
case FRONT: switch (state.get(FACING)) {
case NORTH:
if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true); }
if (world.getBlockState(pos.south()).contains(PART)) {
world.breakBlock(pos.south(), true);
break;
}
case EAST:
if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.south(), true); }
if (world.getBlockState(pos.west()).contains(PART)) {
world.breakBlock(pos.west(), true);
break;
}
case SOUTH:
if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.south(), true); }
if (world.getBlockState(pos.north()).contains(PART)) {
world.breakBlock(pos.north(), true);
break;
}
case WEST:
if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.south(), true); }
if (world.getBlockState(pos.east()).contains(PART)) {
world.breakBlock(pos.east(), true);
break;
}
}
}
}
@@ -213,7 +241,7 @@ public class Springboard extends HorizontalFacingBlock {
}
public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
return !worldView.isAir(pos.down());
return !worldView.isAir(pos.down()) && worldView.getBlockState(pos.offset(state.get(FACING))) == Blocks.AIR.getDefaultState();
}
}

2
src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BathTireRenderer.java
View File

@@ -11,7 +11,7 @@ import net.minecraft.util.Identifier;
@Environment(EnvType.CLIENT)
public class BathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
private static Identifier TEXTURE;
private final Identifier TEXTURE;
public BathTireRenderer(EntityRendererFactory.Context context, DyeColor color) {
super(context, new BathTireModel(context.getPart(BathTireModel.BATH_TIRE_MODEL_LAYER)), 0.5F);
TEXTURE = Identifier.tryParse("textures/block/"+color.getName()+"_concrete.png");

3
src/main/resources/fabric.mod.json
View File

@@ -25,9 +25,6 @@
],
"client": [
"eu.midnightdust.motschen.decorative.DecorativeClient"
],
"modmenu": [
"eu.midnightdust.motschen.decorative.config.ModMenuIntegration"
]
},