New logo and minor housekeeping
This commit is contained in:
parent
ead1877aa1
commit
367beac591
10 changed files with 8 additions and 31 deletions
|
@ -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
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 177 KiB After Width: | Height: | Size: 211 KiB |
Loading…
Add table
Add a link
Reference in a new issue