diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java new file mode 100644 index 000000000..acde145b6 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java @@ -0,0 +1,32 @@ +package de.ellpeck.actuallyadditions.common; + +import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.common.items.ActuallyItems; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; + +@Mod(ActuallyAdditions.MOD_ID) +public class ActuallyAdditions { + public static final String MOD_ID = "actuallyadditions"; + + public ActuallyAdditions() { + IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus(); + + ActuallyBlocks.BLOCKS.register(eventBus); + ActuallyItems.ITEMS.register(eventBus); + + eventBus.addListener(this::setup); + eventBus.addListener(this::clientSetup); + } + + private void setup(FMLCommonSetupEvent event) { + + } + + private void clientSetup(FMLClientSetupEvent event) { + + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java new file mode 100644 index 000000000..8c72134df --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -0,0 +1,288 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.types.Crystals; +import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays; +import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType; +import net.minecraft.block.*; +import net.minecraft.block.material.Material; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public class ActuallyBlocks { + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ActuallyAdditions.MOD_ID); + + public static final RegistryObject blockCrystalClusterRedstone + = BLOCKS.register("crystal_cluster_redstone_block", () -> new CrystalClusterBlock(Crystals.REDSTONE)); + + public static final RegistryObject blockCrystalClusterLapis + = BLOCKS.register("crystal_cluster_lapis_block", () -> new CrystalClusterBlock(Crystals.LAPIS)); + + public static final RegistryObject blockCrystalClusterDiamond + = BLOCKS.register("crystal_cluster_diamond_block", () -> new CrystalClusterBlock(Crystals.DIAMOND)); + + public static final RegistryObject blockCrystalClusterCoal + = BLOCKS.register("crystal_cluster_coal_block", () -> new CrystalClusterBlock(Crystals.COAL)); + + public static final RegistryObject blockCrystalClusterEmerald + = BLOCKS.register("crystal_cluster_emerald_block", () -> new CrystalClusterBlock(Crystals.EMERALD)); + + public static final RegistryObject blockCrystalClusterIron + = BLOCKS.register("crystal_cluster_iron_block", () -> new CrystalClusterBlock(Crystals.IRON)); + + public static final RegistryObject blockBatteryBox + = BLOCKS.register("battery_box_block", BatteryBoxBlock::new); + + public static final RegistryObject blockItemViewerHopping + = BLOCKS.register("item_viewer_hopping_block", ItemViewerHoppingBlock::new); + + public static final RegistryObject blockFarmer + = BLOCKS.register("farmer_block", FarmerBlock::new); + + public static final RegistryObject blockBioReactor + = BLOCKS.register("bio_reactor_block", BioReactorBlock::new); + + public static final RegistryObject blockEmpowerer + = BLOCKS.register("empowerer_block", EmpowererBlock::new); + + public static final RegistryObject blockTinyTorch + = BLOCKS.register("tiny_torch_block", TinyTorchBlock::new); + + public static final RegistryObject blockShockSuppressor + = BLOCKS.register("shock_suppressor_block", ShockSuppressorBlock::new); + + public static final RegistryObject blockDisplayStand + = BLOCKS.register("display_stand_block", DisplayStandBlock::new); + + public static final RegistryObject blockPlayerInterface + = BLOCKS.register("player_interface_block", PlayerInterfaceBlock::new); + + public static final RegistryObject blockItemViewer + = BLOCKS.register("item_viewer_block", ItemViewerBlock::new); + + public static final RegistryObject blockFireworkBox + = BLOCKS.register("firework_box_block", FireworkBoxBlock::new); + + public static final RegistryObject blockMiner + = BLOCKS.register("miner_block", MinerBlock::new); + + public static final RegistryObject blockAtomicReconstructor + = BLOCKS.register("atomic_reconstructor_block", AtomicReconstructorBlock::new); + + public static final RegistryObject blockCrystal + = BLOCKS.register("crystal_block", () -> new CrystalBlock(false)); + + public static final RegistryObject blockCrystalEmpowered + = BLOCKS.register("crystal_empowered_block", () -> new CrystalBlock(true)); + + public static final RegistryObject blockBlackLotus + = BLOCKS.register("black_lotus_block", BlackLotusBlock::new); + + public static final RegistryObject blockLaserRelay + = BLOCKS.register("laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_BASIC)); + + public static final RegistryObject blockLaserRelayAdvanced + = BLOCKS.register("laser_relay_advanced_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_ADVANCED)); + + public static final RegistryObject blockLaserRelayExtreme + = BLOCKS.register("laser_relay_extreme_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_EXTREME)); + + public static final RegistryObject blockLaserRelayFluids + = BLOCKS.register("laser_relay_fluids_block", () -> new LaserRelayBlock(LaserRelays.FLUIDS)); + + public static final RegistryObject blockLaserRelayItem + = BLOCKS.register("laser_relay_item_block", () -> new LaserRelayBlock(LaserRelays.ITEM)); + + public static final RegistryObject blockLaserRelayItemWhitelist + = BLOCKS.register("laser_relay_item_whitelist_block", () -> new LaserRelayBlock(LaserRelays.ITEM_WHITELIST)); + + public static final RegistryObject blockRangedCollector + = BLOCKS.register("ranged_collector_block", RangedCollectorBlock::new); + + public static final RegistryObject blockDirectionalBreaker + = BLOCKS.register("directional_breaker_block", DirectionalBreakerBlock::new); + + public static final RegistryObject blockLeafGenerator + = BLOCKS.register("leaf_generator_block", LeafGeneratorBlock::new); + + public static final RegistryObject blockSmileyCloud + = BLOCKS.register("smiley_cloud_block", SmileyCloudBlock::new); + + public static final RegistryObject blockXPSolidifier + = BLOCKS.register("xp_solidifier_block", XPSolidifierBlock::new); + + public static final RegistryObject blockTestifiBucksGreenWall + = BLOCKS.register("testifi_bucks_green_wall_block", GenericBlock::new); + + public static final RegistryObject blockTestifiBucksWhiteWall + = BLOCKS.register("testifi_bucks_white_wall_block", GenericBlock::new); + + public static final RegistryObject blockTestifiBucksGreenStairs + = BLOCKS.register("testifi_bucks_green_stairs_block", () -> new StairsBlock(() -> blockTestifiBucksGreenWall.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockTestifiBucksWhiteStairs + = BLOCKS.register("testifi_bucks_white_stairs_block", () -> new StairsBlock(() -> blockTestifiBucksWhiteWall.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockTestifiBucksGreenSlab + = BLOCKS.register("testifi_bucks_green_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockTestifiBucksWhiteSlab + = BLOCKS.register("testifi_bucks_white_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockTestifiBucksGreenFence + = BLOCKS.register("testifi_bucks_green_fence_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockTestifiBucksWhiteFence + = BLOCKS.register("testifi_bucks_white_fence_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockColoredLamp + = BLOCKS.register("colored_lamp_block", () -> new ColoredLampBlock(false)); + + public static final RegistryObject blockColoredLampOn + = BLOCKS.register("colored_lamp_on_block", () -> new ColoredLampBlock(true)); + + public static final RegistryObject blockLampPowerer + = BLOCKS.register("lamp_powerer_block", LampPowererBlock::new); + + public static final RegistryObject blockTreasureChest + = BLOCKS.register("treasure_chest_block", TreasureChestBlock::new); + + public static final RegistryObject blockEnergizer + = BLOCKS.register("energizer_block", () -> new EnergizerBlock(true)); + + public static final RegistryObject blockEnervator + = BLOCKS.register("enervator_block", () -> new EnergizerBlock(false)); + + public static final RegistryObject blockLavaFactoryController + = BLOCKS.register("lava_factory_controller_block", LavaFactoryControllerBlock::new); + + public static final RegistryObject blockCanolaPress + = BLOCKS.register("canola_press_block", CanolaPressBlock::new); + + public static final RegistryObject blockPhantomface + = BLOCKS.register("phantomface_block", () -> new PhantomBlock(PhantomType.FACE)); + + public static final RegistryObject blockPhantomPlacer + = BLOCKS.register("phantom_placer_block", () -> new PhantomBlock(PhantomType.PLACER)); + + public static final RegistryObject blockPhantomLiquiface + = BLOCKS.register("phantom_liquiface_block", () -> new PhantomBlock(PhantomType.LIQUIFACE)); + + public static final RegistryObject blockPhantomEnergyface + = BLOCKS.register("phantom_energyface_block", () -> new PhantomBlock(PhantomType.ENERGYFACE)); + + public static final RegistryObject blockPhantomRedstoneface + = BLOCKS.register("phantom_redstoneface_block", () -> new PhantomBlock(PhantomType.REDSTONEFACE)); + + public static final RegistryObject blockPhantomBreaker + = BLOCKS.register("phantom_breaker_block", () -> new PhantomBlock(PhantomType.BREAKER)); + + public static final RegistryObject blockCoalGenerator + = BLOCKS.register("coal_generator_block", CoalGeneratorBlock::new); + + public static final RegistryObject blockOilGenerator + = BLOCKS.register("oil_generator_block", OilGeneratorBlock::new); + + public static final RegistryObject blockFermentingBarrel + = BLOCKS.register("fermenting_barrel_block", FermentingBarrelBlock::new); + + public static final RegistryObject blockRice + = BLOCKS.register("rice_block", () -> new PlantBlock(1, 2)); + + public static final RegistryObject blockCanola + = BLOCKS.register("canola_block", () -> new PlantBlock(2, 3)); + + public static final RegistryObject blockFlax + = BLOCKS.register("flax_block", () -> new PlantBlock(2, 4)); + + public static final RegistryObject blockCoffee + = BLOCKS.register("coffee_block", () -> new PlantBlock(2, 2)); + + public static final RegistryObject blockMisc + = BLOCKS.register("misc_block", () -> new Block(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockFeeder + = BLOCKS.register("feeder_block", FeederBlock::new); + + public static final RegistryObject blockGrinder + = BLOCKS.register("grinder_block", () -> new GrinderBlock(false)); + + public static final RegistryObject blockGrinderDouble + = BLOCKS.register("grinder_double_block", () -> new GrinderBlock(true)); + + public static final RegistryObject blockFurnaceDouble + = BLOCKS.register("furnace_double_block", FurnaceDoubleBlock::new); + + public static final RegistryObject blockInputter + = BLOCKS.register("inputter_block", () -> new InputterBlock(false)); + + public static final RegistryObject blockInputterAdvanced + = BLOCKS.register("inputter_advanced_block", () -> new InputterBlock(true)); + + public static final RegistryObject blockFishingNet + = BLOCKS.register("fishing_net_block", FishingNetBlock::new); + + public static final RegistryObject blockFurnaceSolar + = BLOCKS.register("furnace_solar_block", FurnaceSolarBlock::new); + + public static final RegistryObject blockHeatCollector + = BLOCKS.register("heat_collector_block", HeatCollectorBlock::new); + + public static final RegistryObject blockItemRepairer + = BLOCKS.register("item_repairer_block", ItemRepairerBlock::new); + + public static final RegistryObject blockGreenhouseGlass + = BLOCKS.register("greenhouse_glass_block", GreenhouseGlassBlock::new); + + public static final RegistryObject blockBreaker + = BLOCKS.register("breaker_block", () -> new BreakerBlock(false)); + + public static final RegistryObject blockPlacer + = BLOCKS.register("placer_block", () -> new BreakerBlock(true)); + + public static final RegistryObject blockDropper + = BLOCKS.register("dropper_block", () -> new DropperBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockFluidPlacer + = BLOCKS.register("fluid_placer_block", () -> new FluidCollectorBlock(true)); + + public static final RegistryObject blockFluidCollector + = BLOCKS.register("fluid_collector_block", () -> new FluidCollectorBlock(false)); + + public static final RegistryObject blockCoffeeMachine + = BLOCKS.register("coffee_machine_block", CoffeeMachineBlock::new); + + public static final RegistryObject blockPhantomBooster + = BLOCKS.register("phantom_booster_block", PhantomBoosterBlock::new); + + public static final RegistryObject blockWildPlant + = BLOCKS.register("wild_block", WildPlantBlock::new); + + public static final RegistryObject blockQuartzWall + = BLOCKS.register("quartz_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockChiseledQuartzWall + = BLOCKS.register("chiseled_quartz_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockPillarQuartzWall + = BLOCKS.register("pillar_quartz_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockQuartzStair + = BLOCKS.register("quartz_stair_block", () -> new StairsBlock(() -> blockBlackLotus.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockChiseledQuartzStair + = BLOCKS.register("chiseled_quartz_stair_block", () -> new StairsBlock(() -> blockBlackLotus.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockPillarQuartzStair + = BLOCKS.register("pillar_quartz_stair_block", () -> new StairsBlock(() -> blockBlackLotus.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockQuartzSlab + = BLOCKS.register("quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockChiseledQuartzSlab + = BLOCKS.register("chiseled_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject blockPillarQuartzSlab + = BLOCKS.register("pillar_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/AtomicReconstructorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/AtomicReconstructorBlock.java new file mode 100644 index 000000000..cfadc080f --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/AtomicReconstructorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class AtomicReconstructorBlock extends Block { + public AtomicReconstructorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BatteryBoxBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BatteryBoxBlock.java new file mode 100644 index 000000000..39cb2fe33 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BatteryBoxBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BatteryBoxBlock extends Block { + public BatteryBoxBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BioReactorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BioReactorBlock.java new file mode 100644 index 000000000..45a2c96ba --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BioReactorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BioReactorBlock extends Block { + public BioReactorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlackLotusBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlackLotusBlock.java new file mode 100644 index 000000000..a2bd167eb --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlackLotusBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BlackLotusBlock extends Block { + public BlackLotusBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BreakerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BreakerBlock.java new file mode 100644 index 000000000..70c4bff10 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BreakerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BreakerBlock extends Block { + public BreakerBlock(boolean isPlacer) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CanolaPressBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CanolaPressBlock.java new file mode 100644 index 000000000..5d34e683e --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CanolaPressBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class CanolaPressBlock extends Block { + public CanolaPressBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoalGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoalGeneratorBlock.java new file mode 100644 index 000000000..c14611fb4 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoalGeneratorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class CoalGeneratorBlock extends Block { + public CoalGeneratorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoffeeMachineBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoffeeMachineBlock.java new file mode 100644 index 000000000..6056b0b27 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoffeeMachineBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class CoffeeMachineBlock extends Block { + public CoffeeMachineBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ColoredLampBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ColoredLampBlock.java new file mode 100644 index 000000000..835ec36a1 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ColoredLampBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class ColoredLampBlock extends Block { + public ColoredLampBlock(boolean isLit) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalBlock.java new file mode 100644 index 000000000..54d3b83bd --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class CrystalBlock extends Block { + public CrystalBlock(boolean isEmpowered) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalClusterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalClusterBlock.java new file mode 100644 index 000000000..cdf3a051e --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalClusterBlock.java @@ -0,0 +1,11 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import de.ellpeck.actuallyadditions.common.blocks.types.Crystals; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class CrystalClusterBlock extends Block { + public CrystalClusterBlock(Crystals crystal) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DirectionalBreakerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DirectionalBreakerBlock.java new file mode 100644 index 000000000..82f32782c --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DirectionalBreakerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class DirectionalBreakerBlock extends Block { + public DirectionalBreakerBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DisplayStandBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DisplayStandBlock.java new file mode 100644 index 000000000..bc69b28d8 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DisplayStandBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class DisplayStandBlock extends Block { + public DisplayStandBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EmpowererBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EmpowererBlock.java new file mode 100644 index 000000000..08c499a52 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EmpowererBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class EmpowererBlock extends Block { + public EmpowererBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EnergizerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EnergizerBlock.java new file mode 100644 index 000000000..d521c21a3 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EnergizerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class EnergizerBlock extends Block { + public EnergizerBlock(boolean isEnergizer) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FarmerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FarmerBlock.java new file mode 100644 index 000000000..ad18056d8 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FarmerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FarmerBlock extends Block { + public FarmerBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FeederBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FeederBlock.java new file mode 100644 index 000000000..87519f46d --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FeederBlock.java @@ -0,0 +1,11 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FeederBlock extends Block { + + public FeederBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FermentingBarrelBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FermentingBarrelBlock.java new file mode 100644 index 000000000..9a0aeda61 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FermentingBarrelBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FermentingBarrelBlock extends Block { + public FermentingBarrelBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FireworkBoxBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FireworkBoxBlock.java new file mode 100644 index 000000000..d27dafe6e --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FireworkBoxBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FireworkBoxBlock extends Block { + public FireworkBoxBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FishingNetBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FishingNetBlock.java new file mode 100644 index 000000000..0b7e84888 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FishingNetBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FishingNetBlock extends Block { + public FishingNetBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FluidCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FluidCollectorBlock.java new file mode 100644 index 000000000..826f14935 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FluidCollectorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FluidCollectorBlock extends Block { + public FluidCollectorBlock(boolean isPlacer) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceDoubleBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceDoubleBlock.java new file mode 100644 index 000000000..16939aafd --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceDoubleBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FurnaceDoubleBlock extends Block { + public FurnaceDoubleBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceSolarBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceSolarBlock.java new file mode 100644 index 000000000..e62b6d3a6 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceSolarBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class FurnaceSolarBlock extends Block { + public FurnaceSolarBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GenericBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GenericBlock.java new file mode 100644 index 000000000..a43b6819c --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GenericBlock.java @@ -0,0 +1,16 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraftforge.common.ToolType; + +public class GenericBlock extends Block { + public GenericBlock() { + super(Properties.create(Material.ROCK) + .hardnessAndResistance(1.5F, 10.0F) + .harvestTool(ToolType.PICKAXE) + .harvestLevel(0) + .sound(SoundType.STONE)); + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GreenhouseGlassBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GreenhouseGlassBlock.java new file mode 100644 index 000000000..ebe4e74b0 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GreenhouseGlassBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class GreenhouseGlassBlock extends Block { + public GreenhouseGlassBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GrinderBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GrinderBlock.java new file mode 100644 index 000000000..b70882f79 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GrinderBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class GrinderBlock extends Block { + public GrinderBlock(boolean isDouble) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HeatCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HeatCollectorBlock.java new file mode 100644 index 000000000..f82779633 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HeatCollectorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class HeatCollectorBlock extends Block { + public HeatCollectorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InputterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InputterBlock.java new file mode 100644 index 000000000..e0ec12884 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InputterBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class InputterBlock extends Block { + public InputterBlock(boolean isAdvanced) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemRepairerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemRepairerBlock.java new file mode 100644 index 000000000..21ba27919 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemRepairerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class ItemRepairerBlock extends Block { + public ItemRepairerBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerBlock.java new file mode 100644 index 000000000..9357156b6 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class ItemViewerBlock extends Block { + public ItemViewerBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerHoppingBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerHoppingBlock.java new file mode 100644 index 000000000..7f000448b --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerHoppingBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class ItemViewerHoppingBlock extends Block { + public ItemViewerHoppingBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LampPowererBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LampPowererBlock.java new file mode 100644 index 000000000..7eafd66fb --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LampPowererBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class LampPowererBlock extends Block { + public LampPowererBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LaserRelayBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LaserRelayBlock.java new file mode 100644 index 000000000..17ea51a6a --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LaserRelayBlock.java @@ -0,0 +1,11 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class LaserRelayBlock extends Block { + public LaserRelayBlock(LaserRelays relayType) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LavaFactoryControllerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LavaFactoryControllerBlock.java new file mode 100644 index 000000000..cbec68a6f --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LavaFactoryControllerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class LavaFactoryControllerBlock extends Block { + public LavaFactoryControllerBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LeafGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LeafGeneratorBlock.java new file mode 100644 index 000000000..3f6b8a7da --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LeafGeneratorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class LeafGeneratorBlock extends Block { + public LeafGeneratorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/MinerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/MinerBlock.java new file mode 100644 index 000000000..2f0440978 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/MinerBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class MinerBlock extends Block { + public MinerBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/OilGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/OilGeneratorBlock.java new file mode 100644 index 000000000..54a95cb31 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/OilGeneratorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class OilGeneratorBlock extends Block { + public OilGeneratorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBlock.java new file mode 100644 index 000000000..0918f550b --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBlock.java @@ -0,0 +1,11 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class PhantomBlock extends Block { + public PhantomBlock(PhantomType type) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBoosterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBoosterBlock.java new file mode 100644 index 000000000..39735e3ac --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBoosterBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class PhantomBoosterBlock extends Block { + public PhantomBoosterBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlantBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlantBlock.java new file mode 100644 index 000000000..1d676b912 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlantBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.CropsBlock; +import net.minecraft.block.material.Material; + +public class PlantBlock extends CropsBlock { + public PlantBlock(int minDropAmount, int maxDropAmount) { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlayerInterfaceBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlayerInterfaceBlock.java new file mode 100644 index 000000000..e677a350f --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlayerInterfaceBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class PlayerInterfaceBlock extends Block { + public PlayerInterfaceBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/RangedCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/RangedCollectorBlock.java new file mode 100644 index 000000000..e5f014f5d --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/RangedCollectorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class RangedCollectorBlock extends Block { + public RangedCollectorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ShockSuppressorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ShockSuppressorBlock.java new file mode 100644 index 000000000..640beecde --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ShockSuppressorBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class ShockSuppressorBlock extends Block { + public ShockSuppressorBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/SmileyCloudBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/SmileyCloudBlock.java new file mode 100644 index 000000000..fd9a3d6b3 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/SmileyCloudBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class SmileyCloudBlock extends Block { + public SmileyCloudBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java new file mode 100644 index 000000000..ffe5fc3e5 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class TinyTorchBlock extends Block { + public TinyTorchBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TreasureChestBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TreasureChestBlock.java new file mode 100644 index 000000000..9e42a5fd1 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TreasureChestBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class TreasureChestBlock extends Block { + public TreasureChestBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/WildPlantBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/WildPlantBlock.java new file mode 100644 index 000000000..49eab0c0c --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/WildPlantBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class WildPlantBlock extends Block { + public WildPlantBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/XPSolidifierBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/XPSolidifierBlock.java new file mode 100644 index 000000000..bc3f35d82 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/XPSolidifierBlock.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class XPSolidifierBlock extends Block { + public XPSolidifierBlock() { + super(Properties.create(Material.ROCK)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/Crystals.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/Crystals.java new file mode 100644 index 000000000..fa294c31e --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/Crystals.java @@ -0,0 +1,27 @@ +package de.ellpeck.actuallyadditions.common.blocks.types; + +import net.minecraft.util.IStringSerializable; + +public enum Crystals implements IStringSerializable { + REDSTONE("red", 0xFF2F21, 158F / 255F, 43F / 255F, 39F / 255F), + LAPIS("blue", 0x5171FF, 37F / 255F, 49F / 255F, 147F / 255F), + DIAMOND("light_blue", 0x35F1FF, 99F / 255F, 135F / 255F, 210F / 255F), + COAL("black", 0x434442, 0.2F, 0.2F, 0.2F), + EMERALD("green", 0x44E033, 54F / 255F, 75F / 255F, 24F / 255F), + IRON("white", 0xCEDDD4, 0.8F, 0.8F, 0.8F); + + public final String name; + public final float[] conversionColorParticles; + public final int clusterColor; + + Crystals(String name, int clusterColor, float... conversionColorParticles) { + this.name = name; + this.conversionColorParticles = conversionColorParticles; + this.clusterColor = clusterColor; + } + + @Override + public String getName() { + return this.name; + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/LaserRelays.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/LaserRelays.java new file mode 100644 index 000000000..94b1ec055 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/LaserRelays.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks.types; + +public enum LaserRelays { + ENERGY_BASIC, + ENERGY_ADVANCED, + ENERGY_EXTREME, + FLUIDS, + ITEM, + ITEM_WHITELIST +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/PhantomType.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/PhantomType.java new file mode 100644 index 000000000..ea15fa92f --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/PhantomType.java @@ -0,0 +1,10 @@ +package de.ellpeck.actuallyadditions.common.blocks.types; + +public enum PhantomType { + FACE, + PLACER, + BREAKER, + LIQUIFACE, + ENERGYFACE, + REDSTONEFACE +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java new file mode 100644 index 000000000..567cbee45 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -0,0 +1,13 @@ +package de.ellpeck.actuallyadditions.common.items; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import net.minecraft.item.Item; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public class ActuallyItems { + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ActuallyAdditions.MOD_ID); + + + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java new file mode 100644 index 000000000..df3d8243c --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java @@ -0,0 +1,25 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; + +@Mod.EventBusSubscriber(modid = ActuallyAdditions.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public final class ActuallyGens { + + @SubscribeEvent + public static void runGenerator(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + + if( event.includeClient() ) { + ExistingFileHelper helper = event.getExistingFileHelper(); + + generator.addProvider(new GeneratorBlockStates(generator, helper)); + generator.addProvider(new GeneratorItemModels(generator, helper)); + generator.addProvider(new GeneratorLanguage(generator)); + } + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java new file mode 100644 index 000000000..3a05a318d --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java @@ -0,0 +1,24 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ExistingFileHelper; + +public class GeneratorBlockStates extends BlockStateProvider { + public GeneratorBlockStates(DataGenerator gen, ExistingFileHelper exFileHelper) { + super(gen, ActuallyAdditions.MOD_ID, exFileHelper); + } + + @Override + protected void registerStatesAndModels() { + } + + private void buildCubeAll(Block block) { + getVariantBuilder(block).forAllStates(state -> + ConfiguredModel.builder().modelFile(cubeAll(block)).build() + ); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java new file mode 100644 index 000000000..ae13c1b89 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java @@ -0,0 +1,29 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.client.model.generators.ModelFile; + +public class GeneratorItemModels extends ItemModelProvider { + public GeneratorItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, ActuallyAdditions.MOD_ID, existingFileHelper); + } + + @Override + protected void registerModels() { + + } + + private void registerBlockModel(Block block) { + String path = block.getRegistryName().getPath(); + getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path))); + } + + @Override + public String getName() { + return "Item Models"; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java new file mode 100644 index 000000000..acf3d153a --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -0,0 +1,24 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.common.data.LanguageProvider; + +public class GeneratorLanguage extends LanguageProvider { + public GeneratorLanguage(DataGenerator gen) { + super(gen, ActuallyAdditions.MOD_ID, "en_us"); + } + + @Override + protected void addTranslations() { + + } + + /** + * Very simply, prefixes all the keys with the mod_id.{key} instead of + * having to input it manually + */ + private void addPrefixed(String key, String text) { + add(String.format("%s.%s", ActuallyAdditions.MOD_ID, key), text); + } +}