Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Added booklet item, refactored blocks to new packages

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java
View file

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

14
src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java
View file

@ -1,6 +1,14 @@
package de.ellpeck.actuallyadditions.common.blocks; package de.ellpeck.actuallyadditions.common.blocks;
import de.ellpeck.actuallyadditions.common.ActuallyAdditions; 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.Crystals;
import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays; import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays;
import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType; 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> 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> 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> 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> 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 = 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_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_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_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 WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.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_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_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))); 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)));

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java
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; import net.minecraft.block.material.Material;
public class CrystalBlock extends ActuallyBlock { public class CrystalBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalClusterBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java
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 de.ellpeck.actuallyadditions.common.blocks.types.Crystals;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FenceBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java
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.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.Item; import net.minecraft.item.Item;

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/WallBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/WallBlock.java
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.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.Item; import net.minecraft.item.Item;

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/AtomicReconstructorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java
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; import net.minecraft.block.material.Material;
public class AtomicReconstructorBlock extends ActuallyBlock { public class AtomicReconstructorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/BatteryBoxBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java
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; import net.minecraft.block.material.Material;
public class BatteryBoxBlock extends ActuallyBlock { public class BatteryBoxBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/BioReactorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java
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; import net.minecraft.block.material.Material;
public class BioReactorBlock extends ActuallyBlock { public class BioReactorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/BreakerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java
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; import net.minecraft.block.material.Material;
public class BreakerBlock extends ActuallyBlock { public class BreakerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/CanolaPressBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java
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; import net.minecraft.block.material.Material;
public class CanolaPressBlock extends ActuallyBlock { public class CanolaPressBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoalGeneratorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java
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; import net.minecraft.block.material.Material;
public class CoalGeneratorBlock extends ActuallyBlock { public class CoalGeneratorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoffeeMachineBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java
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; import net.minecraft.block.material.Material;
public class CoffeeMachineBlock extends ActuallyBlock { public class CoffeeMachineBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/ColoredLampBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ColoredLampBlock.java
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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/DirectionalBreakerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java
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; import net.minecraft.block.material.Material;
public class DirectionalBreakerBlock extends ActuallyBlock { public class DirectionalBreakerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/DisplayStandBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java
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; import net.minecraft.block.material.Material;
public class DisplayStandBlock extends ActuallyBlock { public class DisplayStandBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/EmpowererBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java
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; import net.minecraft.block.material.Material;
public class EmpowererBlock extends ActuallyBlock { public class EmpowererBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/EnergizerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java
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; import net.minecraft.block.material.Material;
public class EnergizerBlock extends ActuallyBlock { public class EnergizerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FarmerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java
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; import net.minecraft.block.material.Material;
public class FarmerBlock extends ActuallyBlock { public class FarmerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FeederBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java
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; import net.minecraft.block.material.Material;
public class FeederBlock extends ActuallyBlock { public class FeederBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FermentingBarrelBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java
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; import net.minecraft.block.material.Material;
public class FermentingBarrelBlock extends ActuallyBlock { public class FermentingBarrelBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FireworkBoxBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java
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; import net.minecraft.block.material.Material;
public class FireworkBoxBlock extends ActuallyBlock { public class FireworkBoxBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FishingNetBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java
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; import net.minecraft.block.material.Material;
public class FishingNetBlock extends ActuallyBlock { public class FishingNetBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FluidCollectorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java
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; import net.minecraft.block.material.Material;
public class FluidCollectorBlock extends ActuallyBlock { public class FluidCollectorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceDoubleBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java
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; import net.minecraft.block.material.Material;
public class FurnaceDoubleBlock extends ActuallyBlock { public class FurnaceDoubleBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceSolarBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java
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; import net.minecraft.block.material.Material;
public class FurnaceSolarBlock extends ActuallyBlock { public class FurnaceSolarBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/GreenhouseGlassBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java
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; import net.minecraft.block.material.Material;
public class GreenhouseGlassBlock extends ActuallyBlock { public class GreenhouseGlassBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/GrinderBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java
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; import net.minecraft.block.material.Material;
public class GrinderBlock extends ActuallyBlock { public class GrinderBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/HeatCollectorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java
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; import net.minecraft.block.material.Material;
public class HeatCollectorBlock extends ActuallyBlock { public class HeatCollectorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/InputterBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/InputterBlock.java
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; import net.minecraft.block.material.Material;
public class InputterBlock extends ActuallyBlock { public class InputterBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemRepairerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java
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; import net.minecraft.block.material.Material;
public class ItemRepairerBlock extends ActuallyBlock { public class ItemRepairerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java
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; import net.minecraft.block.material.Material;
public class ItemViewerBlock extends ActuallyBlock { public class ItemViewerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerHoppingBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java
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; import net.minecraft.block.material.Material;
public class ItemViewerHoppingBlock extends ActuallyBlock { public class ItemViewerHoppingBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/LampPowererBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java
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; import net.minecraft.block.material.Material;
public class LampPowererBlock extends ActuallyBlock { public class LampPowererBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/LaserRelayBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java
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 de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/LavaFactoryControllerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java
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; import net.minecraft.block.material.Material;
public class LavaFactoryControllerBlock extends ActuallyBlock { public class LavaFactoryControllerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/LeafGeneratorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java
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; import net.minecraft.block.material.Material;
public class LeafGeneratorBlock extends ActuallyBlock { public class LeafGeneratorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/MinerBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java
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; import net.minecraft.block.material.Material;
public class MinerBlock extends ActuallyBlock { public class MinerBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/OilGeneratorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java
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; import net.minecraft.block.material.Material;
public class OilGeneratorBlock extends ActuallyBlock { public class OilGeneratorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java
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 de.ellpeck.actuallyadditions.common.blocks.types.PhantomType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBoosterBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java
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; import net.minecraft.block.material.Material;
public class PhantomBoosterBlock extends ActuallyBlock { public class PhantomBoosterBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlayerInterfaceBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java
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; import net.minecraft.block.material.Material;
public class PlayerInterfaceBlock extends ActuallyBlock { public class PlayerInterfaceBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/RangedCollectorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java
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; import net.minecraft.block.material.Material;
public class RangedCollectorBlock extends ActuallyBlock { public class RangedCollectorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/ShockSuppressorBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java
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; import net.minecraft.block.material.Material;
public class ShockSuppressorBlock extends ActuallyBlock { public class ShockSuppressorBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/SmileyCloudBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java
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; import net.minecraft.block.material.Material;
public class SmileyCloudBlock extends ActuallyBlock { public class SmileyCloudBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/TreasureChestBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java
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; import net.minecraft.block.material.Material;
public class TreasureChestBlock extends ActuallyBlock { public class TreasureChestBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/XPSolidifierBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java
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; import net.minecraft.block.material.Material;
public class XPSolidifierBlock extends ActuallyBlock { public class XPSolidifierBlock extends ActuallyBlock {

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/misc/TinyTorchBlock.java
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.block.material.Material;
import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlackLotusBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java
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; import net.minecraft.block.material.Material;
public class BlackLotusBlock extends ActuallyBlock { public class BlackLotusBlock extends ActuallyBlock {

5
src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlantBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/PlantBlock.java
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.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
import net.minecraft.block.CropsBlock; import net.minecraft.block.CropsBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.Item; 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) { public PlantBlock(int minDropAmount, int maxDropAmount) {
super(Properties.create(Material.ROCK)); super(Properties.create(Material.ROCK));
} }

3
src/main/java/de/ellpeck/actuallyadditions/common/blocks/WildPlantBlock.java → src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/WildPlantBlock.java
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; import net.minecraft.block.material.Material;
public class WildPlantBlock extends ActuallyBlock { public class WildPlantBlock extends ActuallyBlock {

2
src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java
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> EMERADIC_CRYSTAL = ITEMS.register("emeradic_crystal", basicItem());
public static final RegistryObject<Item> ENORI_CRYSTAL = ITEMS.register("enori_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( public static final Set<RegistryObject<Item>> SIMPLE_ITEMS = ImmutableSet.of(
BLACK_QUARTS, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL, BLACK_QUARTS, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL,
VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL

0
src/main/resources/assets/actuallyadditions/textures/item/item_booklet.png → src/main/resources/assets/actuallyadditions/textures/item/booklet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB