Skip to content

Commit

Permalink
final fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Thepigcat76 committed May 1, 2024
1 parent 268609e commit 89fab1b
Show file tree
Hide file tree
Showing 69 changed files with 910 additions and 310 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.leclowndu93150.invertedbed;

import com.leclowndu93150.invertedbed.block.InvertedBedBlock;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.bus.api.Event;
Expand All @@ -19,7 +20,7 @@ public static void onTrySleep(PlayerWakeUpEvent event) {
if (!event.getEntity().level().isClientSide()) {
ServerLevel level = ((ServerLevel) event.getEntity().level());
BlockState blockState = event.getEntity().level().getBlockState(event.getEntity().getSleepingPos().get());
if (blockState.getBlock() instanceof InvertedBedBlock)
if (blockState.getBlock() instanceof InvertedBedBlock && event.getEntity().getSleepTimer() >= 99)
level.setDayTime(13000);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/leclowndu93150/invertedbed/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;
Expand Down Expand Up @@ -72,10 +73,9 @@ private static InvertedBedBlock[] bedsToArray(List<DeferredBlock<InvertedBedBloc
}

private static DeferredBlock<InvertedBedBlock> newBed(DyeColor color) {
DeferredBlock<InvertedBedBlock> tempBlock = BLOCKS.register(color.getName() + "_inverted_bed", () -> new InvertedBedBlock(color, BlockBehaviour.Properties.of()
.destroyTime(0.3F)
.sound(SoundType.WOOD)));
ITEMS.registerSimpleBlockItem(color.getName()+"_inverted_bed", tempBlock);
DeferredBlock<InvertedBedBlock> tempBlock = BLOCKS.register(color.getName() + "_inverted_bed",
() -> new InvertedBedBlock(color, BlockBehaviour.Properties.ofFullCopy(Blocks.RED_BED)));
ITEMS.registerSimpleBlockItem(color.getName() + "_inverted_bed", tempBlock);
return tempBlock;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.npc.Villager;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.BedBlock;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "invertedbed:block/inverted_bed"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"scale":[ 0.5325, 0.5325, 0.5325]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"rotation": [ 0, 0, -180 ],
"translation": [ 0, 1, 2],
"scale":[ 0.25, 0.25, 0.25]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "invertedbed:inverted_bed",
"textures": {
"particle": "minecraft:block/red_wool"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "invertedbed:black_inverted_bed",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "invertedbed:black_inverted_bed",
"properties": {
"part": "head"
}
}
]
}
],
"rolls": 1
}
],
"random_sequence": "invertedbed:blocks/black_inverted_bed"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "invertedbed:blue_inverted_bed",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "invertedbed:blue_inverted_bed",
"properties": {
"part": "head"
}
}
]
}
],
"rolls": 1
}
],
"random_sequence": "invertedbed:blocks/blue_inverted_bed"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "invertedbed:brown_inverted_bed",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "invertedbed:brown_inverted_bed",
"properties": {
"part": "head"
}
}
]
}
],
"rolls": 1
}
],
"random_sequence": "invertedbed:blocks/brown_inverted_bed"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "invertedbed:cyan_inverted_bed",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "invertedbed:cyan_inverted_bed",
"properties": {
"part": "head"
}
}
]
}
],
"rolls": 1
}
],
"random_sequence": "invertedbed:blocks/cyan_inverted_bed"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "invertedbed:gray_inverted_bed",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "invertedbed:gray_inverted_bed",
"properties": {
"part": "head"
}
}
]
}
],
"rolls": 1
}
],
"random_sequence": "invertedbed:blocks/gray_inverted_bed"
}
Loading

0 comments on commit 89fab1b

Please sign in to comment.