Skip to content

Commit

Permalink
Temporarily removed Ancient Egg tile and block
Browse files Browse the repository at this point in the history
  • Loading branch information
dragoni7 committed Aug 20, 2022
1 parent 364c204 commit 3692a01
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public AncientEggBlock(Properties properties) {

@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return DreamlandTiles.ANCIENT_EGG.get().create(pos, state);
return null;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ private <E extends BlockEntity & IAnimatable> PlayState predicate(AnimationEvent
}

public AncientEggTile(BlockPos pos, BlockState state) {
super(DreamlandTiles.ANCIENT_EGG.get(), pos, state);
super(null, pos, state);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private static void registerEntityRenders(final EntityRenderersEvent.RegisterRen
event.registerEntityRenderer(DreamlandEntities.OOZE.get(), OozeRender::new);
event.registerEntityRenderer(DreamlandEntities.OPAL_SHELL.get(), OpalShellRender::new);
event.registerEntityRenderer(DreamlandEntities.TAR_BALL.get(), TarBallRender::new);
event.registerBlockEntityRenderer(DreamlandTiles.ANCIENT_EGG.get(), AncientEggRender::new);
//event.registerBlockEntityRenderer(DreamlandTiles.ANCIENT_EGG.get(), AncientEggRender::new);
}

private static void registerArmorRenders(final EntityRenderersEvent.AddLayers event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ public class DreamlandBlocks {
public static final BlockItemSet FOSSILIZED_EGG = new BlockItemSet("fossilized_egg",
() -> new RotatedPillarBlock(BlockBehaviour.Properties.copy(DreamlandBlocks.TAR_MUD.block().get()).strength(3.0F, 3.0F).sound(SoundType.STONE)));

public static final BlockItemSet ANCIENT_EGG = new BlockItemSet("ancient_egg",
() -> new Block(BlockBehaviour.Properties.of(Material.EGG).color(MaterialColor.COLOR_BROWN).sound(SoundType.FUNGUS).strength(3.0F, 3.0F).noLootTable().noOcclusion()));
//public static final BlockItemSet ANCIENT_EGG = new BlockItemSet("ancient_egg",
// () -> new Block(BlockBehaviour.Properties.of(Material.EGG).color(MaterialColor.COLOR_BROWN).sound(SoundType.FUNGUS).strength(3.0F, 3.0F).noLootTable().noOcclusion()));

public static final BlockItemSet OOZE_BLOCK = new BlockItemSet("ooze_block", () -> new OozeBlock(BlockBehaviour.Properties.of(Material.CLAY, MaterialColor.COLOR_PURPLE).sound(SoundType.SLIME_BLOCK).noOcclusion().friction(0.8f).strength(0.5f)));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class DreamlandTiles {

public static final DeferredRegister<BlockEntityType<?>> TILES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, Dreamland.MODID);

public static final RegistryObject<BlockEntityType<AncientEggTile>> ANCIENT_EGG = TILES.register("ancient_egg_tile",
() -> BlockEntityType.Builder.of(AncientEggTile::new, DreamlandBlocks.ANCIENT_EGG.block().get()).build(null));
//public static final RegistryObject<BlockEntityType<AncientEggTile>> ANCIENT_EGG = TILES.register("ancient_egg_tile",
// () -> BlockEntityType.Builder.of(AncientEggTile::new, DreamlandBlocks.ANCIENT_EGG.block().get()).build(null));

public static final RegistryObject<BlockEntityType<OpalDiffuserTile>> OPAL_DIFFUSER = TILES.register("opal_diffuser",
() -> BlockEntityType.Builder.of(OpalDiffuserTile::new, DreamlandBlocks.OPAL_DIFFUSER_BLOCK.block().get()).build(null));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ protected void registerModels() {

singleTextureItemModel(DreamlandBlocks.TAR_SPROUTS.item(), "block/tar_sprouts");
singleTextureItemModel(DreamlandBlocks.TAR_BARK_SAPLING.item(), "item/tar_bark_sapling");
singleTextureItemModel(DreamlandBlocks.ANCIENT_EGG.item(), "item/ancient_egg");
//singleTextureItemModel(DreamlandBlocks.ANCIENT_EGG.item(), "item/ancient_egg");
singleTextureItemModel(DreamlandItems.TAR_BUCKET, "item/tar_bucket");
singleTextureItemModel(DreamlandItems.OOZE_BALL, "item/ooze_ball");
singleTextureItemModel(DreamlandItems.CANDIED_OOZE, "item/candied_ooze");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected void addTranslations() {
add(DreamlandBlocks.TAR_BARK_SAPLING.block().get(), "Tar Bark Sapling");
add(DreamlandBlocks.TAR_SPROUTS.block().get(), "Tar Sprouts");
add(DreamlandBlocks.TAR_BARK_LEAVES.block().get(), "Tar Bark Leaves");
add(DreamlandBlocks.ANCIENT_EGG.block().get(), "Ancient Egg");
//add(DreamlandBlocks.ANCIENT_EGG.block().get(), "Ancient Egg");
add(DreamlandBlocks.FOSSILIZED_EGG.block().get(), "Fossilized Egg");
add(DreamlandBlocks.OOZE_BLOCK.block().get(), "Ooze Block");
translateWoodSet(DreamlandWoodSets.TAR_BARK, "Tar Bark");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected void addTables() {
basicBlockTable(DreamlandBlocks.DROUGHT_SOIL.block().get(), "drought_soil");
basicBlockTable(DreamlandBlocks.TAR_BARK_SAPLING.block().get(), "tar_bark_sapling");
shearableVegetationTable(DreamlandBlocks.TAR_SPROUTS.block().get(), "tar_sprouts");
silkTouchTable(DreamlandBlocks.FOSSILIZED_EGG.block().get(), DreamlandBlocks.ANCIENT_EGG.item().get(), "fossilized_egg", 1, 1);
//silkTouchTable(DreamlandBlocks.FOSSILIZED_EGG.block().get(), DreamlandBlocks.ANCIENT_EGG.item().get(), "fossilized_egg", 1, 1);
basicBlockTable(DreamlandBlocks.OOZE_BLOCK.block().get(), "ooze_block");

basicBlockTable(DreamlandBlocks.MINERAL_DIRT.block().get(), "mineral_dirt");
Expand Down

0 comments on commit 3692a01

Please sign in to comment.