Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-21 23:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Woops, that should finish up the skeleton of blocks, now for items

Browse source
This commit is contained in:
Michael Hillcox 2020-11-28 15:20:22 +00:00
parent 4224b0601f
commit 903095f946
No known key found for this signature in database
GPG key ID: 971C5B254742488F
12 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/generated/resources/.cache/cache
View file

@ -487,15 +487,15 @@ cdd287279790e4f50a56847f2255f88177d5ff44 data/actuallyadditions/loot_tables/bloc
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_slab_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_stair_block.json
ded949b5adea73073626565f7c81a00d61b39c1f data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_wall_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json
a1b62291e361451916e45a97bb499ecb1b6eb595 data/actuallyadditions/loot_tables/blocks/black_quartz_block.json
362e5acf99d6fd818735884a28322a8e91c8ba4b data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_block.json
284190bea6fa9fefeeb5aa942830fbd8999a4446 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_slab_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_stair_block.json
88b25da9974bf7c4e70133fea626e8e38e5f5b2e data/actuallyadditions/loot_tables/blocks/black_quartz_wall_block.json
cfcd716a6511dc3f4cbe808e1d6f6cb400b7bfe6 data/actuallyadditions/loot_tables/blocks/breaker_block.json
060b79c85d98a522bf8705a812f98cd7d276c5a6 data/actuallyadditions/loot_tables/blocks/canola_press_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/charcoal_block.json
e0629b02f20d4767a3e97f189e8b7631a0d008cb data/actuallyadditions/loot_tables/blocks/charcoal_block.json
29a7219d7de13c362d6f97dfb7a885372c4e988d data/actuallyadditions/loot_tables/blocks/coal_generator_block.json
28198fbeacb8c322f3a346cb565d08b0494707a5 data/actuallyadditions/loot_tables/blocks/coffee_machine_block.json
594b68290b3fdb1623bce0d78f292329c4e0549e data/actuallyadditions/loot_tables/blocks/crusher_block.json
@ -516,8 +516,8 @@ ffc51b69ac30c7205217ef0e1ba0d8263a43a37a data/actuallyadditions/loot_tables/bloc
0d44dd2ac497e069db40056826c03babfd88a7d5 data/actuallyadditions/loot_tables/blocks/display_stand_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/dropper_block.json
64631a06a9e493a61f28941fb24739f1ab44d76f data/actuallyadditions/loot_tables/blocks/empowerer_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/ender_casing_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/enderpearl_block.json
818eef3dc50443508ecd074bd480b7eab0432ad1 data/actuallyadditions/loot_tables/blocks/ender_casing_block.json
b106a0e07865723e6a34d386b329b2bae448a7ed data/actuallyadditions/loot_tables/blocks/enderpearl_block.json
aa3c481be3ada203a04572b9ab35cec6baee27e7 data/actuallyadditions/loot_tables/blocks/energizer_block.json
26178cc9aa45e75e1ce7871e52a3fb1a5e2988bb data/actuallyadditions/loot_tables/blocks/energy_laser_relay_advanced_block.json
f8ba606eb9b5ea140c0deefc742cc155c31ec0e3 data/actuallyadditions/loot_tables/blocks/energy_laser_relay_block.json
@ -540,8 +540,8 @@ e906482728edba1b6ec15f3313c0b0b9ceb38526 data/actuallyadditions/loot_tables/bloc
34dde314aa80e313627ca49d9624ab4bed34421f data/actuallyadditions/loot_tables/blocks/greenhouse_glass_block.json
c093309adf18eae12b6af39266f99e013141f233 data/actuallyadditions/loot_tables/blocks/heat_collector_block.json
b94a7398bf764b4d4d4fb6483b42be4910a486d1 data/actuallyadditions/loot_tables/blocks/hopping_item_interface_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/iron_casing_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json
d4a0a25db99bf6e7cad5bb22cbaaa6396715d845 data/actuallyadditions/loot_tables/blocks/iron_casing_block.json
464799e55af9ab462d90de9747f6855ada8d49e6 data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json
258c1b47250411a490856b24573f8305224d4674 data/actuallyadditions/loot_tables/blocks/item_interface_block.json
cf55cc4a0cd4068930d9dba33bc90ff93ba9dbe7 data/actuallyadditions/loot_tables/blocks/item_laser_relay_block.json
7b6071d60030381bca4edf7521b62ff6a1d9de94 data/actuallyadditions/loot_tables/blocks/item_repairer_block.json
@ -562,7 +562,7 @@ ad2233f8701c8f66d03e1603e407a726faed3295 data/actuallyadditions/loot_tables/bloc
add867ec95cf1cd3b2287feb324ad74faf0d0e64 data/actuallyadditions/loot_tables/blocks/lamp_red_block.json
b2b526df7b5907c458de8e57965fc1f390a50536 data/actuallyadditions/loot_tables/blocks/lamp_white_block.json
5ebf36bbf4af32acf913ec4902432011fd2e5f47 data/actuallyadditions/loot_tables/blocks/lamp_yellow_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/lava_factory_case_block.json
ec0eba5b2632c6ffe00ff33802388a71e4e002fc data/actuallyadditions/loot_tables/blocks/lava_factory_case_block.json
ef15618a97a225579537d405ce09e46c4511ca3c data/actuallyadditions/loot_tables/blocks/lava_factory_controller_block.json
c499ca40026612cf3e584deadc44b19fa92760b9 data/actuallyadditions/loot_tables/blocks/leaf_generator_block.json
e893ec3bfe12c6a5621f0d4ae4ce159b64615bb2 data/actuallyadditions/loot_tables/blocks/miner_block.json
@ -587,6 +587,6 @@ b6481a83ef7dfc51a48b259ce5a70daf13ad135a data/actuallyadditions/loot_tables/bloc
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/white_slab_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/white_stairs_block.json
05edfaaa6f2af2eb141be1a879b9f793dcfff2b5 data/actuallyadditions/loot_tables/blocks/white_wall_block.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/wood_casing_block.json
f50671e462968cd65feaba0bdb5bee54d14e4b24 data/actuallyadditions/loot_tables/blocks/wood_casing_block.json
cb45575707d43736601e5dfa43ef83e413bc8f66 data/actuallyadditions/loot_tables/blocks/xp_solidifier_block.json
5239d485f4e09b7fcf806d00913183dbca09c2dd data/minecraft/tags/blocks/walls.json

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:black_quartz_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:black_quartz_chiseled_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:black_quartz_pillar_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/charcoal_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:charcoal_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/ender_casing_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:ender_casing_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/enderpearl_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:enderpearl_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/iron_casing_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:iron_casing_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:iron_casing_snow_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/lava_factory_case_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:lava_factory_case_block"
}
],
"conditions": [

2
src/generated/resources/data/actuallyadditions/loot_tables/blocks/wood_casing_block.json
View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air"
"name": "actuallyadditions:wood_casing_block"
}
],
"conditions": [

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

@ -125,9 +125,9 @@ public class ActuallyBlocks {
public static final RegistryObject<Block> GREEN_WALL = BLOCKS.register("green_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> WHITE_WALL = BLOCKS.register("white_wall_block", () -> new WallBlock(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 = BLOCKS.register("black_quartz_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> BLACK_QUARTZ_CHISELED = BLOCKS.register("black_quartz_chiseled_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> BLACK_QUARTZ_PILLAR = BLOCKS.register("black_quartz_pillar_block", () -> new ActuallyBlock(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())));
@ -160,14 +160,14 @@ public class ActuallyBlocks {
public static final RegistryObject<Block> LAMP_CONTROLLER = BLOCKS.register("lamp_controller_block", LampPowererBlock::new);
// MISC BLOCKS
public static final RegistryObject<Block> ENDERPEARL = BLOCKS.register("enderpearl_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> CHARCOAL = BLOCKS.register("charcoal_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> ORE_BLACK_QUARTZ = BLOCKS.register("ore_black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> ENDER_CASING = BLOCKS.register("ender_casing_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> IRON_CASING = BLOCKS.register("iron_casing_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> IRON_CASING_SNOW = BLOCKS.register("iron_casing_snow_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> LAVA_FACTORY_CASE = BLOCKS.register("lava_factory_case_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> WOOD_CASING = BLOCKS.register("wood_casing_block", () -> new Block(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> ENDERPEARL = BLOCKS.register("enderpearl_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> CHARCOAL = BLOCKS.register("charcoal_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> ORE_BLACK_QUARTZ = BLOCKS.register("ore_black_quartz_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> ENDER_CASING = BLOCKS.register("ender_casing_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> IRON_CASING = BLOCKS.register("iron_casing_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> IRON_CASING_SNOW = BLOCKS.register("iron_casing_snow_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> LAVA_FACTORY_CASE = BLOCKS.register("lava_factory_case_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
public static final RegistryObject<Block> WOOD_CASING = BLOCKS.register("wood_casing_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK)));
// I don't know what this is :cry:
// public static final RegistryObject<Block> WildPlant