forked from GL33P-0R4NG3/oreganized
-
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #49 from Xaidee/feature/scribe
- Loading branch information
Showing
22 changed files
with
221 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/oreganized/models/item/scribe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/handheld", | ||
| "textures": { | ||
| "layer0": "oreganized:item/scribe" | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
src/generated/resources/data/oreganized/advancements/recipes/tools/scribe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_amethyst": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:amethyst_shard" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_silver": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "forge:ingots/silver" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "oreganized:scribe" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_silver", | ||
| "has_amethyst", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "oreganized:scribe" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/generated/resources/data/oreganized/recipes/scribe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "category": "equipment", | ||
| "key": { | ||
| "A": { | ||
| "item": "minecraft:amethyst_shard" | ||
| }, | ||
| "S": { | ||
| "tag": "forge:ingots/silver" | ||
| } | ||
| }, | ||
| "pattern": [ | ||
| "A", | ||
| "S", | ||
| "S" | ||
| ], | ||
| "result": { | ||
| "item": "oreganized:scribe" | ||
| }, | ||
| "show_notification": true | ||
| } |
8 changes: 8 additions & 0 deletions
8
src/generated/resources/data/oreganized/tags/blocks/mineable/scribe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "values": [ | ||
| "#forge:glass", | ||
| "#forge:obsidian", | ||
| "#minecraft:ice", | ||
| "#forge:storage_blocks/amethyst" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
src/main/java/galena/oreganized/content/item/BushHammerItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/main/java/galena/oreganized/content/item/ScribeItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package galena.oreganized.content.item; | ||
|
|
||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.world.entity.EquipmentSlot; | ||
| import net.minecraft.world.entity.LivingEntity; | ||
| import net.minecraft.world.item.Item; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.level.Level; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
|
|
||
| import static galena.oreganized.index.OTags.Blocks.MINEABLE_WITH_SCRIBE; | ||
|
|
||
| public class ScribeItem extends Item { | ||
|
|
||
| public ScribeItem(Properties properties) { | ||
| super(properties); | ||
| } | ||
|
|
||
| public boolean mineBlock(ItemStack stack, Level level, BlockState state, BlockPos pos, LivingEntity user) { | ||
| if (!level.isClientSide && state.getDestroySpeed(level, pos) != 0F) { | ||
| stack.hurtAndBreak(1, user, it -> { | ||
| it.broadcastBreakEvent(EquipmentSlot.MAINHAND); | ||
| }); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public float getDestroySpeed(ItemStack stack, BlockState state) { | ||
| return isCorrectToolForDrops(stack, state) ? 32F : 3F; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isCorrectToolForDrops(BlockState state) { | ||
| return state.is(MINEABLE_WITH_SCRIBE); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package galena.oreganized.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.sugar.Local; | ||
| import galena.oreganized.content.item.ScribeItem; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.enchantment.Enchantments; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.storage.loot.LootParams; | ||
| import net.minecraft.world.level.storage.loot.parameters.LootContextParams; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.ModifyVariable; | ||
|
|
||
| @Mixin(Block.class) | ||
| public class BlockMixin { | ||
|
|
||
| @ModifyVariable( | ||
| method = "getDrops(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/item/ItemStack;)Ljava/util/List;", | ||
| at = @At(value = "STORE") | ||
| ) | ||
| private static LootParams.Builder modifyLootBuilder(LootParams.Builder builder, @Local BlockState state, @Local ItemStack stack) { | ||
| if (stack.getItem() instanceof ScribeItem scribe && scribe.isCorrectToolForDrops(stack, state)) { | ||
| var virtual = stack.copy(); | ||
| virtual.enchant(Enchantments.SILK_TOUCH, 1); | ||
| return builder.withParameter(LootContextParams.TOOL, virtual); | ||
| } | ||
| return builder; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package galena.oreganized.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.sugar.Local; | ||
| import galena.oreganized.content.item.ScribeItem; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.enchantment.Enchantment; | ||
| import net.minecraft.world.item.enchantment.EnchantmentHelper; | ||
| import net.minecraft.world.item.enchantment.Enchantments; | ||
| import net.minecraft.world.level.block.IceBlock; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.storage.loot.parameters.LootContextParams; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
|
|
||
| @Mixin(IceBlock.class) | ||
| public class IceBlockMixin { | ||
|
|
||
| @Redirect( | ||
| method = "playerDestroy(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/item/ItemStack;)V", | ||
| at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/enchantment/EnchantmentHelper;getItemEnchantmentLevel(Lnet/minecraft/world/item/enchantment/Enchantment;Lnet/minecraft/world/item/ItemStack;)I") | ||
| ) | ||
| private int modifyLootBuilder(Enchantment enchantment, ItemStack stack, @Local BlockState state) { | ||
| if (stack.getItem() instanceof ScribeItem scribe && scribe.isCorrectToolForDrops(stack, state)) { | ||
| return 1; | ||
| } | ||
| return EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, stack); | ||
| } | ||
|
|
||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters