MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #232 from paulevsGitch/1.17

Browse source 
1.17.1
This commit is contained in:
paulevsGitch 2021-07-09 23:00:17 +03:00 • committed by GitHub
commit 71148f4af5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 1213 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -13,5 +13,3 @@ Building:
* Run command line in folder: gradlew build
* Mod .jar will be in ./build/libs
Mappings:
* https://modmuss50.me/fabric.html?&version=1.16.4

2
gradle.properties
View file

@ -8,7 +8,7 @@ yarn_mappings= 6
loader_version= 0.11.6
# Mod Properties
mod_version = 0.10.1-pre
mod_version = 0.10.2-pre
maven_group = ru.betterend
archives_base_name = better-end

6
jitpack.yml Normal file
View file

@ -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

4
src/main/java/ru/betterend/blocks/NeonCactusBlock.java
View file

@ -2,9 +2,9 @@ package ru.betterend.blocks;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.world.level.block.Blocks;
import ru.bclib.blocks.BaseRotatedPillarBlock;
import ru.betterend.blocks.basis.LitPillarBlock;
public class NeonCactusBlock extends BaseRotatedPillarBlock {
public class NeonCactusBlock extends LitPillarBlock {
public NeonCactusBlock() {
super(FabricBlockSettings.copyOf(Blocks.CACTUS).luminance(15));
}

6
src/main/java/ru/betterend/blocks/SmaragdantCrystalBlock.java
View file

@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.Material;
import ru.bclib.blocks.BaseRotatedPillarBlock;
import ru.betterend.blocks.basis.LitPillarBlock;
public class SmaragdantCrystalBlock extends BaseRotatedPillarBlock {
public class SmaragdantCrystalBlock extends LitPillarBlock {
public SmaragdantCrystalBlock() {
super(FabricBlockSettings.of(Material.GLASS)
.breakByTool(FabricToolTags.PICKAXES)
@ -14,6 +14,6 @@ public class SmaragdantCrystalBlock extends BaseRotatedPillarBlock {
.hardness(1F)
.resistance(1F)
.noOcclusion()
.sound(SoundType.GLASS));
.sound(SoundType.AMETHYST));
}
}

2
src/main/java/ru/betterend/blocks/SmaragdantCrystalShardBlock.java
View file

@ -41,7 +41,7 @@ public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements IR
.materialColor(MaterialColor.COLOR_GREEN)
.breakByTool(FabricToolTags.PICKAXES)
.luminance(15)
.sound(SoundType.GLASS)
.sound(SoundType.AMETHYST_CLUSTER)
.requiresCorrectToolForDrops()
.noCollission());
}

24
src/main/java/ru/betterend/blocks/basis/LitBaseBlock.java Normal file
View file

@ -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
src/main/java/ru/betterend/blocks/basis/LitPillarBlock.java Normal file
View file

@ -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));
}
}

13
src/main/java/ru/betterend/blocks/basis/PedestalBlock.java
View file

@ -42,11 +42,9 @@ import ru.bclib.client.models.ModelsHelper;
import ru.betterend.blocks.EndBlockProperties;
import ru.betterend.blocks.EndBlockProperties.PedestalState;
import ru.betterend.blocks.InfusionPedestal;
import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity;
import ru.betterend.blocks.entities.InfusionPedestalEntity;
import ru.betterend.blocks.entities.PedestalBlockEntity;
import ru.betterend.client.models.Patterns;
import ru.betterend.registry.EndBlockEntities;
import ru.betterend.registry.EndBlocks;
import ru.betterend.rituals.InfusionRitual;
@ -55,6 +53,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.ToIntFunction;
@SuppressWarnings({"deprecation"})
public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
@ -95,11 +94,19 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
protected float height = 1.0F;
public PedestalBlock(Block parent) {
super(FabricBlockSettings.copyOf(parent).luminance(state -> state.getValue(HAS_LIGHT) ? 12 : 0));
super(FabricBlockSettings.copyOf(parent).luminance(getLuminance(parent.defaultBlockState())));
this.registerDefaultState(stateDefinition.any().setValue(STATE, PedestalState.DEFAULT).setValue(HAS_ITEM, false).setValue(HAS_LIGHT, false));
this.parent = parent;
}
private static ToIntFunction<BlockState> getLuminance(BlockState parent) {
final int light = parent.getLightEmission();
if (light > 0) {
return state -> light;
}
return state -> state.getValue(HAS_LIGHT) ? 12 : 0;
}
public float getHeight(BlockState state) {
if (state.getBlock() instanceof PedestalBlock && state.getValue(STATE) == PedestalState.PEDESTAL_TOP) {
return this.height - 0.2F;

12
src/main/java/ru/betterend/blocks/complex/CrystalSubblocksMaterial.java
View file

@ -4,8 +4,6 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.level.block.Block;
import ru.bclib.blocks.BaseBlock;
import ru.bclib.blocks.BaseRotatedPillarBlock;
import ru.bclib.blocks.BaseSlabBlock;
import ru.bclib.blocks.BaseStairsBlock;
import ru.bclib.blocks.BaseWallBlock;
@ -13,6 +11,8 @@ import ru.bclib.recipes.GridRecipe;
import ru.bclib.util.TagHelper;
import ru.betterend.BetterEnd;
import ru.betterend.blocks.EndPedestal;
import ru.betterend.blocks.basis.LitBaseBlock;
import ru.betterend.blocks.basis.LitPillarBlock;
import ru.betterend.config.Configs;
import ru.betterend.recipe.CraftingRecipes;
import ru.betterend.registry.EndBlocks;
@ -32,14 +32,14 @@ public class CrystalSubblocksMaterial {
public CrystalSubblocksMaterial(String name, Block source) {
FabricBlockSettings material = FabricBlockSettings.copyOf(source);
polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock(material));
tiles = EndBlocks.registerBlock(name + "_tiles", new BaseBlock(material));
pillar = EndBlocks.registerBlock(name + "_pillar", new BaseRotatedPillarBlock(material));
polished = EndBlocks.registerBlock(name + "_polished", new LitBaseBlock(material));
tiles = EndBlocks.registerBlock(name + "_tiles", new LitBaseBlock(material));
pillar = EndBlocks.registerBlock(name + "_pillar", new LitPillarBlock(material));
stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(source));
slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock(source));
wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock(source));
pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(source));
bricks = EndBlocks.registerBlock(name + "_bricks", new BaseBlock(material));
bricks = EndBlocks.registerBlock(name + "_bricks", new LitBaseBlock(material));
brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock(bricks));
brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock(bricks));
brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock(bricks));

3
src/main/java/ru/betterend/mixin/common/AnvilMenuMixin.java
View file

@ -87,8 +87,7 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc
world.levelEvent(1030, blockPos, 0);
}
});
//TODO: no more return, does this still work?
//info.setReturnValue(stack);
info.cancel();
}
}

3
src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java
View file

@ -81,8 +81,7 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
if (!player.isCreative()) {
if (!checkHammerDurability(craftingInventory, player)) return ItemStack.EMPTY;
ItemStack hammer = craftingInventory.getItem(1);
hammer.hurtAndBreak(this.damage, player, entity ->
entity.broadcastBreakEvent((InteractionHand) null));
hammer.hurtAndBreak(this.damage, player, entity -> entity.broadcastBreakEvent((InteractionHand) null));
}
return this.assemble(craftingInventory);
}

2
src/main/java/ru/betterend/registry/EndBlocks.java
View file

@ -394,9 +394,9 @@ public class EndBlocks extends BlocksRegistry {
public static final Block ENDER_BLOCK = registerBlock("ender_block", new EnderBlock());
public static final Block AURORA_CRYSTAL = registerBlock("aurora_crystal", new AuroraCrystalBlock());
public static final Block AMBER_BLOCK = registerBlock("amber_block", new AmberBlock());
public static final Block SMARAGDANT_CRYSTAL_SHARD = registerBlock("smaragdant_crystal_shard", new SmaragdantCrystalShardBlock());
public static final Block SMARAGDANT_CRYSTAL = registerBlock("smaragdant_crystal", new SmaragdantCrystalBlock());
public static final CrystalSubblocksMaterial SMARAGDANT_SUBBLOCKS = new CrystalSubblocksMaterial("smaragdant_crystal", SMARAGDANT_CRYSTAL);
public static final Block SMARAGDANT_CRYSTAL_SHARD = registerBlock("smaragdant_crystal_shard", new SmaragdantCrystalShardBlock());
public static final Block RESPAWN_OBELISK = registerBlock("respawn_obelisk", new RespawnObeliskBlock());

1
src/main/java/ru/betterend/registry/EndSounds.java
View file

@ -23,6 +23,7 @@ public class EndSounds {
public static final SoundEvent AMBIENT_UMBRELLA_JUNGLE = register("ambient", "umbrella_jungle");
public static final SoundEvent AMBIENT_GLOWING_GRASSLANDS = register("ambient", "glowing_grasslands");
public static final SoundEvent AMBIENT_CAVES = register("ambient", "caves");
public static final SoundEvent AMBIENT_AMBER_LAND = register("ambient", "amber_land");
// Entity
public static final SoundEvent ENTITY_DRAGONFLY = register("entity", "dragonfly");

1
src/main/java/ru/betterend/world/biome/land/AmberLandBiome.java
View file

@ -19,6 +19,7 @@ public class AmberLandBiome extends EndBiome {
.setPlantsColor(219, 115, 38)
.setWaterAndFogColor(145, 108, 72)
.setMusic(EndSounds.MUSIC_FOREST)
.setLoop(EndSounds.AMBIENT_AMBER_LAND)
.setParticles(EndParticles.AMBER_SPHERE, 0.001F)
.setSurface(EndBlocks.AMBER_MOSS)
.addFeature(EndFeatures.AMBER_ORE)

7
src/main/resources/assets/betterend/blockstates/smaragdant_crystal.json
View file

@ -1,7 +0,0 @@
{
"variants": {
"axis=x": { "model": "betterend:block/smaragdant_crystal", "x": 90, "y": 90 },
"axis=y": { "model": "betterend:block/smaragdant_crystal" },
"axis=z": { "model": "betterend:block/smaragdant_crystal", "x": 90 }
}
}

44
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_bricks_stairs.json Normal file
View file

@ -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
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_bricks_wall.json Normal file
View file

@ -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
}
}
]
}

22
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_pedestal.json Normal file
View file

@ -0,0 +1,22 @@
{
"variants": {
"state=default": {
"model": "betterend:block/smaragdant_pedestal_default"
},
"state=column": {
"model": "betterend:block/smaragdant_pedestal_column"
},
"state=column_top": {
"model": "betterend:block/smaragdant_pedestal_column_top"
},
"state=pedestal_top": {
"model": "betterend:block/smaragdant_pedestal_top"
},
"state=bottom": {
"model": "betterend:block/smaragdant_pedestal_bottom"
},
"state=pillar": {
"model": "betterend:block/smaragdant_pedestal_pillar"
}
}
}

15
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_slab.json Normal file
View file

@ -0,0 +1,15 @@
{
"variants": {
"type=bottom": {
"model": "betterend:block/smaragdant_slab"
},
"type=top": {
"model": "betterend:block/smaragdant_slab",
"x": 180,
"uvlock": true
},
"type=double": {
"model": "betterend:block/smaragdant_crystal"
}
}
}

44
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_stairs.json Normal file
View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_stairs" },
"facing=west,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_stairs", "y": 180 },
"facing=south,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_stairs", "y": 90 },
"facing=north,half=bottom,shape=straight": { "model": "betterend:block/smaragdant_stairs", "y": 270 },
"facing=east,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer" },
"facing=west,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer", "y": 180 },
"facing=south,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer", "y": 90 },
"facing=north,half=bottom,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer", "y": 270 },
"facing=east,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer", "y": 270 },
"facing=west,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer", "y": 90 },
"facing=south,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer" },
"facing=north,half=bottom,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer", "y": 180 },
"facing=east,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner" },
"facing=west,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner", "y": 180 },
"facing=south,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner", "y": 90 },
"facing=north,half=bottom,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner", "y": 270 },
"facing=east,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner", "y": 270 },
"facing=west,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner", "y": 90 },
"facing=south,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner" },
"facing=north,half=bottom,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner", "y": 180 },
"facing=east,half=top,shape=straight": { "model": "betterend:block/smaragdant_stairs", "x": 180 },
"facing=west,half=top,shape=straight": { "model": "betterend:block/smaragdant_stairs", "x": 180, "y": 180 },
"facing=south,half=top,shape=straight": { "model": "betterend:block/smaragdant_stairs", "x": 180, "y": 90 },
"facing=north,half=top,shape=straight": { "model": "betterend:block/smaragdant_stairs", "x": 180, "y": 270 },
"facing=east,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180, "y": 90 },
"facing=west,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180, "y": 270 },
"facing=south,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180, "y": 180 },
"facing=north,half=top,shape=outer_right": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180 },
"facing=east,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180 },
"facing=west,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180, "y": 180 },
"facing=south,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180, "y": 90 },
"facing=north,half=top,shape=outer_left": { "model": "betterend:block/smaragdant_stairs_outer", "x": 180, "y": 270 },
"facing=east,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180, "y": 90 },
"facing=west,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180, "y": 270 },
"facing=south,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180, "y": 180 },
"facing=north,half=top,shape=inner_right": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180 },
"facing=east,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180 },
"facing=west,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180, "y": 180 },
"facing=south,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180, "y": 90 },
"facing=north,half=top,shape=inner_left": { "model": "betterend:block/smaragdant_stairs_inner", "x": 180, "y": 270 }
}
}

90
src/main/resources/assets/betterend/blockstates/smaragdant_crystal_wall.json Normal file
View file

@ -0,0 +1,90 @@
{
"multipart": [
{
"when": {
"up": "true"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_post"
}
},
{
"when": {
"north": "low"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side",
"uvlock": true
}
},
{
"when": {
"east": "low"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side",
"y": 90,
"uvlock": true
}
},
{
"when": {
"south": "low"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side",
"y": 180,
"uvlock": true
}
},
{
"when": {
"west": "low"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side",
"y": 270,
"uvlock": true
}
},
{
"when": {
"north": "tall"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side_tall",
"uvlock": true
}
},
{
"when": {
"east": "tall"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side_tall",
"y": 90,
"uvlock": true
}
},
{
"when": {
"south": "tall"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side_tall",
"y": 180,
"uvlock": true
}
},
{
"when": {
"west": "tall"
},
"apply": {
"model": "betterend:block/smaragdant_crystal_wall_side_tall",
"y": 270,
"uvlock": true
}
}
]
}

3
src/main/resources/assets/betterend/materialmaps/block/smaragdant_crystal_shard.json Normal file
View file

@ -0,0 +1,3 @@
{
"defaultMaterial": "betterend:glow_all"
}

47
src/main/resources/assets/betterend/models/block/lit_pedestal_bottom.json Normal file
View file

@ -0,0 +1,47 @@
{
"parent": "minecraft:block/block",
"textures": {
"particle": "#base"
},
"elements": [
{
"__comment": "basin_1",
"from": [ 0, 0, 0 ],
"to": [ 16, 3, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
"north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }
}
},
{
"__comment": "basin_2",
"from": [ 2, 3, 2 ],
"to": [ 14, 4, 14 ],
"shade": false,
"faces": {
"up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" },
"north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }
}
},
{
"__comment": "pillar",
"from": [ 3, 4, 3 ],
"to": [ 13, 16, 13 ],
"shade": false,
"faces": {
"north": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" },
"south": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" },
"west": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" },
"east": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }
}
}
]
}

74
src/main/resources/assets/betterend/models/block/lit_pedestal_column.json Normal file
View file

@ -0,0 +1,74 @@
{
"parent": "minecraft:block/block",
"textures": {
"particle": "#base"
},
"elements": [
{
"__comment": "basin_1",
"from": [ 0, 0, 0 ],
"to": [ 16, 3, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
"north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }
}
},
{
"__comment": "basin_2",
"from": [ 2, 3, 2 ],
"to": [ 14, 4, 14 ],
"shade": false,
"faces": {
"up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" },
"north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }
}
},
{
"__comment": "pillar",
"from": [ 3, 4, 3 ],
"to": [ 13, 13, 13 ],
"shade": false,
"faces": {
"north": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" },
"south": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" },
"west": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" },
"east": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" }
}
},
{
"__comment": "top",
"from": [ 2, 13, 2 ],
"to": [ 14, 14, 14 ],
"shade": false,
"faces": {
"down": { "uv": [ 2, 2, 14, 14 ], "texture": "#base" },
"north": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" },
"south": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" },
"west": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" },
"east": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }
}
},
{
"__comment": "top",
"from": [ 1, 14, 1 ],
"to": [ 15, 16, 15 ],
"shade": false,
"faces": {
"down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" },
"up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" },
"north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" },
"south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" },
"west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" },
"east": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }
}
}
]
}

47
src/main/resources/assets/betterend/models/block/lit_pedestal_column_top.json Normal file
View file

@ -0,0 +1,47 @@
{
"parent": "minecraft:block/block",
"textures": {
"particle": "#base"
},
"elements": [
{
"__comment": "pillar",
"from": [ 3, 0, 3 ],
"to": [ 13, 13, 13 ],
"shade": false,
"faces": {
"north": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" },
"south": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" },
"west": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" },
"east": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" }
}
},
{
"__comment": "top",
"from": [ 2, 13, 2 ],
"to": [ 14, 14, 14 ],
"shade": false,
"faces": {
"down": { "uv": [ 2, 2, 14, 14 ], "texture": "#base" },
"north": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" },
"south": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" },
"west": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" },
"east": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }
}
},
{
"__comment": "top",
"from": [ 1, 14, 1 ],
"to": [ 15, 16, 15 ],
"shade": false,
"faces": {
"down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" },
"up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" },
"north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" },
"south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" },
"west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" },
"east": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }
}
}
]
}

61
src/main/resources/assets/betterend/models/block/lit_pedestal_default.json Normal file
View file

@ -0,0 +1,61 @@
{
"parent": "minecraft:block/block",
"textures": {
"particle": "#base"
},
"elements": [
{
"__comment": "basin_1",
"from": [ 0, 0, 0 ],
"to": [ 16, 3, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
"north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" },
"east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }
}
},
{
"__comment": "basin_2",
"from": [ 2, 3, 2 ],
"to": [ 14, 4, 14 ],
"shade": false,
"faces": {
"up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" },
"north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" },
"east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }
}
},
{
"__comment": "pillar",
"from": [ 3, 4, 3 ],
"to": [ 13, 12, 13 ],
"shade": false,
"faces": {
"north": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" },
"south": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" },
"west": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" },
"east": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }
}
},
{
"__comment": "top",
"from": [ 1, 12, 1 ],
"to": [ 15, 14, 15 ],
"shade": false,
"faces": {
"down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" },
"up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" },
"north": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" },
"south": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" },
"west": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" },
"east": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }
}
}
]
}

20
src/main/resources/assets/betterend/models/block/lit_pedestal_pillar.json Normal file
View file

@ -0,0 +1,20 @@
{
"parent": "minecraft:block/block",
"textures": {
"particle": "#pillar"
},
"elements": [
{
"__comment": "pillar",
"from": [ 3, 0, 3 ],
"to": [ 13, 16, 13 ],
"shade": false,
"faces": {
"north": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" },
"south": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" },
"west": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" },
"east": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }
}
}
]
}

34
src/main/resources/assets/betterend/models/block/lit_pedestal_top.json Normal file
View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:block/block",
"textures": {
"particle": "#base"
},
"elements": [
{
"__comment": "pillar",
"from": [ 3, 0, 3 ],
"to": [ 13, 8, 13 ],
"shade": false,
"faces": {
"north": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" },
"south": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" },
"west": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" },
"east": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }
}
},
{
"__comment": "top",
"from": [ 1, 8, 1 ],
"to": [ 15, 10, 15 ],
"shade": false,
"faces": {
"down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" },
"up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" },
"north": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" },
"south": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" },
"west": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" },
"east": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }
}
}
]
}

50
src/main/resources/assets/betterend/models/block/lit_stairs.json Normal file
View file

@ -0,0 +1,50 @@
{
"parent": "block/block",
"textures": {
"particle": "#side"
},
"display": {
"gui": {
"rotation": [ 30, 135, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.625, 0.625, 0.625 ]
},
"head": {
"rotation": [ 0, -90, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 1, 1, 1 ]
},
"thirdperson_lefthand": {
"rotation": [ 75, -135, 0 ],
"translation": [ 0, 2.5, 0],
"scale": [ 0.375, 0.375, 0.375 ]
}
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 8, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"north": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 8, 8, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"up": { "uv": [ 8, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 8 ], "texture": "#side" },
"east": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "east" }
}
}
]
}

44
src/main/resources/assets/betterend/models/block/lit_stairs_inner.json Normal file
View file

@ -0,0 +1,44 @@
{
"parent": "block/block",
"textures": {
"particle": "#side"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 8, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"north": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 8, 8, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"up": { "uv": [ 8, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 8 ], "texture": "#side" },
"east": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 0, 8, 8 ],
"to": [ 8, 16, 16 ],
"shade": false,
"faces": {
"up": { "uv": [ 0, 8, 8, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 8, 0, 16, 8 ], "texture": "#side" },
"south": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "west" }
}
}
]
}

33
src/main/resources/assets/betterend/models/block/lit_stairs_outer.json Normal file
View file

@ -0,0 +1,33 @@
{
"parent": "block/block",
"textures": {
"particle": "#side"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 8, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"north": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 8, 8, 8 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"up": { "uv": [ 8, 8, 16, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 0, 0, 8, 8 ], "texture": "#side" },
"south": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 8, 0, 16, 8 ], "texture": "#side" },
"east": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "east" }
}
}
]
}

21
src/main/resources/assets/betterend/models/block/lit_wall_post.json Normal file
View file

@ -0,0 +1,21 @@
{
"parent": "block/block",
"textures": {
"particle": "#wall"
},
"elements": [
{ "from": [ 4, 0, 4 ],
"to": [ 12, 16, 12 ],
"shade": false,
"faces": {
"down": { "texture": "#wall", "cullface": "down" },
"up": { "texture": "#wall", "cullface": "up" },
"north": { "texture": "#wall" },
"south": { "texture": "#wall" },
"west": { "texture": "#wall" },
"east": { "texture": "#wall" }
},
"__comment": "Center post"
}
]
}

20
src/main/resources/assets/betterend/models/block/lit_wall_side.json Normal file
View file

@ -0,0 +1,20 @@
{
"parent": "block/block",
"textures": {
"particle": "#wall"
},
"elements": [
{ "from": [ 5, 0, 0 ],
"to": [ 11, 14, 8 ],
"shade": false,
"faces": {
"down": { "texture": "#wall", "cullface": "down" },
"up": { "texture": "#wall" },
"north": { "texture": "#wall", "cullface": "north" },
"west": { "texture": "#wall" },
"east": { "texture": "#wall" }
},
"__comment": "wall"
}
]
}

19
src/main/resources/assets/betterend/models/block/lit_wall_side_tall.json Normal file
View file

@ -0,0 +1,19 @@
{
"parent": "block/block",
"textures": {
"particle": "#wall"
},
"elements": [
{ "from": [ 5, 0, 0 ],
"to": [ 11, 16, 8 ],
"shade": false,
"faces": {
"down": { "texture": "#wall", "cullface": "down" },
"up": { "texture": "#wall", "cullface": "up"},
"north": { "texture": "#wall", "cullface": "north" },
"west": { "texture": "#wall" },
"east": { "texture": "#wall" }
}
}
]
}

2
src/main/resources/assets/betterend/models/block/neon_cactus_slab.json
View file

@ -1,5 +1,5 @@
{
"parent": "block/slab",
"parent": "betterend:block/slab_noshade",
"textures": {
"bottom": "betterend:block/neon_cactus_block_top",
"top": "betterend:block/neon_cactus_block_top",

2
src/main/resources/assets/betterend/models/block/neon_cactus_stairs.json
View file

@ -1,5 +1,5 @@
{
"parent": "minecraft:block/stairs",
"parent": "betterend:block/lit_stairs",
"textures": {
"bottom": "betterend:block/neon_cactus_block_top",
"top": "betterend:block/neon_cactus_block_top",

2
src/main/resources/assets/betterend/models/block/neon_cactus_stairs_inner.json
View file

@ -1,5 +1,5 @@
{
"parent": "minecraft:block/inner_stairs",
"parent": "betterend:block/lit_stairs_inner",
"textures": {
"bottom": "betterend:block/neon_cactus_block_top",
"top": "betterend:block/neon_cactus_block_top",

2
src/main/resources/assets/betterend/models/block/neon_cactus_stairs_outer.json
View file

@ -1,5 +1,5 @@
{
"parent": "minecraft:block/outer_stairs",
"parent": "betterend:block/lit_stairs_outer",
"textures": {
"bottom": "betterend:block/neon_cactus_block_top",
"top": "betterend:block/neon_cactus_block_top",

21
src/main/resources/assets/betterend/models/block/pillar_noshade.json Normal file
View file

@ -0,0 +1,21 @@
{
"parent": "block/block",
"textures": {
"particle": "#side"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "up" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
}
}
]
}

20
src/main/resources/assets/betterend/models/block/slab_noshade.json Normal file
View file

@ -0,0 +1,20 @@
{
"parent": "block/block",
"textures": {
"particle": "#side"
},
"elements": [
{ "from": [ 0, 0, 0 ],
"to": [ 16, 8, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"north": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" }
}
}
]
}

8
src/main/resources/assets/betterend/models/block/smaragdant_bricks_stairs.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_stairs",
"textures": {
"bottom": "betterend:block/smaragdant_crystal_bricks",
"top": "betterend:block/smaragdant_crystal_bricks",
"side": "betterend:block/smaragdant_crystal_bricks"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_bricks_stairs_inner.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_stairs_inner",
"textures": {
"bottom": "betterend:block/smaragdant_crystal_bricks",
"top": "betterend:block/smaragdant_crystal_bricks",
"side": "betterend:block/smaragdant_crystal_bricks"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_bricks_stairs_outer.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_stairs_outer",
"textures": {
"bottom": "betterend:block/smaragdant_crystal_bricks",
"top": "betterend:block/smaragdant_crystal_bricks",
"side": "betterend:block/smaragdant_crystal_bricks"
}
}

6
src/main/resources/assets/betterend/models/block/smaragdant_crystal_bricks_wall_post.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/lit_wall_post",
"textures": {
"wall": "betterend:block/smaragdant_crystal_bricks"
}
}

6
src/main/resources/assets/betterend/models/block/smaragdant_crystal_bricks_wall_side.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/lit_wall_side",
"textures": {
"wall": "betterend:block/smaragdant_crystal_bricks"
}
}

6
src/main/resources/assets/betterend/models/block/smaragdant_crystal_bricks_wall_side_tall.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/lit_wall_side_tall",
"textures": {
"wall": "betterend:block/smaragdant_crystal_bricks"
}
}

23
src/main/resources/assets/betterend/models/block/smaragdant_crystal_wall_post.json Normal file
View file

@ -0,0 +1,23 @@
{
"parent": "block/block",
"textures": {
"side": "betterend:block/smaragdant_crystal_side",
"top": "betterend:block/smaragdant_crystal_top",
"particle": "#side"
},
"elements": [
{
"from": [ 4, -0.01, 4 ],
"to": [ 12, 16, 12 ],
"shade": false,
"faces": {
"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "down" },
"up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
"south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
"west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
"east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }
}
}
]
}

21
src/main/resources/assets/betterend/models/block/smaragdant_crystal_wall_side.json Normal file
View file

@ -0,0 +1,21 @@
{
"textures": {
"wall": "betterend:block/smaragdant_crystal_side",
"top": "betterend:block/smaragdant_crystal_top",
"particle": "#wall"
},
"elements": [
{
"from": [ 5, 0, 0 ],
"to": [ 11, 14, 8 ],
"shade": false,
"faces": {
"down": { "texture": "#top", "cullface": "down" },
"up": { "texture": "#top" },
"north": { "texture": "#wall", "cullface": "north" },
"west": { "texture": "#wall" },
"east": { "texture": "#wall" }
}
}
]
}

21
src/main/resources/assets/betterend/models/block/smaragdant_crystal_wall_side_tall.json Normal file
View file

@ -0,0 +1,21 @@
{
"textures": {
"wall": "betterend:block/smaragdant_crystal_side",
"top": "betterend:block/smaragdant_crystal_top",
"particle": "#wall"
},
"elements": [
{
"from": [ 5, 0, 0 ],
"to": [ 11, 16, 8 ],
"shade": false,
"faces": {
"down": { "texture": "#top", "cullface": "down" },
"up": { "texture": "#top", "cullface": "up"},
"north": { "texture": "#wall", "cullface": "north" },
"west": { "texture": "#wall" },
"east": { "texture": "#wall" }
}
}
]
}

8
src/main/resources/assets/betterend/models/block/smaragdant_pedestal_bottom.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_pedestal_bottom",
"textures": {
"base": "betterend:block/smaragdant_crystal_side",
"pillar": "betterend:block/smaragdant_crystal_pillar_side",
"bottom": "betterend:block/smaragdant_crystal_polished"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_pedestal_column.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_pedestal_column",
"textures": {
"base": "betterend:block/smaragdant_crystal_side",
"pillar": "betterend:block/smaragdant_crystal_pillar_side",
"bottom": "betterend:block/smaragdant_crystal_polished"
}
}

7
src/main/resources/assets/betterend/models/block/smaragdant_pedestal_column_top.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "betterend:block/lit_pedestal_column_top",
"textures": {
"base": "betterend:block/smaragdant_crystal_side",
"pillar": "betterend:block/smaragdant_crystal_pillar_side"
}
}

9
src/main/resources/assets/betterend/models/block/smaragdant_pedestal_default.json Normal file
View file

@ -0,0 +1,9 @@
{
"parent": "betterend:block/lit_pedestal_default",
"textures": {
"top": "betterend:block/smaragdant_crystal_polished",
"base": "betterend:block/smaragdant_crystal_side",
"pillar": "betterend:block/smaragdant_crystal_pillar_side",
"bottom": "betterend:block/smaragdant_crystal_polished"
}
}

6
src/main/resources/assets/betterend/models/block/smaragdant_pedestal_pillar.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/lit_pedestal_pillar",
"textures": {
"pillar": "betterend:block/smaragdant_crystal_pillar_side"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_pedestal_top.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_pedestal_top",
"textures": {
"top": "betterend:block/smaragdant_crystal_polished",
"base": "betterend:block/smaragdant_crystal_side",
"pillar": "betterend:block/smaragdant_crystal_pillar_side"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_slab.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/slab_noshade",
"textures": {
"bottom": "betterend:block/smaragdant_crystal_top",
"top": "betterend:block/smaragdant_crystal_top",
"side": "betterend:block/smaragdant_crystal_side"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_stairs.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_stairs",
"textures": {
"bottom": "betterend:block/smaragdant_crystal_top",
"top": "betterend:block/smaragdant_crystal_top",
"side": "betterend:block/smaragdant_crystal_side"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_stairs_inner.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_stairs_inner",
"textures": {
"bottom": "betterend:block/smaragdant_crystal_top",
"top": "betterend:block/smaragdant_crystal_top",
"side": "betterend:block/smaragdant_crystal_side"
}
}

8
src/main/resources/assets/betterend/models/block/smaragdant_stairs_outer.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/lit_stairs_outer",
"textures": {
"bottom": "betterend:block/smaragdant_crystal_top",
"top": "betterend:block/smaragdant_crystal_top",
"side": "betterend:block/smaragdant_crystal_side"
}
}

3
src/main/resources/assets/betterend/models/item/smaragdant_crystal_bricks_stairs.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/smaragdant_bricks_stairs"
}

6
src/main/resources/assets/betterend/models/item/smaragdant_crystal_bricks_wall.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_inventory",
"textures": {
"wall": "betterend:block/smaragdant_crystal_bricks"
}
}

3
src/main/resources/assets/betterend/models/item/smaragdant_crystal_pedestal.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/smaragdant_pedestal_default"
}

3
src/main/resources/assets/betterend/models/item/smaragdant_crystal_slab.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/smaragdant_slab"
}

3
src/main/resources/assets/betterend/models/item/smaragdant_crystal_stairs.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/smaragdant_stairs"
}

6
src/main/resources/assets/betterend/models/item/smaragdant_crystal_wall.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_inventory",
"textures": {
"wall": "betterend:block/smaragdant_crystal_side"
}
}

9
src/main/resources/assets/betterend/sounds.json
View file

@ -219,6 +219,15 @@
}
]
},
"betterend.ambient.amber_land": {
"category": "ambient",
"sounds": [
{
"name": "betterend:ambient/amber_land",
"stream": true
}
]
},
"betterend.entity.dragonfly": {
"category": "entity",

BIN
src/main/resources/assets/betterend/sounds/ambient/amber_land.ogg Normal file
View file

Binary file not shown.

BIN
src/main/resources/assets/betterend/textures/block/smaragdant_crystal.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 217 B

BIN
src/main/resources/assets/betterend/textures/block/smaragdant_crystal_bricks.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 249 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/smaragdant_crystal_pillar_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 255 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/smaragdant_crystal_pillar_top.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 269 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/smaragdant_crystal_polished.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 252 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/smaragdant_crystal_shard.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 229 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/smaragdant_crystal_tiles.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 233 B

Before After
Before After

91
src/main/resources/assets/colored_lights/light_colors.json Normal file
View file

@ -0,0 +1,91 @@
{
"replace": false,
"colors": {
"betterend:smaragdant_crystal": "#17cfbd",
"betterend:smaragdant_crystal_shard": "#17cfbd",
"betterend:smaragdant_crystal_shard": "#17cfbd",
"betterend:smaragdant_crystal_bricks": "#17cfbd",
"betterend:smaragdant_crystal_bricks_slab": "#17cfbd",
"betterend:smaragdant_crystal_bricks_stairs": "#17cfbd",
"betterend:smaragdant_crystal_bricks_wall": "#17cfbd",
"betterend:smaragdant_crystal_pedestal": "#17cfbd",
"betterend:smaragdant_crystal_pillar": "#17cfbd",
"betterend:smaragdant_crystal_polished": "#17cfbd",
"betterend:smaragdant_crystal_slab": "#17cfbd",
"betterend:smaragdant_crystal_stairs": "#17cfbd",
"betterend:smaragdant_crystal_tiles": "#17cfbd",
"betterend:smaragdant_crystal_wall": "#17cfbd",
"betterend:aurora_crystal": "#f74da1",
"betterend:mossy_glowshroom_fur": "#8be6ff",
"betterend:mossy_glowshroom_hymenophore": "#8be6ff",
"betterend:umbrella_tree_cluster": "#c054f9",
"betterend:umbrella_tree_cluster": "#c054f9",
"betterend:umbrella_moss": "#ff943e",
"betterend:umbrella_moss_tall": "#ff943e",
"betterend:creeping_moss": "#0de4fc",
"betterend:twisted_umbrella_moss": "#e045d0",
"betterend:twisted_umbrella_moss_tall": "#e045d0",
"betterend:glowing_pillar_luminophor": "#ffd96c",
"betterend:glowing_pillar_leaves": "#ffd96c",
"betterend:bulb_moss": "#ffd96c",
"betterend:blue_vine_lantern": "#a6effb",
"betterend:blue_vine_fur": "#a6effb",
"betterend:purple_polypore": "#c53aec",
"betterend:aurant_polypore": "#a2d9ff",
"betterend:end_lily": "#c27dff",
"betterend:dense_vine": "#f47ffc",
"betterend:pond_anemone": "#f1f0da",
"betterend:amaranita_lantern": "#baecd9",
"betterend:amaranita_fur": "#baecd9",
"betterend:neon_cactus": "#86f0e7",
"betterend:neon_cactus_block": "#86f0e7",
"betterend:neon_cactus_stairs": "#86f0e7",
"betterend:neon_cactus_slab": "#86f0e7",
"betterend:iron_bulb_lantern_orange": "#ff963c",
"betterend:iron_bulb_lantern_magenta": "#d25aff",
"betterend:iron_bulb_lantern_light_blue": "#78b5ff",
"betterend:iron_bulb_lantern_yellow": "#ffff39",
"betterend:iron_bulb_lantern_lime": "#9fff1f",
"betterend:iron_bulb_lantern_pink": "#ff86ae",
"betterend:iron_bulb_lantern_cyan": "#7fd4ff",
"betterend:iron_bulb_lantern_purple": "#b65aff",
"betterend:iron_bulb_lantern_blue": "#496dff",
"betterend:iron_bulb_lantern_brown": "#ffbe80",
"betterend:iron_bulb_lantern_green": "#cdff66",
"betterend:iron_bulb_lantern_red": "#ff5555",
"betterend:thallasium_bulb_lantern_orange": "#ff963c",
"betterend:thallasium_bulb_lantern_magenta": "#d25aff",
"betterend:thallasium_bulb_lantern_light_blue": "#78b5ff",
"betterend:thallasium_bulb_lantern_yellow": "#ffff39",
"betterend:thallasium_bulb_lantern_lime": "#9fff1f",
"betterend:thallasium_bulb_lantern_pink": "#ff86ae",
"betterend:thallasium_bulb_lantern_cyan": "#7fd4ff",
"betterend:thallasium_bulb_lantern_purple": "#b65aff",
"betterend:thallasium_bulb_lantern_blue": "#496dff",
"betterend:thallasium_bulb_lantern_brown": "#ffbe80",
"betterend:thallasium_bulb_lantern_green": "#cdff66",
"betterend:thallasium_bulb_lantern_red": "#ff5555",
"betterend:terminite_bulb_lantern_orange": "#ff963c",
"betterend:terminite_bulb_lantern_magenta": "#d25aff",
"betterend:terminite_bulb_lantern_light_blue": "#78b5ff",
"betterend:terminite_bulb_lantern_yellow": "#ffff39",
"betterend:terminite_bulb_lantern_lime": "#9fff1f",
"betterend:terminite_bulb_lantern_pink": "#ff86ae",
"betterend:terminite_bulb_lantern_cyan": "#7fd4ff",
"betterend:terminite_bulb_lantern_purple": "#b65aff",
"betterend:terminite_bulb_lantern_blue": "#496dff",
"betterend:terminite_bulb_lantern_brown": "#ffbe80",
"betterend:terminite_bulb_lantern_green": "#cdff66",
"betterend:terminite_bulb_lantern_red": "#ff5555",
"betterend:thallasium_chandelier": "#e0fceb",
"betterend:terminite_chandelier": "#e0fceb",
"betterend:iron_chandelier": "#e0fceb",
"betterend:gold_chandelier": "#e0fceb",
"betterend:lumecorn": "#e0fceb"
}
}