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

Compare commits

base: Ellpeck:d8ad92c447f5c5a35ef195db8a541bf3923e8401
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:0e3a9612578a88af2d5703c8cf26918204f90f35
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. "d8ad92c447f5c5a35ef195db8a541bf3923e8401" and "0e3a9612578a88af2d5703c8cf26918204f90f35" have entirely different histories.
d8ad92c447 ... 0e3a961257

5 changed files with 9 additions and 9 deletions
Show stats Expand all files Collapse all files

6
src/generated/resources/.cache/3425a48f50a5cfd73d65d933e25ea9828512dab8
View file

@ -1,8 +1,8 @@
// 1.21.1 2024-10-17T18:39:09.6349717 Empowering Recipes // 1.21.1 2024-08-11T19:30:01.8188184 Empowering Recipes
cc9c78901a2ac70dc5efa029684edac7376c68e2 data/actuallyadditions/recipe/empowering/diamatine.json cc9c78901a2ac70dc5efa029684edac7376c68e2 data/actuallyadditions/recipe/empowering/diamatine.json
0ee7498f9720da718f2904bfb2826f48592629e7 data/actuallyadditions/recipe/empowering/diamatine_block.json 0ee7498f9720da718f2904bfb2826f48592629e7 data/actuallyadditions/recipe/empowering/diamatine_block.json
09c7ef6ae8c1690e9b0b3bf323951005335a172f data/actuallyadditions/recipe/empowering/emeradic.json 13ba258b2c645ab14d879cc923d452080e099932 data/actuallyadditions/recipe/empowering/emeradic.json
f79081a34b05b6e44b9b543b0e1710ef57f65314 data/actuallyadditions/recipe/empowering/emeradic_block.json 65fce5dc254d68e83c66a6b80ae37cb9acd71d3d data/actuallyadditions/recipe/empowering/emeradic_block.json
ada12731cdb55ceea84eaca71b71c3e484d4399d data/actuallyadditions/recipe/empowering/empowered_canola.json ada12731cdb55ceea84eaca71b71c3e484d4399d data/actuallyadditions/recipe/empowering/empowered_canola.json
439b7d2abae8901e62dc8e39d0a539fac5db01cf data/actuallyadditions/recipe/empowering/enori.json 439b7d2abae8901e62dc8e39d0a539fac5db01cf data/actuallyadditions/recipe/empowering/enori.json
f26b6d17245059f52fbdb3a2fb2f0d2cc94a416b data/actuallyadditions/recipe/empowering/enori_block.json f26b6d17245059f52fbdb3a2fb2f0d2cc94a416b data/actuallyadditions/recipe/empowering/enori_block.json

2
src/generated/resources/data/actuallyadditions/recipe/empowering/emeradic.json
View file

@ -10,7 +10,7 @@
"tag": "c:dyes/lime" "tag": "c:dyes/lime"
}, },
{ {
"item": "minecraft:short_grass" "item": "minecraft:tall_grass"
}, },
{ {
"tag": "minecraft:saplings" "tag": "minecraft:saplings"

2
src/generated/resources/data/actuallyadditions/recipe/empowering/emeradic_block.json
View file

@ -10,7 +10,7 @@
"tag": "c:dyes/lime" "tag": "c:dyes/lime"
}, },
{ {
"item": "minecraft:short_grass" "item": "minecraft:tall_grass"
}, },
{ {
"tag": "minecraft:saplings" "tag": "minecraft:saplings"

4
src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java
View file

@ -95,12 +95,12 @@ public class EmpoweringRecipeGenerator extends RecipeProvider {
EmpoweringBuilder.builder(ActuallyItems.EMPOWERED_EMERADIC_CRYSTAL.get(), ActuallyItems.EMERADIC_CRYSTAL.get(), 5000, 50, Crystals.EMERALD.conversionColorParticles) EmpoweringBuilder.builder(ActuallyItems.EMPOWERED_EMERADIC_CRYSTAL.get(), ActuallyItems.EMERADIC_CRYSTAL.get(), 5000, 50, Crystals.EMERALD.conversionColorParticles)
.addModifier(Tags.Items.DYES_LIME) .addModifier(Tags.Items.DYES_LIME)
.addModifier(Items.SHORT_GRASS) .addModifier(Items.TALL_GRASS)
.addModifier(ItemTags.SAPLINGS) .addModifier(ItemTags.SAPLINGS)
.addModifier(Tags.Items.SLIMEBALLS).save(recipeOutput, "emeradic"); .addModifier(Tags.Items.SLIMEBALLS).save(recipeOutput, "emeradic");
EmpoweringBuilder.builder(ActuallyBlocks.EMPOWERED_EMERADIC_CRYSTAL.get(), ActuallyBlocks.EMERADIC_CRYSTAL.get(), 50000, 500, Crystals.EMERALD.conversionColorParticles) EmpoweringBuilder.builder(ActuallyBlocks.EMPOWERED_EMERADIC_CRYSTAL.get(), ActuallyBlocks.EMERADIC_CRYSTAL.get(), 50000, 500, Crystals.EMERALD.conversionColorParticles)
.addModifier(Tags.Items.DYES_LIME) .addModifier(Tags.Items.DYES_LIME)
.addModifier(Items.SHORT_GRASS) .addModifier(Items.TALL_GRASS)
.addModifier(ItemTags.SAPLINGS) .addModifier(ItemTags.SAPLINGS)
.addModifier(Tags.Items.SLIMEBALLS).save(recipeOutput, "emeradic_block"); .addModifier(Tags.Items.SLIMEBALLS).save(recipeOutput, "emeradic_block");

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

@ -34,7 +34,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class BlockTinyTorch extends BlockBase { public class BlockTinyTorch extends BlockBase {
public static final DirectionProperty FACING = DirectionProperty.create("facing", direction -> direction != Direction.DOWN); public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.UP);
public BlockTinyTorch() { public BlockTinyTorch() {
super(Properties.of().pushReaction(PushReaction.DESTROY).sound(SoundType.WOOD).strength(0.0F, 0.8F)); super(Properties.of().pushReaction(PushReaction.DESTROY).sound(SoundType.WOOD).strength(0.0F, 0.8F));
@ -90,7 +90,7 @@ public class BlockTinyTorch extends BlockBase {
Direction facing = context.getClickedFace(); Direction facing = context.getClickedFace();
BlockPos pos = context.getClickedPos(); BlockPos pos = context.getClickedPos();
if (this.canSurvive(state, levelreader, pos)) { if (this.canSurvive(state, levelreader, pos)) {
return state.setValue(BlockTinyTorch.FACING, facing.getAxis() == Direction.Axis.Y ? Direction.UP : facing); return state.setValue(BlockTinyTorch.FACING, facing);
} else { } else {
Direction[] adirection = context.getNearestLookingDirections(); Direction[] adirection = context.getNearestLookingDirections();
for(Direction direction : adirection) { for(Direction direction : adirection) {