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

Compare commits

base: Ellpeck:e048a2a30be53e8635a1e70542a88fd4258cb65c
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7
..
compare: Ellpeck:bc67137313e177f7c211acb7fa3ea160b0c1f4b2
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7

No commits in common. "e048a2a30be53e8635a1e70542a88fd4258cb65c" and "bc67137313e177f7c211acb7fa3ea160b0c1f4b2" have entirely different histories.
e048a2a30b ... bc67137313

29 changed files with 29 additions and 224 deletions
Show stats Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,9 +1,3 @@
# 1.3.8+mc1.21.1
* Lock the Immersive Engineering cloche compat recipes behind a mod loaded condition
* Add the stairs, slabs and walls to the appropriate block/item tags
* Change the sound type of the casing blocks to match material used in the recipe
* Change the sound type of some machines to use the metal sound
# 1.3.7+mc1.21.1
* Added recipes for AA crops in the IE cloche.
* Fix All in One Tool stats

2
gradle.properties
View file

@ -4,7 +4,7 @@ org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=false
mod_version=1.3.8
mod_version=1.3.7
# Forge
game_version=1.21.1

6
src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837
View file

@ -1,4 +1,4 @@
// 1.21.1 2024-10-31T19:57:10.5378083 Block Tags
// 1.21.1 2024-10-19T16:19:48.5749712 Block Tags
8665de82dd3d3a1351ce58f78108214f359104b0 data/actuallyadditions/tags/block/mineable/aio.json
f7dc293929a2176bc6e428c765f6bf49fbeccdb5 data/actuallyadditions/tags/block/mineable/drill.json
3ce233e27b4d7db10e2d4832602ef5b2a57f9a65 data/c/tags/block/ores.json
@ -18,8 +18,6 @@ fb95ac8041521e1d2879f6fcb652266dcd9e0fb1 data/c/tags/block/storage_blocks/empowe
b9aa28a54d47054ba5653bec2f20e0a675ab5120 data/c/tags/block/storage_blocks/restonia_crystal.json
fb4f349bc6fd89f26ef2ba72a9236f05eefd8ea2 data/c/tags/block/storage_blocks/void_crystal.json
8dbaf9b7bd6774bc7c01a47a72b8a7fdaee51f87 data/minecraft/tags/block/mineable/axe.json
0f159793ba45fc4aee456d9b70fab9c0003899e8 data/minecraft/tags/block/mineable/pickaxe.json
58c611cbaae2a0a5dd6f82f183b7d0f5dc2d09e6 data/minecraft/tags/block/mineable/pickaxe.json
fab721a4fe7ece1d0e019ce36c4d2862f70ee53b data/minecraft/tags/block/needs_stone_tool.json
51d50547b5f031f4fa6e62189af06059a407c009 data/minecraft/tags/block/slabs.json
a60870f29ca48ea0d55ac32620ff5b4bb2f2f62e data/minecraft/tags/block/stairs.json
f74407e86c92d0d9435d62ff0f95999f3a84c674 data/minecraft/tags/block/walls.json

5
src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175
View file

@ -1,4 +1,4 @@
// 1.21.1 2024-10-31T20:14:02.6354984 Tags for minecraft:item mod id actuallyadditions
// 1.21.1 2024-10-19T11:22:45.676221 Tags for minecraft:item mod id actuallyadditions
87327118c2f16da245b76de4fdcaab149456d9b8 data/actuallyadditions/tags/item/coffee_beans.json
f3ee78cd8c9563bd1828de2b4b336735f289f9f2 data/actuallyadditions/tags/item/crystals.json
441008b49b4bab00125100fc969cb6582eff7271 data/actuallyadditions/tags/item/crystal_blocks.json
@ -38,6 +38,3 @@ fb95ac8041521e1d2879f6fcb652266dcd9e0fb1 data/c/tags/item/storage_blocks/empower
148cd937543fd58b196403c18839b2698bf87fdf data/c/tags/item/storage_blocks/palis_crystal.json
b9aa28a54d47054ba5653bec2f20e0a675ab5120 data/c/tags/item/storage_blocks/restonia_crystal.json
fb4f349bc6fd89f26ef2ba72a9236f05eefd8ea2 data/c/tags/item/storage_blocks/void_crystal.json
51d50547b5f031f4fa6e62189af06059a407c009 data/minecraft/tags/item/slabs.json
a60870f29ca48ea0d55ac32620ff5b4bb2f2f62e data/minecraft/tags/item/stairs.json
f74407e86c92d0d9435d62ff0f95999f3a84c674 data/minecraft/tags/item/walls.json

10
src/generated/resources/.cache/ac8a02941a4e34649db8b388fb528d3ed610c50f
View file

@ -1,7 +1,7 @@
// 1.21.1 2024-10-31T20:16:27.2164769 Misc Recipes
f323dfc741cadd21229c3137c992a5e827415a33 data/actuallyadditions/recipe/compat/cloche_canola.json
08a866bbe37e01cf74c466944a0ce0c1c04aacb0 data/actuallyadditions/recipe/compat/cloche_coffee.json
061b7482517f3dae5f427e723e579dfc14c0b283 data/actuallyadditions/recipe/compat/cloche_flax.json
466e21e14118dfd3f6db2bff51ebd8cc359e6979 data/actuallyadditions/recipe/compat/cloche_rice.json
// 1.21.1 2024-10-24T15:58:31.7869255 Misc Recipes
426ef39628bee0e5fa5478e8490b9661a302bc5b data/actuallyadditions/recipe/compat/cloche_canola.json
86384eda7472a193965aec7c58a1e97178bd901b data/actuallyadditions/recipe/compat/cloche_coffee.json
f60e89093717ab73b5ec4760a4a2a2502ad92b21 data/actuallyadditions/recipe/compat/cloche_flax.json
c2a9c355543d601b810a4ffc581bdeaf00077358 data/actuallyadditions/recipe/compat/cloche_rice.json
11e0dd08e85ab0f073a06a447be5e57949849180 data/actuallyadditions/recipe/fermenting/refined_canola.json
3b226a682d7de7ffff4b91818057c740b4e7bcd7 data/actuallyadditions/recipe/pressing/canola.json

6
src/generated/resources/data/actuallyadditions/recipe/compat/cloche_canola.json
View file

@ -1,10 +1,4 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:cloche",
"input": {
"item": "actuallyadditions:canola_seeds"

6
src/generated/resources/data/actuallyadditions/recipe/compat/cloche_coffee.json
View file

@ -1,10 +1,4 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:cloche",
"input": {
"item": "actuallyadditions:coffee_beans"

6
src/generated/resources/data/actuallyadditions/recipe/compat/cloche_flax.json
View file

@ -1,10 +1,4 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:cloche",
"input": {
"item": "actuallyadditions:flax_seeds"

6
src/generated/resources/data/actuallyadditions/recipe/compat/cloche_rice.json
View file

@ -1,10 +1,4 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:cloche",
"input": {
"item": "actuallyadditions:rice_seeds"

23
src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
View file

@ -86,27 +86,6 @@
"actuallyadditions:laser_relay_fluids",
"actuallyadditions:laser_relay_item",
"actuallyadditions:laser_relay_item_advanced",
"actuallyadditions:greenhouse_glass",
"actuallyadditions:ethetic_white_wall",
"actuallyadditions:ethetic_green_wall",
"actuallyadditions:black_quartz_wall",
"actuallyadditions:smooth_black_quartz_wall",
"actuallyadditions:black_quartz_pillar_wall",
"actuallyadditions:chiseled_black_quartz_wall",
"actuallyadditions:black_quartz_brick_wall",
"actuallyadditions:ethetic_white_stairs",
"actuallyadditions:ethetic_green_stairs",
"actuallyadditions:black_quartz_stair",
"actuallyadditions:smooth_black_quartz_stair",
"actuallyadditions:black_quartz_pillar_stair",
"actuallyadditions:chiseled_black_quartz_stair",
"actuallyadditions:black_quartz_brick_stair",
"actuallyadditions:ethetic_white_slab",
"actuallyadditions:ethetic_green_slab",
"actuallyadditions:black_quartz_slab",
"actuallyadditions:smooth_black_quartz_slab",
"actuallyadditions:black_quartz_pillar_slab",
"actuallyadditions:chiseled_black_quartz_slab",
"actuallyadditions:black_quartz_brick_slab"
"actuallyadditions:greenhouse_glass"
]
}

11
src/generated/resources/data/minecraft/tags/block/slabs.json
View file

@ -1,11 +0,0 @@
{
"values": [
"actuallyadditions:ethetic_white_slab",
"actuallyadditions:ethetic_green_slab",
"actuallyadditions:black_quartz_slab",
"actuallyadditions:smooth_black_quartz_slab",
"actuallyadditions:black_quartz_pillar_slab",
"actuallyadditions:chiseled_black_quartz_slab",
"actuallyadditions:black_quartz_brick_slab"
]
}

11
src/generated/resources/data/minecraft/tags/block/stairs.json
View file

@ -1,11 +0,0 @@
{
"values": [
"actuallyadditions:ethetic_white_stairs",
"actuallyadditions:ethetic_green_stairs",
"actuallyadditions:black_quartz_stair",
"actuallyadditions:smooth_black_quartz_stair",
"actuallyadditions:black_quartz_pillar_stair",
"actuallyadditions:chiseled_black_quartz_stair",
"actuallyadditions:black_quartz_brick_stair"
]
}

11
src/generated/resources/data/minecraft/tags/item/slabs.json
View file

@ -1,11 +0,0 @@
{
"values": [
"actuallyadditions:ethetic_white_slab",
"actuallyadditions:ethetic_green_slab",
"actuallyadditions:black_quartz_slab",
"actuallyadditions:smooth_black_quartz_slab",
"actuallyadditions:black_quartz_pillar_slab",
"actuallyadditions:chiseled_black_quartz_slab",
"actuallyadditions:black_quartz_brick_slab"
]
}

11
src/generated/resources/data/minecraft/tags/item/stairs.json
View file

@ -1,11 +0,0 @@
{
"values": [
"actuallyadditions:ethetic_white_stairs",
"actuallyadditions:ethetic_green_stairs",
"actuallyadditions:black_quartz_stair",
"actuallyadditions:smooth_black_quartz_stair",
"actuallyadditions:black_quartz_pillar_stair",
"actuallyadditions:chiseled_black_quartz_stair",
"actuallyadditions:black_quartz_brick_stair"
]
}

11
src/generated/resources/data/minecraft/tags/item/walls.json
View file

@ -1,11 +0,0 @@
{
"values": [
"actuallyadditions:ethetic_white_wall",
"actuallyadditions:ethetic_green_wall",
"actuallyadditions:black_quartz_wall",
"actuallyadditions:smooth_black_quartz_wall",
"actuallyadditions:black_quartz_pillar_wall",
"actuallyadditions:chiseled_black_quartz_wall",
"actuallyadditions:black_quartz_brick_wall"
]
}

43
src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java
View file

@ -31,26 +31,6 @@ public class BlockTagsGenerator extends BlockTagsProvider {
ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get()
);
tag(BlockTags.STAIRS).add(
ActuallyBlocks.ETHETIC_WHITE_STAIRS.get(),
ActuallyBlocks.ETHETIC_GREEN_STAIRS.get(),
ActuallyBlocks.BLACK_QUARTZ_STAIR.get(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.get(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.get()
);
tag(BlockTags.SLABS).add(
ActuallyBlocks.ETHETIC_WHITE_SLAB.get(),
ActuallyBlocks.ETHETIC_GREEN_SLAB.get(),
ActuallyBlocks.BLACK_QUARTZ_SLAB.get(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.get(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.get()
);
tag(BlockTags.MINEABLE_WITH_AXE).add(
ActuallyBlocks.FERMENTING_BARREL.get()
);
@ -141,28 +121,7 @@ public class BlockTagsGenerator extends BlockTagsProvider {
ActuallyBlocks.LASER_RELAY_FLUIDS.get(),
ActuallyBlocks.LASER_RELAY_ITEM.get(),
ActuallyBlocks.LASER_RELAY_ITEM_ADVANCED.get(),
ActuallyBlocks.GREENHOUSE_GLASS.get(),
ActuallyBlocks.ETHETIC_WHITE_WALL.get(),
ActuallyBlocks.ETHETIC_GREEN_WALL.get(),
ActuallyBlocks.BLACK_QUARTZ_WALL.get(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.get(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get(),
ActuallyBlocks.ETHETIC_WHITE_STAIRS.get(),
ActuallyBlocks.ETHETIC_GREEN_STAIRS.get(),
ActuallyBlocks.BLACK_QUARTZ_STAIR.get(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.get(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.get(),
ActuallyBlocks.ETHETIC_WHITE_SLAB.get(),
ActuallyBlocks.ETHETIC_GREEN_SLAB.get(),
ActuallyBlocks.BLACK_QUARTZ_SLAB.get(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.get(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.get()
ActuallyBlocks.GREENHOUSE_GLASS.get()
);
tag(BlockTags.NEEDS_STONE_TOOL).add(

31
src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java
View file

@ -9,7 +9,6 @@ import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.data.tags.ItemTagsProvider;
import net.minecraft.data.tags.TagsProvider;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.level.block.Block;
import net.neoforged.neoforge.common.Tags;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
@ -25,36 +24,6 @@ public class ItemTagsGenerator extends ItemTagsProvider {
@Override
protected void addTags(@Nonnull HolderLookup.Provider provider) {
tag(ItemTags.WALLS).add(
ActuallyBlocks.ETHETIC_WHITE_WALL.getItem(),
ActuallyBlocks.ETHETIC_GREEN_WALL.getItem(),
ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.getItem(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.getItem()
);
tag(ItemTags.STAIRS).add(
ActuallyBlocks.ETHETIC_WHITE_STAIRS.getItem(),
ActuallyBlocks.ETHETIC_GREEN_STAIRS.getItem(),
ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.getItem(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.getItem(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.getItem(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.getItem()
);
tag(ItemTags.SLABS).add(
ActuallyBlocks.ETHETIC_WHITE_SLAB.getItem(),
ActuallyBlocks.ETHETIC_GREEN_SLAB.getItem(),
ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(),
ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.getItem(),
ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.getItem(),
ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.getItem(),
ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.getItem()
);
tag(ActuallyTags.Items.COFFEE_BEANS)
.add(ActuallyItems.COFFEE_BEANS.get());
tag(ActuallyTags.Items.TINY_COALS)

10
src/main/java/de/ellpeck/actuallyadditions/data/compat/ClocheRecipes.java
View file

@ -9,11 +9,9 @@ import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Items;
import net.neoforged.neoforge.common.conditions.ModLoadedCondition;
public class ClocheRecipes {
public static void buildRecipes(RecipeOutput output) {
RecipeOutput loadedOutput = output.withConditions(new ModLoadedCondition("immersiveengineering"));
ClocheRecipeBuilder.builder()
.output(ActuallyItems.CANOLA, 2)
.output(ActuallyItems.CANOLA_SEEDS)
@ -21,7 +19,7 @@ public class ClocheRecipes {
.soil(ItemTags.DIRT)
.setTime(800)
.setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.CANOLA.get()))
.build(loadedOutput, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_canola"));
.build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_canola"));
ClocheRecipeBuilder.builder()
.output(Items.STRING, 2)
@ -30,7 +28,7 @@ public class ClocheRecipes {
.soil(ItemTags.DIRT)
.setTime(800)
.setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.FLAX.get()))
.build(loadedOutput, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_flax"));
.build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_flax"));
ClocheRecipeBuilder.builder()
.output(ActuallyItems.COFFEE_BEANS, 2)
@ -39,7 +37,7 @@ public class ClocheRecipes {
.soil(ItemTags.DIRT)
.setTime(800)
.setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.COFFEE.get()))
.build(loadedOutput, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_coffee"));
.build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_coffee"));
ClocheRecipeBuilder.builder()
.output(ActuallyItems.RICE, 2)
@ -48,6 +46,6 @@ public class ClocheRecipes {
.soil(ItemTags.DIRT)
.setTime(800)
.setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.RICE.get()))
.build(loadedOutput, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_rice"));
.build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_rice"));
}
}

8
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java
View file

@ -91,10 +91,10 @@ public final class ActuallyBlocks {
public static final BlockBehaviour.Properties miscBlockProperties = BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).requiresCorrectToolForDrops().strength(1.5f, 10f);
// Casings
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> WOOD_CASING = new AABlockReg<>("wood_casing", () -> new ActuallyBlock(miscBlockProperties.sound(SoundType.WOOD)), ActuallyBlock::createBlockItem);
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> IRON_CASING = new AABlockReg<>("iron_casing", () -> new ActuallyBlock(miscBlockProperties.sound(SoundType.METAL)), ActuallyBlock::createBlockItem);
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> ENDER_CASING = new AABlockReg<>("ender_casing", () -> new ActuallyBlock(miscBlockProperties.sound(SoundType.METAL)), ActuallyBlock::createBlockItem);
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> LAVA_FACTORY_CASING = new AABlockReg<>("lava_factory_casing", () -> new ActuallyBlock(miscBlockProperties.sound(SoundType.METAL)), ActuallyBlock::createBlockItem);
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> WOOD_CASING = new AABlockReg<>("wood_casing", () -> new ActuallyBlock(miscBlockProperties), ActuallyBlock::createBlockItem);
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> IRON_CASING = new AABlockReg<>("iron_casing", () -> new ActuallyBlock(miscBlockProperties), ActuallyBlock::createBlockItem);
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> ENDER_CASING = new AABlockReg<>("ender_casing", () -> new ActuallyBlock(miscBlockProperties), ActuallyBlock::createBlockItem);
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> LAVA_FACTORY_CASING = new AABlockReg<>("lava_factory_casing", () -> new ActuallyBlock(miscBlockProperties), ActuallyBlock::createBlockItem);
// Machines
public static final AABlockReg<BlockFeeder, AABlockItem, TileEntityFeeder> FEEDER = new AABlockReg<>("feeder", BlockFeeder::new, (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityFeeder::new);

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java
View file

@ -16,7 +16,6 @@ import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -28,7 +27,7 @@ import javax.annotation.Nullable;
public class BlockBioReactor extends DirectionalBlock.Container {
public BlockBioReactor() {
super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F).sound(SoundType.METAL));
super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F));
}
@Nullable

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java
View file

@ -20,7 +20,6 @@ import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -33,7 +32,7 @@ import javax.annotation.Nullable;
public class BlockCoalGenerator extends DirectionalBlock.Container {
public BlockCoalGenerator() {
super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks());
super(ActuallyBlocks.defaultPickProps().randomTicks());
}
@Nullable

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java
View file

@ -19,7 +19,6 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -32,7 +31,7 @@ import javax.annotation.Nullable;
public class BlockCoffeeMachine extends DirectionalBlock.Container {
public BlockCoffeeMachine() {
super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL));
super(ActuallyBlocks.defaultPickProps());
}
@Override

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java
View file

@ -24,7 +24,6 @@ import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -42,7 +41,7 @@ public class BlockCrusher extends BlockContainerBase {
private final boolean isDouble;
public BlockCrusher(boolean isDouble) {
super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks());
super(ActuallyBlocks.defaultPickProps().randomTicks());
this.isDouble = isDouble;
this.registerDefaultState(getStateDefinition().any().setValue(HORIZONTAL_FACING, Direction.NORTH).setValue(LIT, false));
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java
View file

@ -23,7 +23,6 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -37,7 +36,7 @@ import javax.annotation.Nullable;
public class BlockDisplayStand extends BlockContainerBase {
public BlockDisplayStand(boolean empowerer) {
super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL));
super(ActuallyBlocks.defaultPickProps());
isEmpowerer = empowerer;
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java
View file

@ -17,7 +17,6 @@ import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -30,7 +29,7 @@ public class BlockEnergizer extends BlockContainerBase {
private final boolean isEnergizer;
public BlockEnergizer(boolean isEnergizer) {
super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F).sound(SoundType.METAL));
super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F));
this.isEnergizer = isEnergizer;
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java
View file

@ -16,7 +16,6 @@ import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -28,7 +27,7 @@ import javax.annotation.Nullable;
public class BlockFarmer extends DirectionalBlock.Container {
public BlockFarmer() {
super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL));
super(ActuallyBlocks.defaultPickProps());
}
@Nullable

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java
View file

@ -20,7 +20,6 @@ import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -34,7 +33,7 @@ import javax.annotation.Nullable;
public class BlockLavaFactoryController extends DirectionalBlock.Container implements IHudDisplay {
public BlockLavaFactoryController() {
super(ActuallyBlocks.defaultPickProps(4.5F, 20.0F).sound(SoundType.METAL));
super(ActuallyBlocks.defaultPickProps(4.5F, 20.0F));
}
@Nullable

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java
View file

@ -22,7 +22,6 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -36,7 +35,7 @@ import javax.annotation.Nullable;
public class BlockOilGenerator extends DirectionalBlock.Container {
public BlockOilGenerator() {
super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks());
super(ActuallyBlocks.defaultPickProps().randomTicks());
}
@Nullable

3
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java
View file

@ -27,7 +27,6 @@ import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -43,7 +42,7 @@ import static net.minecraft.world.level.block.state.properties.BlockStatePropert
public class BlockPoweredFurnace extends DirectionalBlock.Container {
public BlockPoweredFurnace() {
super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks().lightLevel(state -> state.getValue(LIT)
super(ActuallyBlocks.defaultPickProps().randomTicks().lightLevel(state -> state.getValue(LIT)
? 12
: 0));