diff --git a/CHANGELOG b/CHANGELOG index 1379308..3a6d6f3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 \ No newline at end of file + * Changed parts of file structure for models and textures + * Moved to newer Fabric, Loom etc. versions \ No newline at end of file diff --git a/README.md b/README.md index 1dcbb1f..206a364 100644 --- a/README.md +++ b/README.md @@ -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 \ No newline at end of file +**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. \ No newline at end of file diff --git a/TODO.md b/TODO.md index e6a73d0..2cc1b76 100644 --- a/TODO.md +++ b/TODO.md @@ -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 \ No newline at end of file diff --git a/build.gradle b/build.gradle index f63e1fa..bf680b7 100644 --- a/build.gradle +++ b/build.gradle @@ -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.+" diff --git a/gradle.properties b/gradle.properties index 6683d11..0832550 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..509c4a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_receiver.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_receiver.json index 1d416ac..359dcb9 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_receiver.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_receiver.json @@ -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" diff --git a/src/main/generated/data/new_soviet/recipes/radio_receiver.json b/src/main/generated/data/new_soviet/recipes/radio_receiver.json index cd08558..8e6a571 100644 --- a/src/main/generated/data/new_soviet/recipes/radio_receiver.json +++ b/src/main/generated/data/new_soviet/recipes/radio_receiver.json @@ -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" ], diff --git a/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java b/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java index 0e09cac..8b41804 100644 --- a/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java @@ -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; diff --git a/src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java b/src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java index 7fffbcb..c632484 100644 --- a/src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java @@ -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); } diff --git a/src/main/java/su/a71/new_soviet/blocks/WindowBlock.java b/src/main/java/su/a71/new_soviet/blocks/WindowBlock.java index 64fd33e..c3b18b8 100644 --- a/src/main/java/su/a71/new_soviet/blocks/WindowBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/WindowBlock.java @@ -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) { diff --git a/src/main/java/su/a71/new_soviet/datagen/Advancements.java b/src/main/java/su/a71/new_soviet/datagen/Advancements.java index 9db851d..78ff1f2 100644 --- a/src/main/java/su/a71/new_soviet/datagen/Advancements.java +++ b/src/main/java/su/a71/new_soviet/datagen/Advancements.java @@ -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; diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java index ff2d029..9b8c575 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -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), diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index 141bd80..e847a8d 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -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",