Added booklet item, refactored blocks to new packages

This commit is contained in:
Michael Hillcox 2020-11-21 12:43:38 +00:00
parent 0289a04815
commit 2445784f5c
No known key found for this signature in database
GPG key ID: 971C5B254742488F
53 changed files with 113 additions and 54 deletions

View file

@ -22,7 +22,7 @@ public class ActuallyAdditions {
public static final ItemGroup ACTUALLY_GROUP = new ItemGroup(MOD_ID) {
@Override
public ItemStack createIcon() {
return new ItemStack(ActuallyBlocks.blockEmpowerer.get());
return new ItemStack(ActuallyItems.BOOKLET.get());
}
};

View file

@ -1,6 +1,14 @@
package de.ellpeck.actuallyadditions.common.blocks;
import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.building.CrystalBlock;
import de.ellpeck.actuallyadditions.common.blocks.building.CrystalClusterBlock;
import de.ellpeck.actuallyadditions.common.blocks.building.FenceBlock;
import de.ellpeck.actuallyadditions.common.blocks.building.WallBlock;
import de.ellpeck.actuallyadditions.common.blocks.functional.*;
import de.ellpeck.actuallyadditions.common.blocks.misc.TinyTorchBlock;
import de.ellpeck.actuallyadditions.common.blocks.plant.BlackLotusBlock;
import de.ellpeck.actuallyadditions.common.blocks.plant.PlantBlock;
import de.ellpeck.actuallyadditions.common.blocks.types.Crystals;
import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays;
import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType;
@ -117,15 +125,15 @@ public class ActuallyBlocks {
public static final RegistryObject<Block> WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new StairsBlock(() -> WHITE_WALL.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> GREEN_SLAB = BLOCKS.register("green_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> WHITE_SLAB = BLOCKS.register("white_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> GREEN_FENCE = BLOCKS.register("green_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> GREEN_FENCE = BLOCKS.register("green_fence_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.FenceBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> WHITE_FENCE = BLOCKS.register("white_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> BLACK_QUARTZ = BLOCKS.register("black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> BLACK_QUARTZ_CHISELED = BLOCKS.register("black_quartz_chiseled_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> BLACK_QUARTZ_PILLAR = BLOCKS.register("black_quartz_pillar_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get())));
public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get())));
public static final RegistryObject<Block> BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get())));
public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get())));
public static final RegistryObject<Block> BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_pillar_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get())));
public static final RegistryObject<Block> BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.building;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class CrystalBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.building;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import de.ellpeck.actuallyadditions.common.blocks.types.Crystals;
import net.minecraft.block.material.Material;

View file

@ -1,6 +1,7 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.building;
import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;

View file

@ -1,6 +1,7 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.building;
import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class AtomicReconstructorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class BatteryBoxBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class BioReactorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class BreakerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class CanolaPressBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class CoalGeneratorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class CoffeeMachineBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class DirectionalBreakerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class DisplayStandBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class EmpowererBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class EnergizerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FarmerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FeederBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FermentingBarrelBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FireworkBoxBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FishingNetBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FluidCollectorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FurnaceDoubleBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class FurnaceSolarBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class GreenhouseGlassBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class GrinderBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class HeatCollectorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class InputterBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class ItemRepairerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class ItemViewerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class ItemViewerHoppingBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class LampPowererBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays;
import net.minecraft.block.material.Material;

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class LavaFactoryControllerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class LeafGeneratorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class MinerBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class OilGeneratorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType;
import net.minecraft.block.material.Material;

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class PhantomBoosterBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class PlayerInterfaceBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class RangedCollectorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class ShockSuppressorBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class SmileyCloudBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class TreasureChestBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.functional;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class XPSolidifierBlock extends ActuallyBlock {

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.misc;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.plant;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class BlackLotusBlock extends ActuallyBlock {

View file

@ -1,12 +1,13 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.plant;
import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
import net.minecraft.block.CropsBlock;
import net.minecraft.block.material.Material;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
public class PlantBlock extends CropsBlock implements IActuallyBlock {
public class PlantBlock extends CropsBlock implements IActuallyBlock {
public PlantBlock(int minDropAmount, int maxDropAmount) {
super(Properties.create(Material.ROCK));
}

View file

@ -1,5 +1,6 @@
package de.ellpeck.actuallyadditions.common.blocks;
package de.ellpeck.actuallyadditions.common.blocks.plant;
import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
import net.minecraft.block.material.Material;
public class WildPlantBlock extends ActuallyBlock {

View file

@ -38,6 +38,8 @@ public class ActuallyItems {
public static final RegistryObject<Item> EMERADIC_CRYSTAL = ITEMS.register("emeradic_crystal", basicItem());
public static final RegistryObject<Item> ENORI_CRYSTAL = ITEMS.register("enori_crystal", basicItem());
public static final RegistryObject<Item> BOOKLET = ITEMS.register("booklet", basicItem());
public static final Set<RegistryObject<Item>> SIMPLE_ITEMS = ImmutableSet.of(
BLACK_QUARTS, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL,
VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL