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

Merge remote-tracking branch 'origin/1.20.4' into 1.20.4

Browse source
This commit is contained in:
Flanks255 2024-03-05 17:03:03 -06:00
commit d704c4a4ba
4 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/generated/resources/.cache/27a06cb38e627c3bacb7787d001fbadd6becbe3f
View file

@ -1,6 +1,7 @@
// 1.20.4 2024-03-04T22:51:31.6064301 Block States: actuallyadditions
// 1.20.4 2024-03-05T23:27:48.3961458 Block States: actuallyadditions
23a6aa86c3f14e6a61fc8b17b65063f1995c8592 assets/actuallyadditions/blockstates/atomic_reconstructor.json
88f479927d1abdf16e24a0950ccffa86b5af8b3f assets/actuallyadditions/blockstates/battery_box.json
6ada5cb9e03ed162433bfc048712b6fc3937b420 assets/actuallyadditions/blockstates/bio_reactor.json
5c96fc287e63f5bdd31864bdab698ce34817fd9d assets/actuallyadditions/blockstates/black_quartz_block.json
f88640ab3aa81ae4a027948d94386c83dd488d3f assets/actuallyadditions/blockstates/black_quartz_brick_block.json
76275adac938c575565d4aeb21b9994a7f561f88 assets/actuallyadditions/blockstates/black_quartz_brick_slab.json

19
src/generated/resources/assets/actuallyadditions/blockstates/bio_reactor.json Normal file
View file

@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "actuallyadditions:block/bio_reactor",
"y": 90
},
"facing=north": {
"model": "actuallyadditions:block/bio_reactor"
},
"facing=south": {
"model": "actuallyadditions:block/bio_reactor",
"y": 180
},
"facing=west": {
"model": "actuallyadditions:block/bio_reactor",
"y": 270
}
}
}

2
src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java
View file

@ -38,7 +38,7 @@ public class BlockStateGenerator extends BlockStateProvider {
// Horizontal Directional Blocks
horizontallyDirectionalBlock(ActuallyBlocks.FARMER);
//horizontallyDirectionalBlock(ActuallyBlocks.BIOREACTOR);
horizontallyDirectionalBlock(ActuallyBlocks.BIOREACTOR);
horizontallyDirectionalBlock(ActuallyBlocks.VERTICAL_DIGGER);
horizontallyDirectionalBlock(ActuallyBlocks.LEAF_GENERATOR);
horizontallyDirectionalBlock(ActuallyBlocks.COFFEE_MACHINE);

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

@ -10,7 +10,7 @@
package de.ellpeck.actuallyadditions.mod.blocks;
import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
import de.ellpeck.actuallyadditions.mod.blocks.base.DirectionalBlock;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
@ -25,7 +25,7 @@ import net.minecraft.world.phys.BlockHitResult;
import javax.annotation.Nullable;
public class BlockBioReactor extends BlockContainerBase {
public class BlockBioReactor extends DirectionalBlock.Container {
public BlockBioReactor() {
super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F));