Change radio model
This commit is contained in:
parent
c78eba73b0
commit
3f6d2f2be5
9 changed files with 217 additions and 63 deletions
7
CHANGELOG
Normal file
7
CHANGELOG
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
0.1 -> 0.2
|
||||
* Added new dirt path block - till coarse dirt with a rake
|
||||
* Added golden lamp crafting recipe
|
||||
|
||||
Changed some models to more original ones
|
||||
* TV
|
||||
* Radio
|
||||
|
|
@ -5,16 +5,16 @@ org.gradle.parallel=true
|
|||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/develop
|
||||
minecraft_version=1.20.1
|
||||
yarn_mappings=1.20.1+build.1
|
||||
loader_version=0.14.22
|
||||
yarn_mappings=1.20.1+build.10
|
||||
loader_version=0.14.23
|
||||
|
||||
# Mod Properties
|
||||
mod_version=0.1
|
||||
maven_group=su.a71
|
||||
mod_id=new_soviet
|
||||
|
||||
# Dependencies
|
||||
fabric_version=0.89.0+1.20.1
|
||||
# Dependencies (Fabric API)
|
||||
fabric_version=0.90.0+1.20.1
|
||||
|
||||
# Modrinth publishing
|
||||
modrinth_token=tokenhere
|
||||
|
|
@ -40,6 +40,7 @@ public class NewSovietClient implements ClientModInitializer {
|
|||
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLUE_CONCRETE_WITH_BARS, RenderLayer.getCutout());
|
||||
|
||||
// BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new);
|
||||
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RADIO_RECEIVER, RenderLayer.getCutout());
|
||||
|
||||
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.WHITE_BOUNDARY_MARKER, RenderLayer.getCutout());
|
||||
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER, RenderLayer.getCutout());
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ public class RadioReceiverBlock extends HorizontalFacingBlock {
|
|||
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) {
|
||||
Direction dir = state.get(FACING);
|
||||
return switch (dir) {
|
||||
case NORTH, SOUTH -> VoxelShapes.cuboid(0.0625f, 0.0f, 0.3125f, 0.9375f, 0.5625f, 0.6875f);
|
||||
case EAST, WEST -> VoxelShapes.cuboid(0.3125f, 0.0f, 0.0625f, 0.6875f, 0.5625f, 0.9375f);
|
||||
case NORTH, SOUTH -> Block.createCuboidShape(2, 0, 5, 14, 8, 11);
|
||||
case EAST, WEST -> Block.createCuboidShape(5, 0, 2, 11, 8, 14);
|
||||
default -> VoxelShapes.fullCube();
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -435,6 +435,6 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
|
|||
|
||||
addDropWithSilkTouch(NSE_Custom.LIGHT_BULB_LAMP);
|
||||
addDropWithSilkTouch(NSE_Blocks.BARBED_WIRE);
|
||||
|
||||
// addDropWithSilkTouch(NSE_Blocks.DIRT_ROAD);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,85 +1,232 @@
|
|||
{
|
||||
"credit": "Made with Blockbench",
|
||||
"texture_size": [64, 64],
|
||||
"texture_size": [32, 32],
|
||||
"textures": {
|
||||
"0": "new_soviet:block/custom/electronics/radio",
|
||||
"particle": "new_soviet:block/custom/electronics/radio_particle"
|
||||
"particle": "new_soviet:block/custom/electronics/radio"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"name": "root",
|
||||
"from": [1, 0, 5],
|
||||
"to": [15, 9, 11],
|
||||
"from": [2, 0, 5],
|
||||
"to": [14, 8, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [1.5, 1.5, 5, 3.75], "texture": "#0"},
|
||||
"east": {"uv": [0, 1.5, 1.5, 3.75], "texture": "#0"},
|
||||
"south": {"uv": [6.5, 1.5, 10, 3.75], "texture": "#0"},
|
||||
"west": {"uv": [5, 1.5, 6.5, 3.75], "texture": "#0"},
|
||||
"up": {"uv": [5, 1.5, 1.5, 0], "texture": "#0"},
|
||||
"down": {"uv": [8.5, 0, 5, 1.5], "texture": "#0"}
|
||||
"north": {"uv": [0, 3, 6, 7], "texture": "#0"},
|
||||
"east": {"uv": [9, 3, 6, 7], "texture": "#0"},
|
||||
"south": {"uv": [9, 3, 15, 7], "texture": "#0"},
|
||||
"west": {"uv": [6, 3, 9, 7], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 6, 3], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [6, 6.5, 9, 7], "rotation": 270, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "aerial",
|
||||
"from": [3, 9, 8.5],
|
||||
"to": [4, 15, 8.5],
|
||||
"rotation": {"angle": -22.5, "axis": "z", "origin": [3, 9, 8.5]},
|
||||
"from": [2, 0, 5.5],
|
||||
"to": [14, 8, 5.5],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0.25, 1.5], "texture": "#0"},
|
||||
"east": {"uv": [0, 0, 0, 1.5], "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 0.25, 1.5], "texture": "#0"},
|
||||
"west": {"uv": [0.25, 0, 0.25, 1.5], "texture": "#0"},
|
||||
"up": {"uv": [0.25, 0, 0, 0], "texture": "#0"},
|
||||
"down": {"uv": [0.5, 0, 0.25, 0], "texture": "#0"}
|
||||
"north": {"uv": [0, 7, 6, 11], "texture": "#0"},
|
||||
"east": {"uv": [0, 7, 6, 11], "texture": "#0"},
|
||||
"south": {"uv": [0, 7, 6, 11], "texture": "#0"},
|
||||
"west": {"uv": [0, 7, 6, 11], "texture": "#0"},
|
||||
"up": {"uv": [0, 7, 6, 11], "texture": "#0"},
|
||||
"down": {"uv": [0, 7, 6, 11], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [2, 0, 10.5],
|
||||
"to": [14, 8, 10.5],
|
||||
"faces": {
|
||||
"north": {"uv": [9, 7, 15, 11], "texture": "#0"},
|
||||
"east": {"uv": [9, 7, 15, 11], "texture": "#0"},
|
||||
"south": {"uv": [9, 7, 15, 11], "texture": "#0"},
|
||||
"west": {"uv": [9, 7, 15, 11], "texture": "#0"},
|
||||
"up": {"uv": [9, 7, 15, 11], "texture": "#0"},
|
||||
"down": {"uv": [9, 7, 15, 11], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 1, 5],
|
||||
"to": [13, 1, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [0.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [0.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [0.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [0.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [0.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [0.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 1, 10],
|
||||
"to": [13, 1, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [9.5, 6.5, 14.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [9.5, 6.5, 14.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [9.5, 6.5, 14.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [9.5, 6.5, 14.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [9.5, 6.5, 14.5, 7], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [9.5, 6.5, 14.5, 7], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 7, 10],
|
||||
"to": [13, 7, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [9.5, 3, 14.5, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [9.5, 3, 14.5, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [9.5, 3, 14.5, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [9.5, 3, 14.5, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [9.5, 3, 14.5, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [9.5, 3, 14.5, 3.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 1, 5],
|
||||
"to": [3, 4, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [5.5, 5, 6, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [5.5, 5, 6, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [5.5, 5, 6, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [5.5, 5, 6, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [5.5, 5, 6, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [5.5, 5, 6, 6.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 1, 10],
|
||||
"to": [3, 7, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [9, 6.5, 9.5, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [9, 3.5, 9.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [9, 6.5, 9.5, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [9, 3.5, 9.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [9, 3.5, 9.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [9, 3.5, 9.5, 6.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [13, 1, 10],
|
||||
"to": [13, 7, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [14.5, 6.5, 15, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [14.5, 6.5, 15, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [14.5, 6.5, 15, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [14.5, 6.5, 15, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [14.5, 6.5, 15, 3.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [14.5, 6.5, 15, 3.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [13, 1, 5],
|
||||
"to": [13, 4, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 5, 0.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [0, 5, 0.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [0, 5, 0.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [0, 5, 0.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [0, 5, 0.5, 6.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [0, 5, 0.5, 6.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [4, 5, 5],
|
||||
"to": [4, 7, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [5, 3.5, 5.5, 4.5], "texture": "#0"},
|
||||
"east": {"uv": [5, 3.5, 5.5, 4.5], "texture": "#0"},
|
||||
"south": {"uv": [5, 3.5, 5.5, 4.5], "texture": "#0"},
|
||||
"west": {"uv": [5, 3.5, 5.5, 4.5], "texture": "#0"},
|
||||
"up": {"uv": [5, 3.5, 5.5, 4.5], "texture": "#0"},
|
||||
"down": {"uv": [5, 3.5, 5.5, 4.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [12, 5, 5],
|
||||
"to": [12, 7, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [0.5, 3.5, 1, 4.5], "texture": "#0"},
|
||||
"east": {"uv": [0.5, 3.5, 1, 4.5], "texture": "#0"},
|
||||
"south": {"uv": [0.5, 3.5, 1, 4.5], "texture": "#0"},
|
||||
"west": {"uv": [0.5, 3.5, 1, 4.5], "texture": "#0"},
|
||||
"up": {"uv": [0.5, 3.5, 1, 4.5], "texture": "#0"},
|
||||
"down": {"uv": [0.5, 3.5, 1, 4.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 4, 5],
|
||||
"to": [13, 4, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [0.5, 4.5, 5.5, 5], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [0.5, 4.5, 5.5, 5], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [0.5, 4.5, 5.5, 5], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [0.5, 4.5, 5.5, 5], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [0.5, 4.5, 5.5, 5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [0.5, 4.5, 5.5, 5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [4, 5, 5],
|
||||
"to": [12, 5, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [1, 5, 5, 4.5], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [1, 5, 5, 4.5], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [1, 5, 5, 4.5], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [1, 5, 5, 4.5], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [1, 5, 5, 4.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [1, 5, 5, 4.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [4, 7, 5],
|
||||
"to": [12, 7, 6],
|
||||
"faces": {
|
||||
"north": {"uv": [1, 3.5, 5, 3], "rotation": 180, "texture": "#0"},
|
||||
"east": {"uv": [1, 3.5, 5, 3], "rotation": 180, "texture": "#0"},
|
||||
"south": {"uv": [1, 3.5, 5, 3], "rotation": 180, "texture": "#0"},
|
||||
"west": {"uv": [1, 3.5, 5, 3], "rotation": 180, "texture": "#0"},
|
||||
"up": {"uv": [1, 3.5, 5, 3], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [1, 3.5, 5, 3], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [11, 6.5, 9],
|
||||
"to": [12, 14.5, 9],
|
||||
"rotation": {"angle": 45, "axis": "z", "origin": [10.5, 8, 9]},
|
||||
"faces": {
|
||||
"north": {"uv": [15, 3, 15.5, 7], "texture": "#0"},
|
||||
"south": {"uv": [15, 3, 15.5, 7], "texture": "#0"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
"rotation": [44, 26, 0],
|
||||
"translation": [0, 1.75, 1.25],
|
||||
"scale": [0.49, 0.49, 0.49]
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
"rotation": [44, 26, 0],
|
||||
"translation": [0, 1.75, 1.25],
|
||||
"scale": [0.49, 0.49, 0.49]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"translation": [3, 1.5, 0],
|
||||
"scale": [0.7, 0.7, 0.7]
|
||||
"rotation": [0, 133, 0],
|
||||
"translation": [13, 0, -7.75]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"translation": [2.75, 1.5, 0],
|
||||
"scale": [0.7, 0.7, 0.7]
|
||||
"rotation": [0, 133, 0],
|
||||
"translation": [13, 0, -7.75]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 0.5, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
"translation": [0, 2.75, 0],
|
||||
"scale": [0.49, 0.49, 0.49]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"translation": [0, 1.75, 0],
|
||||
"scale": [0.9, 0.9, 0.9]
|
||||
"rotation": [30, 135, 0],
|
||||
"translation": [0, 2.75, 0]
|
||||
},
|
||||
"head": {
|
||||
"scale": [0, 0, 0]
|
||||
"fixed": {
|
||||
"rotation": [-90, 0, 0],
|
||||
"translation": [0, 0, -16],
|
||||
"scale": [2, 2, 2]
|
||||
}
|
||||
},
|
||||
"groups": [
|
||||
{
|
||||
"name": "root",
|
||||
"origin": [0, 0, 0],
|
||||
"color": 0,
|
||||
"nbt": "{}",
|
||||
"children": [
|
||||
0,
|
||||
{
|
||||
"name": "aerial",
|
||||
"origin": [-5, 9, 0.5],
|
||||
"color": 1,
|
||||
"nbt": "{}",
|
||||
"children": [1]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 742 B After Width: | Height: | Size: 676 B |
Binary file not shown.
|
Before Width: | Height: | Size: 276 B |
|
|
@ -9,7 +9,6 @@
|
|||
"Karoter2"
|
||||
],
|
||||
"contact": {
|
||||
"homepage": "https://nse.a71.su/",
|
||||
"sources": "https://git.a71.su/Ethyl/New-Soviet-Era"
|
||||
},
|
||||
"license": "Mixed: All rights reserved assets & MIT code",
|
||||
|
|
|
|||
Loading…
Reference in a new issue