Compare commits
No commits in common. "367beac5918d27161b61abad265cdd586709247b" and "249810530405664a70333cab9b0dd22714357d20" have entirely different histories.
367beac591
...
2498105304
14 changed files with 32 additions and 92 deletions
|
|
@ -10,6 +10,9 @@ It was inspired by the 1.16 [Soviet Era](https://www.curseforge.com/minecraft/mc
|
|||
* Furniture and appliances to decorate your house
|
||||
* 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
|
||||
**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!
|
||||
|
|
|
|||
12
TODO.md
12
TODO.md
|
|
@ -13,7 +13,14 @@
|
|||
* Figure out electronic devices - function
|
||||
|
||||
=== ACHIEVEMENTS ===
|
||||
* Chicken kiev - kill a chicken with aspect of fire sickle
|
||||
IN --
|
||||
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 ===
|
||||
## 0.3
|
||||
|
|
@ -25,8 +32,7 @@ Goals left - QOL
|
|||
## 0.4
|
||||
* Implement antenna everywhere
|
||||
* Add crafting recipes for banner patterns; change item textures; remake grain
|
||||
* Add RPR translation for new concrete and potentially new achievements?
|
||||
* Concrete with bars 2 axis rotation
|
||||
* Add translation for new concrete and potentially new achievements?
|
||||
* TV rework #3 (new colours, second static, ...?)
|
||||
* More landmines, land mine base item, create integration for it
|
||||
* Rework cigarette (code and some functionality)
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@ org.gradle.parallel=true
|
|||
# check these on https://fabricmc.net/develop
|
||||
minecraft_version=1.20.1
|
||||
yarn_mappings=1.20.1+build.10
|
||||
loader_version=0.15.3
|
||||
loader_version=0.14.24
|
||||
|
||||
# Mod Properties
|
||||
mod_name=New Soviet Era
|
||||
mod_version=0.4
|
||||
mod_version=0.3
|
||||
maven_group=su.a71
|
||||
mod_id=new_soviet
|
||||
|
||||
# Dependencies
|
||||
fabric_version=0.91.0+1.20.1
|
||||
fabric_version=0.90.4+1.20.1
|
||||
modmenu_version=7.2.2
|
||||
|
||||
# Modrinth publishing
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
"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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
"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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -82,6 +82,7 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable {
|
|||
// DyeColor IDs with better colours
|
||||
public static int getColour(int id) {
|
||||
return switch (id) {
|
||||
case 0 -> 0xffffff;
|
||||
case 1 -> 0xb67134;
|
||||
case 2 -> 0xab4d8b;
|
||||
case 3 -> 0x398b9c;
|
||||
|
|
@ -97,7 +98,7 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable {
|
|||
case 13 -> 0x1b6031;
|
||||
case 14 -> 0x8b2030;
|
||||
case 15 -> 0x272228;
|
||||
default -> 0xffffff; // Also 0
|
||||
default -> 0xffffff;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,9 @@ import net.minecraft.world.BlockView;
|
|||
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldAccess;
|
||||
import su.a71.new_soviet.NewSoviet;
|
||||
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.util.Shapes;
|
||||
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@ public class WindowBlock extends HorizontalFacingBlock {
|
|||
public BlockState getPlacementState(ItemPlacementContext ctx) {
|
||||
BlockState above = ctx.getWorld().getBlockState(ctx.getBlockPos().up());
|
||||
BlockState below = ctx.getWorld().getBlockState(ctx.getBlockPos().down());
|
||||
if ((above.getBlock() instanceof WindowBlock && ((WindowBlock)above.getBlock()).getStateManager().getProperty("broken").equals(true)) || (below.getBlock() instanceof WindowBlock)) {
|
||||
|
||||
}
|
||||
// if ((above.getBlock() instanceof Window && ((Window) above.getBlock()).getStateManager().getProperty("broken") == true) || (below.getBlock() instanceof Window)) {
|
||||
//
|
||||
// }
|
||||
return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,14 @@ import net.minecraft.predicate.entity.DamageSourcePredicate;
|
|||
import net.minecraft.predicate.entity.EntityEquipmentPredicate;
|
||||
import net.minecraft.predicate.entity.EntityPredicate;
|
||||
import net.minecraft.predicate.entity.PlayerPredicate;
|
||||
import net.minecraft.predicate.item.EnchantmentPredicate;
|
||||
import net.minecraft.predicate.item.ItemPredicate;
|
||||
import net.minecraft.stat.Stats;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.UseAction;
|
||||
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_Stats;
|
||||
import su.a71.new_soviet.registration.NSE_Tags;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ package su.a71.new_soviet.datagen;
|
|||
import com.google.common.collect.Lists;
|
||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
|
||||
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.data.server.recipe.RecipeJsonProvider;
|
||||
import net.minecraft.data.server.recipe.RecipeProvider;
|
||||
|
|
@ -13,7 +14,9 @@ import net.minecraft.item.ItemConvertible;
|
|||
import net.minecraft.item.Items;
|
||||
import net.minecraft.recipe.Ingredient;
|
||||
import net.minecraft.recipe.book.RecipeCategory;
|
||||
import net.minecraft.registry.tag.BlockTags;
|
||||
import net.minecraft.registry.tag.ItemTags;
|
||||
import net.minecraft.sound.BlockSoundGroup;
|
||||
import net.minecraft.util.Util;
|
||||
import su.a71.new_soviet.registration.NSE_Blocks;
|
||||
import su.a71.new_soviet.registration.NSE_Custom;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,17 @@ package su.a71.new_soviet.items;
|
|||
|
||||
import net.minecraft.client.item.TooltipContext;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.FoodComponents;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.sound.SoundCategory;
|
||||
import net.minecraft.stat.Stats;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.TypedActionResult;
|
||||
import net.minecraft.util.UseAction;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 211 KiB After Width: | Height: | Size: 177 KiB |
|
|
@ -173,27 +173,18 @@
|
|||
"block.new_soviet.chiseled_spruce_door": "Chiseled Spruce Door",
|
||||
"block.new_soviet.chiseled_birch_door": "Chiseled Birch Door",
|
||||
"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.beige_concrete": "Beige Concrete",
|
||||
"block.new_soviet.white_concrete": "White Concrete",
|
||||
"block.new_soviet.green_concrete": "Green Concrete",
|
||||
"block.new_soviet.blue_concrete": "Blue 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_beige_concrete": "Cracked Beige Concrete",
|
||||
"block.new_soviet.cracked_white_concrete": "Cracked White Concrete",
|
||||
"block.new_soviet.cracked_green_concrete": "Cracked Green Concrete",
|
||||
"block.new_soviet.cracked_blue_concrete": "Cracked Blue 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.beige_concrete_with_bars": "Beige Concrete With Bars",
|
||||
"block.new_soviet.white_concrete_with_bars": "White Concrete With Bars",
|
||||
|
|
@ -371,10 +362,6 @@
|
|||
"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_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_stairs": "White Concrete Stairs",
|
||||
"block.new_soviet.cracked_white_concrete_slab": "Cracked White Concrete Slab",
|
||||
|
|
@ -399,14 +386,6 @@
|
|||
"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_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_stairs": "Nii Floor Stairs",
|
||||
"block.new_soviet.herringbone_acacia_planks_slab": "Herringbone Acacia Slab",
|
||||
|
|
|
|||
|
|
@ -173,27 +173,18 @@
|
|||
"block.new_soviet.chiseled_spruce_door": "Резная еловая дверь",
|
||||
"block.new_soviet.chiseled_birch_door": "Резная берёзовая дверь",
|
||||
"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.beige_concrete": "Бежевый железобетон",
|
||||
"block.new_soviet.white_concrete": "Белый железобетон",
|
||||
"block.new_soviet.green_concrete": "Зелёный железобетон",
|
||||
"block.new_soviet.blue_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_beige_concrete": "Потрескавшийся бежевый железобетон",
|
||||
"block.new_soviet.cracked_white_concrete": "Потрескавшийся белый железобетон",
|
||||
"block.new_soviet.cracked_green_concrete": "Потрескавшийся зелёный железобетон",
|
||||
"block.new_soviet.cracked_blue_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.beige_concrete_with_bars": "Бежевый железобетон с арматурой",
|
||||
"block.new_soviet.white_concrete_with_bars": "Белый железобетон с арматурой",
|
||||
|
|
@ -371,10 +362,6 @@
|
|||
"block.new_soviet.cracked_tuff_bricks_stairs": "Ступени из потрескавшихся туфовых кирпичей",
|
||||
"block.new_soviet.mossy_tuff_bricks_slab": "Плита из замшелых туфовых кирпичей",
|
||||
"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_stairs": "Ступени из белого железобетона",
|
||||
"block.new_soviet.cracked_white_concrete_slab": "Плита из потрескавшегося белого железобетона",
|
||||
|
|
@ -399,14 +386,6 @@
|
|||
"block.new_soviet.green_concrete_stairs": "Ступени из зелёного железобетона",
|
||||
"block.new_soviet.cracked_green_concrete_slab": "Плита из потрескавшегося зелёного железобетона",
|
||||
"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_stairs": "Ступени из каменной мозайки",
|
||||
"block.new_soviet.herringbone_acacia_planks_slab": "Плита из акациевого паркета «ёлочкой»",
|
||||
|
|
|
|||
Loading…
Reference in a new issue