Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor housekeeping

Browse source
This commit is contained in:
Andrew-71 2024-03-03 19:46:16 +03:00
parent 02cdf8fa63
commit 4b88af996f
14 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CHANGELOG
View file

@ -51,16 +51,19 @@ This version focuses on QOL and bug fixes
* Bumped Fabric API, loader and mappings versions
### Changelog 0.3 -> 0.4
Due to sheer amount of changes, some may be undocumented. We hope you enjoy this update! :D
* Texture changes for various blocks
* Reworked wallpaper blocks, added new ones
* Concrete improvements
* 3 new colours - basic, dark green and orange
* Concrete with bars can now be placed horizontally
* Concrete with bars can now be placed horizontally. Or vertically. It's a matter of perspective!
* Bug fixes (see below)
* Added 3(?) new banner patterns
* Added 3 new banner patterns
* Sickle
* Star
* Grain(?)
* Grain
* Added USSR anthem music disc
* Added a new antenna item to improve radio electronics recipes
* Changed textures for dirt road, green-white tiles and TV white noise
* Parquet re-structuring
* Separated oak and dark oak parquet in naming
* Added spruce parquet (TODO)
@ -70,5 +73,5 @@ This version focuses on QOL and bug fixes
* Fixed some concrete blocks missing drops
* Cracked concrete now has a dyeing category
* Technical changes
* Minor asset location/name changes - e.g. concrete with bars models moved to separate folder
* Moved to newer Fabric versions
* Changed parts of file structure for models and textures
* Moved to newer Fabric, Loom etc. versions

10
README.md
View file

@ -1,7 +1,7 @@
# New Soviet Era
NSE is a mod that adds many features including building blocks, decorations, tools and items.
The general theme is USSR aesthetic, however it is not strict.
NSE is a mod that adds many features including building blocks, decorations, tools, and items.
The general theme is USSR aesthetic, however that is not strict.
It was inspired by the 1.16 [Soviet Era](https://www.curseforge.com/minecraft/mc-mods/soviet-era-mod) mod and russian [Samosbor](https://samosbormc.ru/) minecraft server
@ -12,10 +12,10 @@ It was inspired by the 1.16 [Soviet Era](https://www.curseforge.com/minecraft/mc
#### 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!
**A**: Of course! But please do not claim it as your own. A link to this mod would be appreciated too!
**Q**: Where do I report bugs or make a suggestion?\
**A**: The best place to do that would be the [project's Discord](https://discord.gg/D46vGJeCfj)
**A**: The best place to do that would be the [project's Discord server](https://discord.gg/D46vGJeCfj).
**Q**: Will you port to Forge or older version?\
**A**: Right now we have no plans for that. The mod is only on Fabric, with aim - but not promise - to follow latest version
**A**: Right now we have no plans for that. The mod is only on Fabric, with aim - but not promise - to follow latest Minecraft version.

10
TODO.md
View file

@ -23,11 +23,13 @@ Goals left - QOL
* Fix post lamps hit-boxes ~+-
## 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?
* Add crafting recipes for banner patterns; re-make grain?
* Concrete with bars 2 axis rotation
* TV rework #3 (new colours, second static, ...?)
* More landmines, land mine base item, create integration for it
* Rework cigarette (code and some functionality)
* Missing warning stripes
* Missing warning stripes?
## Pre ~~flight~~ update checklist
* Update ru_ru and ru_rpr translations
* Document any missing crafting recipes and possibly fix them

2
build.gradle
View file

@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.3-SNAPSHOT'
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'maven-publish'
id "com.modrinth.minotaur" version "2.+"

4
gradle.properties
View file

@ -6,7 +6,7 @@ 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.15.7
# Mod Properties
mod_name=New Soviet Era
@ -15,7 +15,7 @@ maven_group=su.a71
mod_id=new_soviet
# Dependencies
fabric_version=0.91.0+1.20.1
fabric_version=0.92.0+1.20.1
modmenu_version=7.2.2
# Modrinth publishing

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

10
src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_receiver.json
View file

@ -1,24 +1,24 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_iron_ingot": {
"has_antenna": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_ingot"
"new_soviet:antenna"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_nugget": {
"has_iron_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_nugget"
"minecraft:iron_ingot"
]
}
]
@ -46,7 +46,7 @@
},
"requirements": [
[
"has_iron_nugget",
"has_antenna",
"has_note_block",
"has_iron_ingot",
"has_the_recipe"

8
src/main/generated/data/new_soviet/recipes/radio_receiver.json
View file

@ -2,18 +2,18 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"A": {
"item": "new_soviet:antenna"
},
"I": {
"item": "minecraft:iron_ingot"
},
"M": {
"item": "minecraft:note_block"
},
"N": {
"item": "minecraft:iron_nugget"
}
},
"pattern": [
" N",
" A",
"MMM",
"III"
],

2
src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java
View file

@ -21,7 +21,7 @@ import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
// TODO: BLOCKTAGS! LOOTABLES!
// TODO: Keep dye on broken
public class BoundaryMarkerBlock extends Block implements Waterloggable {
public static final BooleanProperty WATERLOGGED;
public static final IntProperty COLOUR;

3
src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java
View file

@ -29,9 +29,6 @@ public class WallpaperBlock extends Block {
@Override
public BlockState getPlacementState(ItemPlacementContext ctx) {
BlockPos pos = ctx.getBlockPos();
BlockState blockBelow = ctx.getWorld().getBlockState(pos);
Block block = blockBelow.getBlock();
boolean hasBaseboard = isFullBlock(ctx.getWorld(), pos);
return this.getDefaultState().with(HAS_BASEBOARD, hasBaseboard);
}

10
src/main/java/su/a71/new_soviet/blocks/WindowBlock.java
View file

@ -381,18 +381,12 @@ public class WindowBlock extends HorizontalFacingBlock {
public boolean bottom_connected(BlockState state) {
int type = state.get(WINDOW_TYPE);
if (type == 0 || type == 3) {
return false;
}
return true;
return type != 0 && type != 3;
}
public boolean top_connected(BlockState state) {
int type = state.get(WINDOW_TYPE);
if (type == 0 || type == 1) {
return false;
}
return true;
return type != 0 && type != 1;
}
public boolean can_be_connected(BlockState state) {

1
src/main/java/su/a71/new_soviet/datagen/Advancements.java
View file

@ -1,4 +1,5 @@
package su.a71.new_soviet.datagen;
// === ABANDON HOPE, YE WHO ENTER HERE ===
import net.minecraft.advancement.Advancement;
import net.minecraft.advancement.AdvancementFrame;

8
src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
View file

@ -466,14 +466,14 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_DOOR);
ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.RADIO_RECEIVER, 1)
.pattern(" N")
.pattern(" A")
.pattern("MMM")
.pattern("III")
.input('M', Blocks.NOTE_BLOCK)
.input('N', Items.IRON_NUGGET)
.input('A', NSE_Items.ANTENNA)
.input('I', Items.IRON_INGOT)
.criterion(RecipeProvider.hasItem(Items.IRON_NUGGET),
RecipeProvider.conditionsFromItem(Items.IRON_NUGGET))
.criterion(RecipeProvider.hasItem(NSE_Items.ANTENNA),
RecipeProvider.conditionsFromItem(NSE_Items.ANTENNA))
.criterion(RecipeProvider.hasItem(Items.NOTE_BLOCK),
RecipeProvider.conditionsFromItem(Items.NOTE_BLOCK))
.criterion(RecipeProvider.hasItem(Items.IRON_INGOT),

10
src/main/resources/assets/new_soviet/lang/en_us.json
View file

@ -518,13 +518,19 @@
"block.new_soviet.herringbone_bamboo_planks": "Herringbone Bamboo Planks",
"block.new_soviet.herringbone_bamboo_planks_stairs": "Herringbone Bamboo Planks Stairs",
"block.new_soviet.herringbone_bamboo_planks_slab": "Herringbone Bamboo Planks Slab",
"block.new_soviet.window.fixed": "The window was fixed",
"block.new_soviet.window.unfixed": "The window was unfixed",
"block.new_soviet.window.fixed": "Window blockstate frozen",
"block.new_soviet.window.unfixed": "Window blockstate unfrozen",
"subtitles.new_soviet.tv_on": "TV turned on",
"subtitles.new_soviet.tv_off": "TV turned off",
"subtitles.new_soviet.tv_break": "TV screen shattered",
"item.new_soviet.antenna": "Antenna",
"item.new_soviet.screwdriver": "Screwdriver",
"item.new_soviet.sickle_pattern": "Banner Pattern",
"item.new_soviet.sickle_pattern.desc": "Hammer and Sickle",
"item.new_soviet.star_pattern": "Banner Pattern",
"item.new_soviet.star_pattern.desc": "Star",
"item.new_soviet.grain_pattern": "Banner Pattern",
"item.new_soviet.grain_pattern.desc": "Wreaths of Grain",
"item.new_soviet.music_disc_ussr_anthem": "Music Disc",
"item.new_soviet.music_disc_ussr_anthem.desc": "Alexander Alexandrov - USSR anthem",