Compare commits

..

No commits in common. "7ac09095e5e34c3dd060ac674220820cd8eb77b2" and "5db68cbf85ca152c08fe626a0618e8efb9fc8214" have entirely different histories.

1703 changed files with 31105 additions and 3584 deletions

View file

@ -3,14 +3,15 @@
* Make good README.md stuff
=== STUFF TO ADD/FIX ===
* Add slab and stair variations
* Add fences
* Add windows
* Add (with functionality) present appliance/furniture/electronics textures
* Add advancements (with datagen)
* Add achievement criterion for dice and advancements
* PO2 wall (fix)
* What's switch type 2?
* All the lamps (lamp posts too!)
* Cigarette and handrail are BROKEN and the code is a MESS sorry, but it needs CLEANUP
* Concrete with bars should have proper hitbox, placeable upside down, and act like dripstone
* Fix post lamp hitboxes
=== ACHIEVEMENTS ===
Kolkhoz warrior - kill a zombie, skeleton, creeper and spider with a sickle

View file

@ -1,18 +1,18 @@
* aquamarine recipe
* whitewash recipe
* concrete recipe
* concrete with bars recipe
* parquet recipe
* linoleum recipe
* metal plating recipe
* crate recipe
* po-2 recipe
* no wallpaper recipes (intended?)
* no handrail recipe
* no nutrient block recipe (intended? compressed bread?)
* light bulb recipe
* cigarette recipe
* siren recipe
* no landmine recipe - intended
* switch recipe
* checkers and chess recipe
aquamarine recipe
whitewash recipe
concrete recipe
concrete with bars recipe
parquet recipe
linoleum recipe
metal plating recipe
crate recipe
po-2 recipe
no wallpaper recipes (intended?)
no handrail recipe
no nutrient block recipe (intended? compressed bread?)
light bulb recipe
sigarette recipe
siren recipe
no landmine recipe - intended
switch recipe
checkers and chess recipe

View file

@ -6,6 +6,7 @@ import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
import net.minecraft.client.render.RenderLayer;
import su.a71.new_soviet.entity.TVBlockEntity;
import su.a71.new_soviet.registration.NSE_Blocks;
import su.a71.new_soviet.registration.NSE_Custom;

View file

@ -4,23 +4,31 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.block.BlockState;
import net.minecraft.block.SignBlock;
import net.minecraft.block.entity.SignText;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
import net.minecraft.client.render.block.entity.SignBlockEntityRenderer;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.OrderedText;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RotationAxis;
import net.minecraft.util.math.Vec3d;
import su.a71.new_soviet.entities.TVBlockEntity;
import org.joml.Matrix4f;
import su.a71.new_soviet.entity.TVBlockEntity;
import java.util.List;
@Environment(EnvType.CLIENT)
public class TVBlockEntityRenderer implements BlockEntityRenderer<TVBlockEntity> {
// private static TextRenderer textRenderer;
private static TextRenderer textRenderer;
private static final Vec3d TEXT_OFFSET = new Vec3d(0.0, 0.3333333432674408, 0.046666666865348816);
public TVBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
// textRenderer = ctx.getTextRenderer();
textRenderer = ctx.getTextRenderer();
}
@Override

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/aquamarine/aquamarine_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/wallpapers/beige_wallpaper"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/diorite/big_diorite_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/granite/big_granite_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/green/big_green_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/sand/big_sand_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/sand/big_sand_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/tuff/big_tuff_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/linoleum/blue_linoleum"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/industrial/warning/blue_warning"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/linoleum/brown_linoleum"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/wallpapers/brown_wallpaper"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/calcite/calcite_tiles"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_birch_door_bottom",
"top": "new_soviet:block/doors/chiseled_birch_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom",
"top": "new_soviet:block/doors/chiseled_mangrove_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_oak_door_bottom",
"top": "new_soviet:block/doors/chiseled_oak_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_left_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "minecraft:block/door_top_right_open",
"textures": {
"bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom",
"top": "new_soviet:block/doors/chiseled_spruce_door_top"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/aquamarine/cracked_aquamarine_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/cracked_brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/calcite/cracked_calcite_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/cracked_dark_brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/deepslate/cracked_deepslate_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/diorite/cracked_diorite_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/dripstone/cracked_dripstone_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/aquamarine/cracked_glazed_aquamarine_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/cracked_glazed_brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/light_blue/cracked_glazed_light_blue_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/teal/cracked_glazed_teal_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/white/cracked_glazed_white_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/green/cracked_green_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/green/cracked_green_bricks_2"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/green_white/cracked_green_white_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/light_blue/cracked_light_blue_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/research_institute/cracked_nii_wall_1"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/red/cracked_red_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/sand/cracked_sand_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/sand/cracked_sand_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/teal/cracked_teal_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/tuff/cracked_tuff_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/tuff/cracked_tuff_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/whitewash/cracked_whitewash"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_acacia_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_birch_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/linoleum/cross_brown_linoleum"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_crimson_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_dark_oak_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_jungle_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_mangrove_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_oak_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/linoleum/cross_orange_linoleum"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/sand/cross_sand_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/cross_spruce_planks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/linoleum/cyan_linoleum"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/industrial/warning/cyan_warning"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/dark_brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/deepslate/deepslate_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/calcite/diagonal_calcite_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/deepslate/diagonal_deepslate_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/diorite/diorite_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/aquamarine/dirty_aquamarine_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/dirty_brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/dirty_dark_brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/dripstone/dripstone_bricks"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/dripstone/dripstone_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/aquamarine/glazed_aquamarine_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/brick/glazed_brick_tiles"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/light_blue/glazed_light_blue_tiles"
}
}

Some files were not shown because too many files have changed in this diff Show more