diff --git a/src/main/java/org/dimdev/dimdoors/block/ModBlocks.java b/src/main/java/org/dimdev/dimdoors/block/ModBlocks.java index 70522c77..6c46ab7b 100644 --- a/src/main/java/org/dimdev/dimdoors/block/ModBlocks.java +++ b/src/main/java/org/dimdev/dimdoors/block/ModBlocks.java @@ -149,6 +149,18 @@ public final class ModBlocks { @RegistryEntry("eternal_fluid") public static final Block ETERNAL_FLUID = register(new EternalFluidBlock(FabricBlockSettings.of(Material.STONE, MapColor.RED).luminance(15))); + @RegistryEntry("decayed_block") + public static final Block DECAYED_BLOCK = register(new UnravelledFabricBlock(FabricBlockSettings.of(Material.STONE, MapColor.BLACK).ticksRandomly().luminance(15))); + + @RegistryEntry("unfolded_block") + public static final Block UNFOLDED_BLOCK = register(new UnravelledFabricBlock(FabricBlockSettings.of(Material.STONE, MapColor.BLACK).ticksRandomly().luminance(15))); + + @RegistryEntry("unwarped_block") + public static final Block UNWARPED_BLOCK = register(new UnravelledFabricBlock(FabricBlockSettings.of(Material.STONE, MapColor.BLACK).ticksRandomly().luminance(15))); + + @RegistryEntry("unravelled_block") + public static final Block UNRAVELLED_BLOCK = register(new UnravelledFabricBlock(FabricBlockSettings.of(Material.STONE, MapColor.BLACK).ticksRandomly().luminance(15))); + @RegistryEntry("unravelled_fabric") public static final Block UNRAVELLED_FABRIC = register(new UnravelledFabricBlock(FabricBlockSettings.of(Material.STONE, MapColor.BLACK).ticksRandomly().luminance(15))); diff --git a/src/main/java/org/dimdev/dimdoors/block/UnravelledFabricBlock.java b/src/main/java/org/dimdev/dimdoors/block/UnravelledFabricBlock.java index b1550811..e643467d 100644 --- a/src/main/java/org/dimdev/dimdoors/block/UnravelledFabricBlock.java +++ b/src/main/java/org/dimdev/dimdoors/block/UnravelledFabricBlock.java @@ -42,9 +42,4 @@ public class UnravelledFabricBlock extends Block { } return state; } - - @Override - public boolean hasRandomTicks(BlockState state) { - return true; - } } diff --git a/src/main/java/org/dimdev/dimdoors/client/DetachedRiftBlockEntityRenderer.java b/src/main/java/org/dimdev/dimdoors/client/DetachedRiftBlockEntityRenderer.java index eaaba1ba..dad74dcb 100644 --- a/src/main/java/org/dimdev/dimdoors/client/DetachedRiftBlockEntityRenderer.java +++ b/src/main/java/org/dimdev/dimdoors/client/DetachedRiftBlockEntityRenderer.java @@ -37,7 +37,7 @@ public class DetachedRiftBlockEntityRenderer implements BlockEntityRenderer TWO_PILLARS_FEATURE; public static final ConfiguredFeature LIMBO_GATEWAY_CONFIGURED_FEATURE; public static final ConfiguredFeature SOLID_STATIC_ORE; + public static final ConfiguredFeature DECAYED_BLOCK_ORE; + @Deprecated public static final ConfiguredFeature ETERNAL_FLUID_LAKE = Feature.LAKE.configure(new SingleStateFeatureConfig(ModBlocks.ETERNAL_FLUID.getDefaultState())).decorate(ETERNAL_FLUID_LAKE_DECORATOR.configure(new ChanceDecoratorConfig(20))); public static void init() { @@ -78,5 +81,7 @@ public final class ModFeatures { TWO_PILLARS_FEATURE = SCHEMATIC_GATEWAY_FEATURE.configure(new SchematicGatewayFeatureConfig(SchematicGateway.ID_SCHEMATIC_MAP.inverse().get(TWO_PILLARS_GATEWAY))).decorate(ConfiguredFeatures.Decorators.SQUARE_TOP_SOLID_HEIGHTMAP.applyChance(gatewayChance)); LIMBO_GATEWAY_CONFIGURED_FEATURE = LIMBO_GATEWAY_FEATURE.configure(DefaultFeatureConfig.INSTANCE).decorate(ConfiguredFeatures.Decorators.SQUARE_TOP_SOLID_HEIGHTMAP.applyChance(gatewayChance)); SOLID_STATIC_ORE = Feature.ORE.configure(new OreFeatureConfig(new BlockMatchRuleTest(ModBlocks.UNRAVELLED_FABRIC), ModBlocks.SOLID_STATIC.getDefaultState(), 4)).range(new RangeDecoratorConfig(YOffset.getBottom(), YOffset.getTop())).repeat(3); + DECAYED_BLOCK_ORE = Feature.ORE.configure(new OreFeatureConfig(new BlockMatchRuleTest(ModBlocks.UNRAVELLED_FABRIC), ModBlocks.DECAYED_BLOCK.getDefaultState(), 64)).rangeOf(YOffset.fixed(0), YOffset.fixed(79)).repeat(2); + } } diff --git a/src/main/resources/assets/dimdoors/blockstates/decayed_block.json b/src/main/resources/assets/dimdoors/blockstates/decayed_block.json new file mode 100644 index 00000000..2d0bdcaf --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/decayed_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dimdoors:block/decayed_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/blockstates/unfolded_block.json b/src/main/resources/assets/dimdoors/blockstates/unfolded_block.json new file mode 100644 index 00000000..6facf7fa --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/unfolded_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dimdoors:block/unfolded_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/blockstates/unravelled_block.json b/src/main/resources/assets/dimdoors/blockstates/unravelled_block.json new file mode 100644 index 00000000..75d8cbf0 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/unravelled_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dimdoors:block/unravelled_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/blockstates/unwarped_block.json b/src/main/resources/assets/dimdoors/blockstates/unwarped_block.json new file mode 100644 index 00000000..f3835b22 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/unwarped_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dimdoors:block/unwarped_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/lang/en_us.json b/src/main/resources/assets/dimdoors/lang/en_us.json index 2917c2b0..fb8ed468 100644 --- a/src/main/resources/assets/dimdoors/lang/en_us.json +++ b/src/main/resources/assets/dimdoors/lang/en_us.json @@ -44,6 +44,10 @@ "block.dimdoors.green_ancient_fabric": "Green Altered Ancient Fabric", "block.dimdoors.red_ancient_fabric": "Red Altered Ancient Fabric", "block.dimdoors.eternal_fabric": "Eternal Fabric", + "block.dimdoors.decayed_block": "Decayed Block", + "block.dimdoors.unfolded_block": "Unfolded Block", + "block.dimdoors.unwarped_block": "Unwarped Block", + "block.dimdoors.unravelled_block": "Unraveled Block", "block.dimdoors.unravelled_fabric": "Unraveled Fabric", "block.dimdoors.rift": "Rift Scar", "block.dimdoors.eternal_fluid": "Eternal Fluid", diff --git a/src/main/resources/assets/dimdoors/models/block/decayed_block.json b/src/main/resources/assets/dimdoors/models/block/decayed_block.json new file mode 100644 index 00000000..b0b8043d --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/decayed_block.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:block/decayed_block" } +} diff --git a/src/main/resources/assets/dimdoors/models/block/unfolded_block.json b/src/main/resources/assets/dimdoors/models/block/unfolded_block.json new file mode 100644 index 00000000..c07b0b47 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/unfolded_block.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:block/unfolded_block" } +} diff --git a/src/main/resources/assets/dimdoors/models/block/unravelled_block.json b/src/main/resources/assets/dimdoors/models/block/unravelled_block.json new file mode 100644 index 00000000..6985690a --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/unravelled_block.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:block/unravelled_block" } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/unwarped_block.json b/src/main/resources/assets/dimdoors/models/block/unwarped_block.json new file mode 100644 index 00000000..e9f625e9 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/unwarped_block.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:block/unwarped_block" } +} diff --git a/src/main/resources/assets/dimdoors/models/item/decayed_block.json b/src/main/resources/assets/dimdoors/models/item/decayed_block.json new file mode 100644 index 00000000..d8e6ada2 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/decayed_block.json @@ -0,0 +1,3 @@ +{ + "parent": "dimdoors:block/decayed_block" +} diff --git a/src/main/resources/assets/dimdoors/models/item/unfolded_block.json b/src/main/resources/assets/dimdoors/models/item/unfolded_block.json new file mode 100644 index 00000000..6936cee8 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/unfolded_block.json @@ -0,0 +1,3 @@ +{ + "parent": "dimdoors:block/unfolded_block" +} diff --git a/src/main/resources/assets/dimdoors/models/item/unravelled_block.json b/src/main/resources/assets/dimdoors/models/item/unravelled_block.json new file mode 100644 index 00000000..b7da9443 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/unravelled_block.json @@ -0,0 +1,3 @@ +{ + "parent": "dimdoors:block/unravelled_block" +} diff --git a/src/main/resources/assets/dimdoors/models/item/unwarped_block.json b/src/main/resources/assets/dimdoors/models/item/unwarped_block.json new file mode 100644 index 00000000..8498ec7d --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/unwarped_block.json @@ -0,0 +1,3 @@ +{ + "parent": "dimdoors:block/unwarped_block" +} diff --git a/src/main/resources/assets/dimdoors/textures/block/decayed_block.png b/src/main/resources/assets/dimdoors/textures/block/decayed_block.png new file mode 100644 index 00000000..77c415bf Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/block/decayed_block.png differ diff --git a/src/main/resources/assets/dimdoors/textures/block/unfolded_block.png b/src/main/resources/assets/dimdoors/textures/block/unfolded_block.png new file mode 100644 index 00000000..57846591 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/block/unfolded_block.png differ diff --git a/src/main/resources/assets/dimdoors/textures/block/unravelled_block.png b/src/main/resources/assets/dimdoors/textures/block/unravelled_block.png new file mode 100644 index 00000000..52cfb776 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/block/unravelled_block.png differ diff --git a/src/main/resources/assets/dimdoors/textures/block/unravelled_fabric.png b/src/main/resources/assets/dimdoors/textures/block/unravelled_fabric.png index 7558c488..1c38545a 100644 Binary files a/src/main/resources/assets/dimdoors/textures/block/unravelled_fabric.png and b/src/main/resources/assets/dimdoors/textures/block/unravelled_fabric.png differ diff --git a/src/main/resources/assets/dimdoors/textures/block/unwarped_block.png b/src/main/resources/assets/dimdoors/textures/block/unwarped_block.png new file mode 100644 index 00000000..d4e43875 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/block/unwarped_block.png differ