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
Download patch file Download diff file Expand all files Collapse all files

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),