-
Notifications
You must be signed in to change notification settings - Fork 87
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 #232 from paulevsGitch/1.17
1.17.1
- Loading branch information
Showing
76 changed files
with
1,213 additions
and
34 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # From https://github.com/jitpack/jitpack.io/issues/4506#issuecomment-864562270 | ||
| before_install: | ||
| - source "$HOME/.sdkman/bin/sdkman-init.sh" | ||
| - sdk update | ||
| - sdk install java 16.0.1.hs-adpt | ||
| - sdk use java 16.0.1.hs-adpt |
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,24 @@ | ||
| package ru.betterend.blocks.basis; | ||
|
|
||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.api.Environment; | ||
| import net.minecraft.client.renderer.block.model.BlockModel; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import org.jetbrains.annotations.Nullable; | ||
| import ru.bclib.blocks.BaseBlock; | ||
|
|
||
| public class LitBaseBlock extends BaseBlock { | ||
| private static final String PATTERN = "{\"parent\":\"betterend:block/cube_noshade\",\"textures\":{\"texture\":\"betterend:block/name\"}}"; | ||
|
|
||
| public LitBaseBlock(Properties settings) { | ||
| super(settings); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| @Environment(EnvType.CLIENT) | ||
| public BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) { | ||
| return BlockModel.fromString(PATTERN.replace("name", resourceLocation.getPath())); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/main/java/ru/betterend/blocks/basis/LitPillarBlock.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,23 @@ | ||
| package ru.betterend.blocks.basis; | ||
|
|
||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.api.Environment; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import ru.bclib.blocks.BaseRotatedPillarBlock; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| public class LitPillarBlock extends BaseRotatedPillarBlock { | ||
| private static final String PATTERN = "{\"parent\":\"betterend:block/pillar_noshade\",\"textures\":{\"end\":\"betterend:block/name_top\",\"side\":\"betterend:block/name_side\"}}"; | ||
|
|
||
| public LitPillarBlock(Properties settings) { | ||
| super(settings); | ||
| } | ||
|
|
||
| @Override | ||
| @Environment(EnvType.CLIENT) | ||
| protected Optional<String> createBlockPattern(ResourceLocation blockId) { | ||
| String name = blockId.getPath(); | ||
| return Optional.of(PATTERN.replace("name", name)); | ||
| } | ||
| } |
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
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
7 changes: 0 additions & 7 deletions
7
src/main/resources/assets/betterend/blockstates/smaragdant_crystal.json
This file was deleted.
Oops, something went wrong.
44 changes: 44 additions & 0 deletions
44
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_bricks_stairs.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,44 @@ | ||
| { | ||
| "variants": { | ||
| "facing=east,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs" }, | ||
| "facing=west,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs", "y": 180 }, | ||
| "facing=south,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs", "y": 90 }, | ||
| "facing=north,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs", "y": 270 }, | ||
| "facing=east,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer" }, | ||
| "facing=west,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "y": 180 }, | ||
| "facing=south,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "y": 90 }, | ||
| "facing=north,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "y": 270 }, | ||
| "facing=east,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "y": 270 }, | ||
| "facing=west,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "y": 90 }, | ||
| "facing=south,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer" }, | ||
| "facing=north,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "y": 180 }, | ||
| "facing=east,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner" }, | ||
| "facing=west,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "y": 180 }, | ||
| "facing=south,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "y": 90 }, | ||
| "facing=north,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "y": 270 }, | ||
| "facing=east,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "y": 270 }, | ||
| "facing=west,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "y": 90 }, | ||
| "facing=south,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner" }, | ||
| "facing=north,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "y": 180 }, | ||
| "facing=east,half=top,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs", "x": 180 }, | ||
| "facing=west,half=top,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs", "x": 180, "y": 180 }, | ||
| "facing=south,half=top,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs", "x": 180, "y": 90 }, | ||
| "facing=north,half=top,shape=straight": { "model": "betterend:block/smaragdant_bricks_stairs", "x": 180, "y": 270 }, | ||
| "facing=east,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180, "y": 90 }, | ||
| "facing=west,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180, "y": 270 }, | ||
| "facing=south,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180, "y": 180 }, | ||
| "facing=north,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180 }, | ||
| "facing=east,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180 }, | ||
| "facing=west,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180, "y": 180 }, | ||
| "facing=south,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180, "y": 90 }, | ||
| "facing=north,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_bricks_stairs_outer", "x": 180, "y": 270 }, | ||
| "facing=east,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180, "y": 90 }, | ||
| "facing=west,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180, "y": 270 }, | ||
| "facing=south,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180, "y": 180 }, | ||
| "facing=north,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180 }, | ||
| "facing=east,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180 }, | ||
| "facing=west,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180, "y": 180 }, | ||
| "facing=south,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180, "y": 90 }, | ||
| "facing=north,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_bricks_stairs_inner", "x": 180, "y": 270 } | ||
| } | ||
| } |
90 changes: 90 additions & 0 deletions
90
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_bricks_wall.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,90 @@ | ||
| { | ||
| "multipart": [ | ||
| { | ||
| "when": { | ||
| "up": "true" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_post" | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "north": "low" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side", | ||
| "uvlock": true | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "east": "low" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side", | ||
| "y": 90, | ||
| "uvlock": true | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "south": "low" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side", | ||
| "y": 180, | ||
| "uvlock": true | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "west": "low" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side", | ||
| "y": 270, | ||
| "uvlock": true | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "north": "tall" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side_tall", | ||
| "uvlock": true | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "east": "tall" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side_tall", | ||
| "y": 90, | ||
| "uvlock": true | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "south": "tall" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side_tall", | ||
| "y": 180, | ||
| "uvlock": true | ||
| } | ||
| }, | ||
| { | ||
| "when": { | ||
| "west": "tall" | ||
| }, | ||
| "apply": { | ||
| "model": "betterend:block/smaragdant_crystal_bricks_wall_side_tall", | ||
| "y": 270, | ||
| "uvlock": true | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.