From 3f6d2f2be550dde41875a18a008ada2292b20f4b Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Wed, 18 Oct 2023 23:36:50 +0300 Subject: [PATCH] Change radio model --- CHANGELOG | 7 + gradle.properties | 8 +- .../su/a71/new_soviet/NewSovietClient.java | 1 + .../new_soviet/blocks/RadioReceiverBlock.java | 4 +- .../new_soviet/datagen/BlockLootTables.java | 2 +- .../models/block/radio_receiver.json | 257 ++++++++++++++---- .../block/custom/electronics/radio.png | Bin 742 -> 676 bytes .../custom/electronics/radio_particle.png | Bin 276 -> 0 bytes src/main/resources/fabric.mod.json | 1 - 9 files changed, 217 insertions(+), 63 deletions(-) create mode 100644 CHANGELOG delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio_particle.png diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..338d4da --- /dev/null +++ b/CHANGELOG @@ -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 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 44d0b00..1976e9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 \ No newline at end of file diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 467c460..4a2876f 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -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()); diff --git a/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java b/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java index 40827b3..cb48fda 100644 --- a/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java @@ -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(); }; } diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java index 4717c23..b055503 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -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); } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/radio_receiver.json b/src/main/resources/assets/new_soviet/models/block/radio_receiver.json index 5fb0d5e..60ce66f 100644 --- a/src/main/resources/assets/new_soviet/models/block/radio_receiver.json +++ b/src/main/resources/assets/new_soviet/models/block/radio_receiver.json @@ -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] - } - ] - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio.png index 0ad2a4591b79e1c885849b94a715726d1b638fd7..4960d22b24d105ad02995766cdd8f1cb83be256d 100644 GIT binary patch literal 676 zcmV;V0$crwP)Px%UP(kjR9J=Wl|5(^VHn4M>0LrYl1nHw#}!-}KcEnB5Jl*s2p!Z_5VTGrI=Bep z15qC0;&?Hr4A$-9WboFoh8t2LSDw2<#-;vK*4q8j*HMt&iXN<*gFg z?e{^hIyQMN<9d#bqvVYkG}NDzVp#P$RmaAv*L^?G);_{CcSXEo@WuD);Z^tYt=IJR zWt##P7Y!bao#E`I`=LUe93OS{vJn`gYFVz_eB|%ti*WwqR~8oxF3N((b)`{!!SL5w zfmdABvfHk2B-qhE+vNDDJD?^4V@kTUxdZdlWA5x+k)ub32(s%Fx59v$VB+OBuASTG zTYx810wt9~R4QB;QJQjk0A}Zkg)mJ-rGhX`O1jmQBLn0H zRepRalRKaV+A!#4gV{NcOwsorKUfDAP!DG}X`qWPy6B>dJ;y(aRxO!d-MokZ0000< KMNUMnLSTZV226GU literal 742 zcmVF&36mbunB7?bG77h7XgeEVnO30O-CR@qK4^#|FSG+l-FH0Qi{v zMNd>`yHEmXdH#6x&iS+^1kEsX_}=|6&q z|6jCb4^@x4y}Z}gv_i`&ojQmxWzI{(1cd#UfBfD8aE5u1bN9WArZvj`#P}FD2kS>b zGn<)kNds6|N`)?a79HN%KAFlgF+K(mIsuDI%f7!)7*A*3wRLsS0CFpN00vI}Z`JT; zPiBY@_mW=S3Ur*Fn?9*_8NYhnt4b^GRi&LYfX{0d#lxez2~N$@L62T)#h7x{JJ4bh zRm_lc&}nHV%mN-`Vk48^P0mQ{k0`ose4ZSL~m#z zf0E4>fUf{Gy$RGbE*6XO=>9|JI=7N{607Pp%Qox;3(PFr;EAUlG_!0wftuyYZf|dA z+j${BIf*^{%D1q3E0UNa_GPiAoLRP=#HxDJt6QW`o;R8|3i}7u3)k+lT{Nilo^Jqv zo|vbv|7utsc z>rOfF-`=X^7FH`q?q YKj^15j#0S3y8r+H07*qoM6N<$f(;p7mjD0& diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio_particle.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio_particle.png deleted file mode 100644 index 372234ec851424dda984c0f250bce662b71c7517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|&Uv~xhFJ6_ z$6OZvKEILaz@Y;N4s3Y+#FtIgOmC9Oz29GZ51x&YO=4hXW^V3UsFTSyXHRDVBagsi zp&4fl4jegfz+uzpiC+)Ie)xAXnhgXJ1DW(He(|mod&eYUFjY)3!+4jJn#`*XwgTpR z`~JCYQA^n>vb*8wxu3^*zSq?z2P8dKIw=ZbC0P8Q!KJt3`)ldLE4j~0_&Ks3VX63# zRq^#9cT=(gt0()3St24oK1BaynA-h_wQ1JI6^WG}9thuwT(9Sl5p&O>(C&&U1ItcV VBgteoHK5NJJYD@<);T3K0RW-9ZYKZ$ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 59e56bb..9d536cb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -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",