MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed SDF, fixes

Browse source
This commit is contained in:
paulevsGitch 2021-05-26 15:22:10 +03:00
parent 27e077ddd0
commit 84e35f6a86
74 changed files with 232 additions and 1515 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ru/betterend/blocks/ChandelierBlock.java
View file

@ -84,12 +84,12 @@ public class ChandelierBlock extends AttachedBlock implements IRenderTypeable, B
rotation = BlockModelRotation.X0_Y180;
break;
case WEST:
default:
rotation = BlockModelRotation.X0_Y90;
break;
default:
break;
}
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),
"block/" + stateId.getPath() + state);
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(), "block/" + stateId.getPath() + state);
registerBlockModel(stateId, modelId, blockState, modelCache);
return ModelsHelper.createMultiVariant(modelId, rotation.getRotation(), false);
}

7
src/main/java/ru/betterend/blocks/basis/EndBarrelBlock.java
View file

@ -115,8 +115,7 @@ public class EndBarrelBlock extends BarrelBlock implements BlockModelProvider {
@Override
public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
String open = blockState.getValue(OPEN) ? "_open" : "";
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),
"block/" + stateId.getPath() + open);
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(), "block/" + stateId.getPath() + open);
registerBlockModel(stateId, modelId, blockState, modelCache);
Direction facing = blockState.getValue(FACING);
BlockModelRotation rotation = BlockModelRotation.X0_Y0;
@ -125,8 +124,8 @@ public class EndBarrelBlock extends BarrelBlock implements BlockModelProvider {
case EAST: rotation = BlockModelRotation.X90_Y90; break;
case SOUTH: rotation = BlockModelRotation.X90_Y180; break;
case WEST: rotation = BlockModelRotation.X90_Y270; break;
case DOWN:
default: rotation = BlockModelRotation.X180_Y0; break;
case DOWN: rotation = BlockModelRotation.X180_Y0; break;
default: break;
}
return ModelsHelper.createMultiVariant(modelId, rotation.getRotation(), false);
}

11
src/main/java/ru/betterend/blocks/basis/EndButtonBlock.java
View file

@ -56,23 +56,22 @@ public abstract class EndButtonBlock extends ButtonBlock implements BlockModelPr
@Override
public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
String powered = blockState.getValue(POWERED) ? "_powered" : "";
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),
"block/" + stateId.getPath() + powered);
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(), "block/" + stateId.getPath() + powered);
registerBlockModel(stateId, modelId, blockState, modelCache);
AttachFace face = blockState.getValue(FACE);
boolean isCeiling = face == AttachFace.CEILING;
int x = 0, y = 0;
switch (face) {
case CEILING: x = 180; break;
case WALL:
default: x = 90; break;
case WALL: x = 90; break;
default: break;
}
switch (blockState.getValue(FACING)) {
case NORTH: if (isCeiling) { y = 180; } break;
case EAST: y = isCeiling ? 270 : 90; break;
case SOUTH: if(!isCeiling) { y = 180; } break;
case WEST:
default: y = isCeiling ? 90 : 270; break;
case WEST: y = isCeiling ? 90 : 270; break;
default: break;
}
BlockModelRotation rotation = BlockModelRotation.by(x, y);
return ModelsHelper.createMultiVariant(modelId, rotation.getRotation(), face == AttachFace.WALL);

26
src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java
View file

@ -58,9 +58,10 @@ public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockMod
pattern = Patterns.createJson(Patterns.BLOCK_DOOR_BOTTOM_HINGE, blockName, blockName);
break;
case TOP:
default:
pattern = Patterns.createJson(Patterns.BLOCK_DOOR_TOP, blockName, blockName);
break;
default:
break;
}
return ModelsHelper.fromPattern(pattern);
}
@ -76,34 +77,40 @@ public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockMod
case EAST:
if (hinge && open) {
rotation = BlockModelRotation.X0_Y90;
} else if (open) {
}
else if (open) {
rotation = BlockModelRotation.X0_Y270;
}
break;
case SOUTH:
if (!hinge && !open || hinge && !open) {
rotation = BlockModelRotation.X0_Y90;
} else if (hinge) {
}
else if (hinge) {
rotation = BlockModelRotation.X0_Y180;
}
break;
case WEST:
if (!hinge && !open || hinge && !open) {
rotation = BlockModelRotation.X0_Y180;
} else if (hinge) {
}
else if (hinge) {
rotation = BlockModelRotation.X0_Y270;
} else {
}
else {
rotation = BlockModelRotation.X0_Y90;
}
break;
case NORTH:
default:
if (!hinge && !open || hinge && !open) {
rotation = BlockModelRotation.X0_Y270;
} else if (!hinge) {
}
else if (!hinge) {
rotation = BlockModelRotation.X0_Y180;
}
break;
default:
break;
}
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),
"block/" + stateId.getPath() + "_" + doorType);
@ -130,10 +137,7 @@ public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockMod
}
protected enum DoorType implements StringRepresentable {
BOTTOM_HINGE("bottom_hinge"),
TOP_HINGE("top_hinge"),
BOTTOM("bottom"),
TOP("top");
BOTTOM_HINGE("bottom_hinge"), TOP_HINGE("top_hinge"), BOTTOM("bottom"), TOP("top");
private final String name;

3
src/main/java/ru/betterend/blocks/basis/EndPillarBlock.java
View file

@ -47,8 +47,7 @@ public class EndPillarBlock extends RotatedPillarBlock implements BlockModelProv
@Override
public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),
"block/" + stateId.getPath());
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(), "block/" + stateId.getPath());
registerBlockModel(stateId, modelId, blockState, modelCache);
return ModelsHelper.createRotatedModel(modelId, blockState.getValue(AXIS));
}

10
src/main/java/ru/betterend/blocks/basis/EndStairsBlock.java
View file

@ -69,12 +69,10 @@ public class EndStairsBlock extends StairBlock implements BlockModelProvider {
StairsShape shape = blockState.getValue(SHAPE);
switch (shape) {
case INNER_LEFT:
case INNER_RIGHT:
state = "_inner"; break;
case INNER_RIGHT: state = "_inner"; break;
case OUTER_LEFT:
case OUTER_RIGHT:
default:
state = "_outer"; break;
case OUTER_RIGHT: state = "_outer"; break;
default: break;
}
ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(), "block/" + stateId.getPath() + state);
registerBlockModel(stateId, modelId, blockState, modelCache);
@ -100,9 +98,9 @@ public class EndStairsBlock extends StairBlock implements BlockModelProvider {
else if (!isLeft) y = 90;
break;
case WEST:
default:
y = (isTop && isRight) ? 270 : (!isTop && isLeft) ? 90 : 180;
break;
default: break;
}
BlockModelRotation rotation = BlockModelRotation.by(x, y);
return ModelsHelper.createMultiVariant(modelId, rotation.getRotation(), true);

2
src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java
View file

@ -77,9 +77,9 @@ public class EndTrapdoorBlock extends TrapDoorBlock implements IRenderTypeable,
y = (isTop && isOpen) ? 0 : 180;
break;
case WEST:
default:
y = (isTop && isOpen) ? 90 : 270;
break;
default: break;
}
BlockModelRotation rotation = BlockModelRotation.by(x, y);
return ModelsHelper.createMultiVariant(modelId, rotation.getRotation(), false);

2
src/main/java/ru/betterend/blocks/basis/PedestalBlock.java
View file

@ -361,9 +361,9 @@ public class PedestalBlock extends BlockBaseNotFull implements EntityBlock {
pattern = Patterns.createJson(Patterns.BLOCK_PEDESTAL_BOTTOM, textures);
break;
case PILLAR:
default:
pattern = Patterns.createJson(Patterns.BLOCK_PEDESTAL_PILLAR, textures);
break;
default: break;
}
return ModelsHelper.fromPattern(pattern);
}