Compare commits

...

2 commits

Author SHA1 Message Date
367beac591 New logo and minor housekeeping 2023-12-27 10:32:29 +03:00
ead1877aa1 More minor concrete fixes 2023-12-27 10:07:39 +03:00
14 changed files with 92 additions and 32 deletions

View file

@ -10,9 +10,6 @@ It was inspired by the 1.16 [Soviet Era](https://www.curseforge.com/minecraft/mc
* Furniture and appliances to decorate your house * Furniture and appliances to decorate your house
* Lots of other things! * Lots of other things!
NOTE: Right now the mod is in beta, and some of the blocks do not have crafting recipes. This will be fixed soon.
We also have many features in development, so stay tuned!
#### Frequently asked questions #### Frequently asked questions
**Q**: Can I use this mod in my modpack?\ **Q**: Can I use this mod in my modpack?\
**A**: Of course! But please do not claim the mod as your own. A link to this mod would be appreciated too! **A**: Of course! But please do not claim the mod as your own. A link to this mod would be appreciated too!

12
TODO.md
View file

@ -13,14 +13,7 @@
* Figure out electronic devices - function * Figure out electronic devices - function
=== ACHIEVEMENTS === === ACHIEVEMENTS ===
IN -- * Chicken kiev - kill a chicken with aspect of fire sickle
Worker's Tool - acquire a sickle
Kolkhoz Warrior - kill someone with a sickle
Gambler - throw dice 100 times
Lucky throw - roll perfect die 100 times
Serious Addiction - throw a dice 1000 times, and then reevaluate your life choices
TODO --
Chicken kiev - kill a chicken with aspect of fire sickle
=== VERSION SPECIFIC === === VERSION SPECIFIC ===
## 0.3 ## 0.3
@ -32,7 +25,8 @@ Goals left - QOL
## 0.4 ## 0.4
* Implement antenna everywhere * Implement antenna everywhere
* Add crafting recipes for banner patterns; change item textures; remake grain * Add crafting recipes for banner patterns; change item textures; remake grain
* Add translation for new concrete and potentially new achievements? * Add RPR translation for new concrete and potentially new achievements?
* Concrete with bars 2 axis rotation
* TV rework #3 (new colours, second static, ...?) * TV rework #3 (new colours, second static, ...?)
* More landmines, land mine base item, create integration for it * More landmines, land mine base item, create integration for it
* Rework cigarette (code and some functionality) * Rework cigarette (code and some functionality)

View file

@ -6,16 +6,16 @@ org.gradle.parallel=true
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20.1 minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10 yarn_mappings=1.20.1+build.10
loader_version=0.14.24 loader_version=0.15.3
# Mod Properties # Mod Properties
mod_name=New Soviet Era mod_name=New Soviet Era
mod_version=0.3 mod_version=0.4
maven_group=su.a71 maven_group=su.a71
mod_id=new_soviet mod_id=new_soviet
# Dependencies # Dependencies
fabric_version=0.90.4+1.20.1 fabric_version=0.91.0+1.20.1
modmenu_version=7.2.2 modmenu_version=7.2.2
# Modrinth publishing # Modrinth publishing

View file

@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "new_soviet:beige_concrete_with_bars"
}
],
"rolls": 1.0
}
]
}

View file

@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "new_soviet:blue_concrete_with_bars"
}
],
"rolls": 1.0
}
]
}

View file

@ -82,7 +82,6 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable {
// DyeColor IDs with better colours // DyeColor IDs with better colours
public static int getColour(int id) { public static int getColour(int id) {
return switch (id) { return switch (id) {
case 0 -> 0xffffff;
case 1 -> 0xb67134; case 1 -> 0xb67134;
case 2 -> 0xab4d8b; case 2 -> 0xab4d8b;
case 3 -> 0x398b9c; case 3 -> 0x398b9c;
@ -98,7 +97,7 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable {
case 13 -> 0x1b6031; case 13 -> 0x1b6031;
case 14 -> 0x8b2030; case 14 -> 0x8b2030;
case 15 -> 0x272228; case 15 -> 0x272228;
default -> 0xffffff; default -> 0xffffff; // Also 0
}; };
} }
} }

View file

@ -27,9 +27,7 @@ import net.minecraft.world.BlockView;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldAccess;
import su.a71.new_soviet.NewSoviet;
import su.a71.new_soviet.entities.TVBlockEntity; import su.a71.new_soviet.entities.TVBlockEntity;
import su.a71.new_soviet.registration.NSE_Items;
import su.a71.new_soviet.registration.NSE_Sounds; import su.a71.new_soviet.registration.NSE_Sounds;
import su.a71.new_soviet.util.Shapes; import su.a71.new_soviet.util.Shapes;

View file

@ -52,9 +52,9 @@ public class WindowBlock extends HorizontalFacingBlock {
public BlockState getPlacementState(ItemPlacementContext ctx) { public BlockState getPlacementState(ItemPlacementContext ctx) {
BlockState above = ctx.getWorld().getBlockState(ctx.getBlockPos().up()); BlockState above = ctx.getWorld().getBlockState(ctx.getBlockPos().up());
BlockState below = ctx.getWorld().getBlockState(ctx.getBlockPos().down()); BlockState below = ctx.getWorld().getBlockState(ctx.getBlockPos().down());
// if ((above.getBlock() instanceof Window && ((Window) above.getBlock()).getStateManager().getProperty("broken") == true) || (below.getBlock() instanceof Window)) { if ((above.getBlock() instanceof WindowBlock && ((WindowBlock)above.getBlock()).getStateManager().getProperty("broken").equals(true)) || (below.getBlock() instanceof WindowBlock)) {
//
// } }
return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()); return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite());
} }
} }

View file

@ -12,14 +12,11 @@ import net.minecraft.predicate.entity.DamageSourcePredicate;
import net.minecraft.predicate.entity.EntityEquipmentPredicate; import net.minecraft.predicate.entity.EntityEquipmentPredicate;
import net.minecraft.predicate.entity.EntityPredicate; import net.minecraft.predicate.entity.EntityPredicate;
import net.minecraft.predicate.entity.PlayerPredicate; import net.minecraft.predicate.entity.PlayerPredicate;
import net.minecraft.predicate.item.EnchantmentPredicate;
import net.minecraft.predicate.item.ItemPredicate; import net.minecraft.predicate.item.ItemPredicate;
import net.minecraft.stat.Stats; import net.minecraft.stat.Stats;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.UseAction;
import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.NewSoviet;
import su.a71.new_soviet.items.DiceItem;
import su.a71.new_soviet.registration.NSE_Items; import su.a71.new_soviet.registration.NSE_Items;
import su.a71.new_soviet.registration.NSE_Stats; import su.a71.new_soviet.registration.NSE_Stats;
import su.a71.new_soviet.registration.NSE_Tags; import su.a71.new_soviet.registration.NSE_Tags;

View file

@ -4,7 +4,6 @@ package su.a71.new_soviet.datagen;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.*; import net.minecraft.block.*;
import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.RecipeJsonProvider;
import net.minecraft.data.server.recipe.RecipeProvider; import net.minecraft.data.server.recipe.RecipeProvider;
@ -14,9 +13,7 @@ import net.minecraft.item.ItemConvertible;
import net.minecraft.item.Items; import net.minecraft.item.Items;
import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.recipe.book.RecipeCategory;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.ItemTags;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.registration.NSE_Blocks;
import su.a71.new_soviet.registration.NSE_Custom; import su.a71.new_soviet.registration.NSE_Custom;

View file

@ -2,17 +2,13 @@ package su.a71.new_soviet.items;
import net.minecraft.client.item.TooltipContext; import net.minecraft.client.item.TooltipContext;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.FoodComponents;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundCategory;
import net.minecraft.stat.Stats; import net.minecraft.stat.Stats;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult; import net.minecraft.util.TypedActionResult;
import net.minecraft.util.UseAction;
import net.minecraft.world.World; import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 KiB

After

Width:  |  Height:  |  Size: 211 KiB

View file

@ -173,18 +173,27 @@
"block.new_soviet.chiseled_spruce_door": "Chiseled Spruce Door", "block.new_soviet.chiseled_spruce_door": "Chiseled Spruce Door",
"block.new_soviet.chiseled_birch_door": "Chiseled Birch Door", "block.new_soviet.chiseled_birch_door": "Chiseled Birch Door",
"subtitles.new_soviet.siren": "Siren goes off", "subtitles.new_soviet.siren": "Siren goes off",
"block.new_soviet.concrete": "Concrete",
"block.new_soviet.orange_concrete": "Orange Concrete",
"block.new_soviet.dark_green_concrete": "Dark Green Concrete",
"block.new_soviet.yellow_concrete": "Yellow Concrete", "block.new_soviet.yellow_concrete": "Yellow Concrete",
"block.new_soviet.beige_concrete": "Beige Concrete", "block.new_soviet.beige_concrete": "Beige Concrete",
"block.new_soviet.white_concrete": "White Concrete", "block.new_soviet.white_concrete": "White Concrete",
"block.new_soviet.green_concrete": "Green Concrete", "block.new_soviet.green_concrete": "Green Concrete",
"block.new_soviet.blue_concrete": "Blue Concrete", "block.new_soviet.blue_concrete": "Blue Concrete",
"block.new_soviet.red_concrete": "Red Concrete", "block.new_soviet.red_concrete": "Red Concrete",
"block.new_soviet.cracked_concrete": "Cracked Concrete",
"block.new_soviet.cracked_orange_concrete": "Cracked Orange Concrete",
"block.new_soviet.cracked_dark_green_concrete": "Cracked Dark Green Concrete",
"block.new_soviet.cracked_yellow_concrete": "Cracked Yellow Concrete", "block.new_soviet.cracked_yellow_concrete": "Cracked Yellow Concrete",
"block.new_soviet.cracked_beige_concrete": "Cracked Beige Concrete", "block.new_soviet.cracked_beige_concrete": "Cracked Beige Concrete",
"block.new_soviet.cracked_white_concrete": "Cracked White Concrete", "block.new_soviet.cracked_white_concrete": "Cracked White Concrete",
"block.new_soviet.cracked_green_concrete": "Cracked Green Concrete", "block.new_soviet.cracked_green_concrete": "Cracked Green Concrete",
"block.new_soviet.cracked_blue_concrete": "Cracked Blue Concrete", "block.new_soviet.cracked_blue_concrete": "Cracked Blue Concrete",
"block.new_soviet.cracked_red_concrete": "Cracked Red Concrete", "block.new_soviet.cracked_red_concrete": "Cracked Red Concrete",
"block.new_soviet.concrete_with_bars": "Concrete With Bars",
"block.new_soviet.orange_concrete_with_bars": "Orange Concrete With Bars",
"block.new_soviet.dark_green_concrete_with_bars": "Dark Green Concrete With Bars",
"block.new_soviet.yellow_concrete_with_bars": "Yellow Concrete With Bars", "block.new_soviet.yellow_concrete_with_bars": "Yellow Concrete With Bars",
"block.new_soviet.beige_concrete_with_bars": "Beige Concrete With Bars", "block.new_soviet.beige_concrete_with_bars": "Beige Concrete With Bars",
"block.new_soviet.white_concrete_with_bars": "White Concrete With Bars", "block.new_soviet.white_concrete_with_bars": "White Concrete With Bars",
@ -362,6 +371,10 @@
"block.new_soviet.cracked_tuff_bricks_stairs": "Cracked Tuff Brick Stairs", "block.new_soviet.cracked_tuff_bricks_stairs": "Cracked Tuff Brick Stairs",
"block.new_soviet.mossy_tuff_bricks_slab": "Mossy Tuff Brick Slab", "block.new_soviet.mossy_tuff_bricks_slab": "Mossy Tuff Brick Slab",
"block.new_soviet.mossy_tuff_bricks_stairs": "Mossy Tuff Brick Stairs", "block.new_soviet.mossy_tuff_bricks_stairs": "Mossy Tuff Brick Stairs",
"block.new_soviet.concrete_slab": "Concrete Slab",
"block.new_soviet.concrete_stairs": "Concrete Stairs",
"block.new_soviet.cracked_concrete_slab": "Cracked Concrete Slab",
"block.new_soviet.cracked_concrete_stairs": "Cracked Concrete Stairs",
"block.new_soviet.white_concrete_slab": "White Concrete Slab", "block.new_soviet.white_concrete_slab": "White Concrete Slab",
"block.new_soviet.white_concrete_stairs": "White Concrete Stairs", "block.new_soviet.white_concrete_stairs": "White Concrete Stairs",
"block.new_soviet.cracked_white_concrete_slab": "Cracked White Concrete Slab", "block.new_soviet.cracked_white_concrete_slab": "Cracked White Concrete Slab",
@ -386,6 +399,14 @@
"block.new_soviet.green_concrete_stairs": "Green Concrete Stairs", "block.new_soviet.green_concrete_stairs": "Green Concrete Stairs",
"block.new_soviet.cracked_green_concrete_slab": "Cracked Green Concrete Slab", "block.new_soviet.cracked_green_concrete_slab": "Cracked Green Concrete Slab",
"block.new_soviet.cracked_green_concrete_stairs": "Cracked Green Concrete Stairs", "block.new_soviet.cracked_green_concrete_stairs": "Cracked Green Concrete Stairs",
"block.new_soviet.dark_green_concrete_slab": "Dark Green Concrete Slab",
"block.new_soviet.dark_green_concrete_stairs": "Dark Green Concrete Stairs",
"block.new_soviet.cracked_dark_green_concrete_slab": "Cracked Dark Green Concrete Slab",
"block.new_soviet.cracked_dark_green_concrete_stairs": "Cracked Dark Green Concrete Stairs",
"block.new_soviet.orange_concrete_slab": "Orange Concrete Slab",
"block.new_soviet.orange_concrete_stairs": "Orange Concrete Stairs",
"block.new_soviet.cracked_orange_concrete_slab": "Cracked Orange Concrete Slab",
"block.new_soviet.cracked_orange_concrete_stairs": "Cracked Orange Concrete Stairs",
"block.new_soviet.nii_floor_slab": "Nii Floor Slab", "block.new_soviet.nii_floor_slab": "Nii Floor Slab",
"block.new_soviet.nii_floor_stairs": "Nii Floor Stairs", "block.new_soviet.nii_floor_stairs": "Nii Floor Stairs",
"block.new_soviet.herringbone_acacia_planks_slab": "Herringbone Acacia Slab", "block.new_soviet.herringbone_acacia_planks_slab": "Herringbone Acacia Slab",

View file

@ -173,18 +173,27 @@
"block.new_soviet.chiseled_spruce_door": "Резная еловая дверь", "block.new_soviet.chiseled_spruce_door": "Резная еловая дверь",
"block.new_soviet.chiseled_birch_door": "Резная берёзовая дверь", "block.new_soviet.chiseled_birch_door": "Резная берёзовая дверь",
"subtitles.new_soviet.siren": "Включается сирена", "subtitles.new_soviet.siren": "Включается сирена",
"block.new_soviet.concrete": "Железобетон",
"block.new_soviet.orange_concrete": "Оранжевый железобетон",
"block.new_soviet.dark_green_concrete": "Темно-зелёный железобетон",
"block.new_soviet.yellow_concrete": "Жёлтый железобетон", "block.new_soviet.yellow_concrete": "Жёлтый железобетон",
"block.new_soviet.beige_concrete": "Бежевый железобетон", "block.new_soviet.beige_concrete": "Бежевый железобетон",
"block.new_soviet.white_concrete": "Белый железобетон", "block.new_soviet.white_concrete": "Белый железобетон",
"block.new_soviet.green_concrete": "Зелёный железобетон", "block.new_soviet.green_concrete": "Зелёный железобетон",
"block.new_soviet.blue_concrete": "Синий железобетон", "block.new_soviet.blue_concrete": "Синий железобетон",
"block.new_soviet.red_concrete": "Красный железобетон", "block.new_soviet.red_concrete": "Красный железобетон",
"block.new_soviet.cracked_concrete": "Потрескавшийся железобетон",
"block.new_soviet.cracked_orange_concrete": "Потрескавшийся оранжевый железобетон",
"block.new_soviet.cracked_dark_green_concrete": "Потрескавшийся темно-зелёный железобетон",
"block.new_soviet.cracked_yellow_concrete": "Потрескавшийся жёлтый железобетон", "block.new_soviet.cracked_yellow_concrete": "Потрескавшийся жёлтый железобетон",
"block.new_soviet.cracked_beige_concrete": "Потрескавшийся бежевый железобетон", "block.new_soviet.cracked_beige_concrete": "Потрескавшийся бежевый железобетон",
"block.new_soviet.cracked_white_concrete": "Потрескавшийся белый железобетон", "block.new_soviet.cracked_white_concrete": "Потрескавшийся белый железобетон",
"block.new_soviet.cracked_green_concrete": "Потрескавшийся зелёный железобетон", "block.new_soviet.cracked_green_concrete": "Потрескавшийся зелёный железобетон",
"block.new_soviet.cracked_blue_concrete": "Потрескавшийся синий железобетон", "block.new_soviet.cracked_blue_concrete": "Потрескавшийся синий железобетон",
"block.new_soviet.cracked_red_concrete": "Потрескавшийся красный Concrete", "block.new_soviet.cracked_red_concrete": "Потрескавшийся красный Concrete",
"block.new_soviet.concrete_with_bars": "Железобетон с арматурой",
"block.new_soviet.orange_concrete_with_bars": "Оранжевый железобетон с арматурой",
"block.new_soviet.dark_green_concrete_with_bars": "Темно-зелёный железобетон с арматурой",
"block.new_soviet.yellow_concrete_with_bars": "Жёлтый железобетон с арматурой", "block.new_soviet.yellow_concrete_with_bars": "Жёлтый железобетон с арматурой",
"block.new_soviet.beige_concrete_with_bars": "Бежевый железобетон с арматурой", "block.new_soviet.beige_concrete_with_bars": "Бежевый железобетон с арматурой",
"block.new_soviet.white_concrete_with_bars": "Белый железобетон с арматурой", "block.new_soviet.white_concrete_with_bars": "Белый железобетон с арматурой",
@ -362,6 +371,10 @@
"block.new_soviet.cracked_tuff_bricks_stairs": "Ступени из потрескавшихся туфовых кирпичей", "block.new_soviet.cracked_tuff_bricks_stairs": "Ступени из потрескавшихся туфовых кирпичей",
"block.new_soviet.mossy_tuff_bricks_slab": "Плита из замшелых туфовых кирпичей", "block.new_soviet.mossy_tuff_bricks_slab": "Плита из замшелых туфовых кирпичей",
"block.new_soviet.mossy_tuff_bricks_stairs": "ступени из замшелых туфовых кирпичей", "block.new_soviet.mossy_tuff_bricks_stairs": "ступени из замшелых туфовых кирпичей",
"block.new_soviet.concrete_slab": "Плита из железобетона",
"block.new_soviet.concrete_stairs": "Ступени из железобетона",
"block.new_soviet.cracked_concrete_slab": "Плита из потрескавшегося железобетона",
"block.new_soviet.cracked_concrete_stairs": "Ступени из потрескавшегося железобетона",
"block.new_soviet.white_concrete_slab": "Плита из белого железобетона", "block.new_soviet.white_concrete_slab": "Плита из белого железобетона",
"block.new_soviet.white_concrete_stairs": "Ступени из белого железобетона", "block.new_soviet.white_concrete_stairs": "Ступени из белого железобетона",
"block.new_soviet.cracked_white_concrete_slab": "Плита из потрескавшегося белого железобетона", "block.new_soviet.cracked_white_concrete_slab": "Плита из потрескавшегося белого железобетона",
@ -386,6 +399,14 @@
"block.new_soviet.green_concrete_stairs": "Ступени из зелёного железобетона", "block.new_soviet.green_concrete_stairs": "Ступени из зелёного железобетона",
"block.new_soviet.cracked_green_concrete_slab": "Плита из потрескавшегося зелёного железобетона", "block.new_soviet.cracked_green_concrete_slab": "Плита из потрескавшегося зелёного железобетона",
"block.new_soviet.cracked_green_concrete_stairs": "Ступени из потрескавшегося зелёного железобетона", "block.new_soviet.cracked_green_concrete_stairs": "Ступени из потрескавшегося зелёного железобетона",
"block.new_soviet.dark_green_concrete_slab": "Плита из тёмно-зелёного железобетона",
"block.new_soviet.dark_green_concrete_stairs": "Ступени из тёмно-зелёного железобетона",
"block.new_soviet.cracked_dark_green_concrete_slab": "Плита из потрескавшегося тёмно-зелёного железобетона",
"block.new_soviet.cracked_dark_green_concrete_stairs": "Ступени из потрескавшегося тёмно-зелёного железобетона",
"block.new_soviet.orange_concrete_slab": "Плита из оранжевого железобетона",
"block.new_soviet.orange_concrete_stairs": "Ступени из оранжевого железобетона",
"block.new_soviet.cracked_orange_concrete_slab": "Плита из потрескавшегося оранжевого железобетона",
"block.new_soviet.cracked_orange_concrete_stairs": "Ступени из потрескавшегося оранжевого железобетона",
"block.new_soviet.nii_floor_slab": "Плита из каменной мозайки", "block.new_soviet.nii_floor_slab": "Плита из каменной мозайки",
"block.new_soviet.nii_floor_stairs": "Ступени из каменной мозайки", "block.new_soviet.nii_floor_stairs": "Ступени из каменной мозайки",
"block.new_soviet.herringbone_acacia_planks_slab": "Плита из акациевого паркета «ёлочкой»", "block.new_soviet.herringbone_acacia_planks_slab": "Плита из акациевого паркета «ёлочкой»",