-
Notifications
You must be signed in to change notification settings - Fork 0
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 #217 from ManasMods/master_sword
Master sword
- Loading branch information
Showing
130 changed files
with
1,855 additions
and
346 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
2 changes: 2 additions & 0 deletions
2
src/generated/resources/.cache/d7b3aac43b2c3c8ddf2d88d57d32ba6e7a4e9167
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,2 @@ | ||
| // 1.19.2 2023-08-27T16:07:23.6958312 Tags for minecraft:worldgen/structure | ||
| 845b0fda38f04fb44f51691a9953acf48c2d42a7 data/unordinary_basics/tags/worldgen/structure/master_sword_shrine.json |
2 changes: 2 additions & 0 deletions
2
src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab
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,2 @@ | ||
| // 1.19.2 2023-08-27T16:04:30.9998563 Tags for minecraft:entity_type | ||
| 70011fc296dd8a255dbdd79d17501368c0d7bd16 data/forge/tags/entity_types/sculk_enemies.json |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/unordinary_basics/models/item/decayed_master_sword.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": "unordinary_basics:item/decayed_master_sword" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/unordinary_basics/models/item/master_sword.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": "unordinary_basics:item/master_sword" | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/unordinary_basics/models/item/master_sword_shrine.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,3 @@ | ||
| { | ||
| "parent": "unordinary_basics:block/master_sword_shrine" | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/forge/tags/entity_types/sculk_enemies.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,5 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:warden" | ||
| ] | ||
| } |
20 changes: 20 additions & 0 deletions
20
src/generated/resources/data/unordinary_basics/loot_tables/blocks/master_sword_shrine.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,20 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| } | ||
| ], | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "minecraft:air" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
...nerated/resources/data/unordinary_basics/tags/worldgen/structure/master_sword_shrine.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,5 @@ | ||
| { | ||
| "values": [ | ||
| "unordinary_basics:master_sword_shrine" | ||
| ] | ||
| } |
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
107 changes: 107 additions & 0 deletions
107
src/main/java/com/github/manasmods/unordinary_basics/block/MasterSwordShrine.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,107 @@ | ||
| package com.github.manasmods.unordinary_basics.block; | ||
|
|
||
| import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; | ||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.server.level.ServerPlayer; | ||
| import net.minecraft.world.InteractionHand; | ||
| import net.minecraft.world.InteractionResult; | ||
| import net.minecraft.world.entity.item.ItemEntity; | ||
| import net.minecraft.world.entity.player.Player; | ||
| import net.minecraft.world.item.ItemStack; | ||
| 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.Blocks; | ||
| import net.minecraft.world.level.block.Mirror; | ||
| import net.minecraft.world.level.block.Rotation; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.block.state.StateDefinition; | ||
| import net.minecraft.world.level.block.state.properties.BlockStateProperties; | ||
| import net.minecraft.world.level.block.state.properties.DirectionProperty; | ||
| import net.minecraft.world.phys.BlockHitResult; | ||
| import net.minecraft.world.phys.shapes.BooleanOp; | ||
| import net.minecraft.world.phys.shapes.CollisionContext; | ||
| import net.minecraft.world.phys.shapes.Shapes; | ||
| import net.minecraft.world.phys.shapes.VoxelShape; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class MasterSwordShrine extends Block { | ||
|
|
||
| public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; | ||
|
|
||
| public MasterSwordShrine(Properties properties) { | ||
| super(properties); | ||
| } | ||
|
|
||
| public VoxelShape makeShapeNS(){ | ||
| VoxelShape shape = Shapes.empty(); | ||
| shape = Shapes.join(shape, Shapes.create(0.25, 0.0625, 0.25, 0.75, 0.125, 0.75), BooleanOp.OR); | ||
| shape = Shapes.join(shape, Shapes.create(0.125, 0, 0.125, 0.875, 0.0625, 0.875), BooleanOp.OR); | ||
| shape = Shapes.join(shape, Shapes.create(0.1875, 0.125, 0.46875, 0.8125, 1.25, 0.53125), BooleanOp.OR); | ||
|
|
||
| return shape; | ||
| } | ||
|
|
||
| public VoxelShape makeShapeEW(){ | ||
| VoxelShape shape = Shapes.empty(); | ||
| shape = Shapes.join(shape, Shapes.create(0.25, 0.0625, 0.25, 0.75, 0.125, 0.75), BooleanOp.OR); | ||
| shape = Shapes.join(shape, Shapes.create(0.125, 0, 0.125, 0.875, 0.0625, 0.875), BooleanOp.OR); | ||
| shape = Shapes.join(shape, Shapes.create(0.46875, 0.125, 0.1875, 0.53125, 1.25, 0.8125), BooleanOp.OR); | ||
|
|
||
| return shape; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull VoxelShape getShape(BlockState pState, @NotNull BlockGetter pLevel, @NotNull BlockPos pPos, @NotNull CollisionContext pContext) { | ||
| switch (pState.getValue(FACING)) { | ||
| case EAST, WEST -> { | ||
| return makeShapeEW(); | ||
| } | ||
| case NORTH, SOUTH -> { | ||
| return makeShapeNS(); | ||
| } | ||
| } | ||
| return makeShapeNS(); | ||
| } | ||
| /* FACING */ | ||
| @Override | ||
| public BlockState getStateForPlacement(BlockPlaceContext pContext) { | ||
| return this.defaultBlockState().setValue(FACING, pContext.getHorizontalDirection().getOpposite()); | ||
| } | ||
|
|
||
| @Override | ||
| public BlockState rotate(BlockState pState, Rotation pRotation) { | ||
| return pState.setValue(FACING, pRotation.rotate(pState.getValue(FACING))); | ||
| } | ||
|
|
||
| @Override | ||
| public BlockState mirror(BlockState pState, Mirror pMirror) { | ||
| return pState.rotate(pMirror.getRotation(pState.getValue(FACING))); | ||
| } | ||
|
|
||
| @Override | ||
| protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) { | ||
| pBuilder.add(FACING); | ||
| } | ||
|
|
||
| @Override | ||
| public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand, BlockHitResult pHit) { | ||
| if (pPlayer instanceof ServerPlayer serverPlayer) { | ||
| if (serverPlayer.getAdvancements().getOrStartProgress(pLevel.getServer().getAdvancements().getAdvancement(new ResourceLocation("minecraft","end/kill_dragon"))).isDone()) { | ||
| ItemEntity itemEntity = new ItemEntity(pLevel,pPos.getX(),pPos.getY() + 3,pPos.getZ(),new ItemStack(Unordinary_BasicsItems.MASTER_SWORD)); | ||
| pLevel.addFreshEntity(itemEntity); | ||
| pLevel.setBlock(pPos, Blocks.AIR.defaultBlockState(),1); | ||
| System.out.println(); | ||
| return InteractionResult.SUCCESS; | ||
| } else { | ||
| pPlayer.displayClientMessage(Component.translatable("unordinary_basics.message.master_sword_deny"),true); | ||
| System.out.println("loser"); | ||
| } | ||
| } | ||
|
|
||
| return InteractionResult.FAIL; | ||
| } | ||
| } |
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
2 changes: 0 additions & 2 deletions
2
...a/com/github/manasmods/unordinary_basics/block/entity/Unordinary_BasicsBlockEntities.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
Oops, something went wrong.