diff --git a/README.md b/README.md index eb50bff..1dcbb1f 100644 --- a/README.md +++ b/README.md @@ -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 * 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! diff --git a/TODO.md b/TODO.md index 089b579..e6a73d0 100644 --- a/TODO.md +++ b/TODO.md @@ -13,14 +13,7 @@ * Figure out electronic devices - function === ACHIEVEMENTS === -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 +* Chicken kiev - kill a chicken with aspect of fire sickle === VERSION SPECIFIC === ## 0.3 diff --git a/gradle.properties b/gradle.properties index f6f628d..6683d11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.14.24 +loader_version=0.15.3 # Mod Properties mod_name=New Soviet Era -mod_version=0.3 +mod_version=0.4 maven_group=su.a71 mod_id=new_soviet # Dependencies -fabric_version=0.90.4+1.20.1 +fabric_version=0.91.0+1.20.1 modmenu_version=7.2.2 # Modrinth publishing 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 087d3e0..0e09cac 100644 --- a/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java @@ -82,7 +82,6 @@ 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; @@ -98,7 +97,7 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable { case 13 -> 0x1b6031; case 14 -> 0x8b2030; case 15 -> 0x272228; - default -> 0xffffff; + default -> 0xffffff; // Also 0 }; } } diff --git a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java index 63f963d..022d7c2 100644 --- a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java @@ -27,9 +27,7 @@ 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; 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 c050345..8929b1b 100644 --- a/src/main/java/su/a71/new_soviet/blocks/WindowBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/WindowBlock.java @@ -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 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()); } } 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 c01424c..9db851d 100644 --- a/src/main/java/su/a71/new_soviet/datagen/Advancements.java +++ b/src/main/java/su/a71/new_soviet/datagen/Advancements.java @@ -12,14 +12,11 @@ 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; 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 13a4a19..68a9542 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -4,7 +4,6 @@ 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; @@ -14,9 +13,7 @@ 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; diff --git a/src/main/java/su/a71/new_soviet/items/DiceItem.java b/src/main/java/su/a71/new_soviet/items/DiceItem.java index bcc4667..52b99b9 100644 --- a/src/main/java/su/a71/new_soviet/items/DiceItem.java +++ b/src/main/java/su/a71/new_soviet/items/DiceItem.java @@ -2,17 +2,13 @@ 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; diff --git a/src/main/resources/assets/new_soviet/icon.png b/src/main/resources/assets/new_soviet/icon.png index 0260f1d..6acff29 100644 Binary files a/src/main/resources/assets/new_soviet/icon.png and b/src/main/resources/assets/new_soviet/icon.png differ