mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-23 07:38:34 +01:00
Compare commits
No commits in common. "9cfbb6173927efd15e8f317af085ff324e24877c" and "758001e2fd2fcd228d457f1dcee1104bbb79b4cd" have entirely different histories.
9cfbb61739
...
758001e2fd
4 changed files with 7 additions and 49 deletions
|
@ -1,4 +1,4 @@
|
||||||
// 1.21.1 2024-10-19T22:58:03.6472462 Recipes
|
// 1.21.1 2024-08-11T19:30:01.8298188 Recipes
|
||||||
b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json
|
b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json
|
||||||
b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json
|
b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json
|
||||||
660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json
|
660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json
|
||||||
|
@ -73,4 +73,3 @@ a5bbea36e4e66a6c1aed2b618b6b2782b334963c data/actuallyadditions/recipe/smooth_bl
|
||||||
f0a6cbd14eac4a35f31b17818a10c3052d848e32 data/actuallyadditions/recipe/tiny_torch.json
|
f0a6cbd14eac4a35f31b17818a10c3052d848e32 data/actuallyadditions/recipe/tiny_torch.json
|
||||||
417bba7527a62cea44fd900ce3882000ada36a2c data/actuallyadditions/recipe/vertical_digger.json
|
417bba7527a62cea44fd900ce3882000ada36a2c data/actuallyadditions/recipe/vertical_digger.json
|
||||||
207a2f79e0b0c94905c385aaa0dd843c26fcfa6d data/actuallyadditions/recipe/wood_casing.json
|
207a2f79e0b0c94905c385aaa0dd843c26fcfa6d data/actuallyadditions/recipe/wood_casing.json
|
||||||
c5dae80ac00ec9829c80d6e453adcb488e775005 data/actuallyadditions/recipe/xp_solidifier.json
|
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
{
|
|
||||||
"type": "minecraft:crafting_shaped",
|
|
||||||
"category": "misc",
|
|
||||||
"key": {
|
|
||||||
"A": {
|
|
||||||
"item": "actuallyadditions:advanced_coil"
|
|
||||||
},
|
|
||||||
"E": {
|
|
||||||
"item": "actuallyadditions:empowered_diamatine_crystal_block"
|
|
||||||
},
|
|
||||||
"S": {
|
|
||||||
"item": "actuallyadditions:solidified_experience"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pattern": [
|
|
||||||
"SSS",
|
|
||||||
"EAE",
|
|
||||||
"SSS"
|
|
||||||
],
|
|
||||||
"result": {
|
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:xp_solidifier"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -507,14 +507,6 @@ public class BlockRecipeGenerator extends RecipeProvider {
|
||||||
.define('A', ActuallyBlocks.BREAKER.get())
|
.define('A', ActuallyBlocks.BREAKER.get())
|
||||||
.define('V', ActuallyItems.VOID_CRYSTAL)
|
.define('V', ActuallyItems.VOID_CRYSTAL)
|
||||||
.save(recipeOutput);
|
.save(recipeOutput);
|
||||||
|
|
||||||
// Experience Solidifier
|
|
||||||
Recipe.shaped(ActuallyBlocks.XP_SOLIDIFIER.getItem())
|
|
||||||
.pattern("SSS", "EAE", "SSS")
|
|
||||||
.define('S', ActuallyItems.SOLIDIFIED_EXPERIENCE)
|
|
||||||
.define('E', ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL.getItem())
|
|
||||||
.define('A', ActuallyItems.ADVANCED_COIL)
|
|
||||||
.save(recipeOutput);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Recipe {
|
public static class Recipe {
|
||||||
|
|
|
@ -3,14 +3,10 @@ package de.ellpeck.actuallyadditions.mod.items;
|
||||||
import de.ellpeck.actuallyadditions.api.ActuallyTags;
|
import de.ellpeck.actuallyadditions.api.ActuallyTags;
|
||||||
import net.minecraft.core.component.DataComponents;
|
import net.minecraft.core.component.DataComponents;
|
||||||
import net.minecraft.world.InteractionResult;
|
import net.minecraft.world.InteractionResult;
|
||||||
import net.minecraft.world.entity.EquipmentSlotGroup;
|
|
||||||
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
|
|
||||||
import net.minecraft.world.entity.ai.attributes.Attributes;
|
|
||||||
import net.minecraft.world.item.DiggerItem;
|
import net.minecraft.world.item.DiggerItem;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.Items;
|
import net.minecraft.world.item.Items;
|
||||||
import net.minecraft.world.item.Tier;
|
import net.minecraft.world.item.Tier;
|
||||||
import net.minecraft.world.item.component.ItemAttributeModifiers;
|
|
||||||
import net.minecraft.world.item.context.UseOnContext;
|
import net.minecraft.world.item.context.UseOnContext;
|
||||||
import net.neoforged.neoforge.common.ItemAbilities;
|
import net.neoforged.neoforge.common.ItemAbilities;
|
||||||
import net.neoforged.neoforge.common.ItemAbility;
|
import net.neoforged.neoforge.common.ItemAbility;
|
||||||
|
@ -31,22 +27,17 @@ public class AllInOneTool extends DiggerItem {
|
||||||
);
|
);
|
||||||
|
|
||||||
public AllInOneTool(Tier tier) {
|
public AllInOneTool(Tier tier) {
|
||||||
super(tier,
|
super(
|
||||||
ActuallyTags.Blocks.MINEABLE_WITH_AIO,
|
/* 4.0f,
|
||||||
|
-2f,*/
|
||||||
|
tier,
|
||||||
|
ActuallyTags.Blocks.MINEABLE_WITH_AIO,
|
||||||
new Properties()
|
new Properties()
|
||||||
.durability(tier.getUses() * 4)
|
.durability(tier.getUses() * 4)
|
||||||
.component(DataComponents.TOOL, tier.createToolProperties(ActuallyTags.Blocks.MINEABLE_WITH_AIO))
|
.component(DataComponents.TOOL, tier.createToolProperties(ActuallyTags.Blocks.MINEABLE_WITH_AIO))
|
||||||
.attributes(createAttributes())
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ItemAttributeModifiers createAttributes() {
|
|
||||||
ItemAttributeModifiers.Builder builder = ItemAttributeModifiers.builder();
|
|
||||||
builder.add(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_ID,4.0f, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND);
|
|
||||||
builder.add(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_ID, -2.0f, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND);
|
|
||||||
return builder.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPerformAction(@Nonnull ItemStack stack, @Nonnull ItemAbility toolAction) {
|
public boolean canPerformAction(@Nonnull ItemStack stack, @Nonnull ItemAbility toolAction) {
|
||||||
if (ACTIONS.contains(toolAction))
|
if (ACTIONS.contains(toolAction))
|
||||||
|
|
Loading…
Reference in a new issue