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

Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd

Browse source
This commit is contained in:
Aleksey 2020-10-11 00:21:34 +03:00
commit 8aab4fa033
145 changed files with 1369 additions and 1510 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/ru/betterend/blocks/basis/BlockPlant.java
View file

@ -38,15 +38,23 @@ public class BlockPlant extends BlockBaseNotFull implements IRenderTypeable, Fer
private static final VoxelShape SHAPE = Block.createCuboidShape(4, 0, 4, 12, 14, 12);
public BlockPlant() {
super(FabricBlockSettings.of(Material.PLANT)
this(false);
}
public BlockPlant(int light) {
this(false, light);
}
public BlockPlant(boolean replaceable) {
super(FabricBlockSettings.of(replaceable ? Material.PLANT : Material.REPLACEABLE_PLANT)
.breakByTool(FabricToolTags.SHEARS)
.sounds(BlockSoundGroup.GRASS)
.breakByHand(true)
.noCollision());
}
public BlockPlant(int light) {
super(FabricBlockSettings.of(Material.PLANT)
public BlockPlant(boolean replaceable, int light) {
super(FabricBlockSettings.of(replaceable ? Material.PLANT : Material.REPLACEABLE_PLANT)
.breakByTool(FabricToolTags.SHEARS)
.sounds(BlockSoundGroup.GRASS)
.lightLevel(light)

2
src/main/java/ru/betterend/compat/REIAlloyingCategory.java
View file

@ -17,12 +17,10 @@ import me.shedaniel.rei.api.widgets.Widgets;
import me.shedaniel.rei.gui.entries.RecipeEntry;
import me.shedaniel.rei.gui.entries.SimpleRecipeEntry;
import me.shedaniel.rei.gui.widget.Widget;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Identifier;
import ru.betterend.recipe.AlloyingRecipe;
import ru.betterend.registry.BlockRegistry;
import ru.betterend.util.LangUtil;

12
src/main/java/ru/betterend/entity/EntityEndSlime.java
View file

@ -24,6 +24,7 @@ import net.minecraft.util.math.Box;
import net.minecraft.world.LocalDifficulty;
import net.minecraft.world.ServerWorldAccess;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import ru.betterend.registry.BiomeRegistry;
import ru.betterend.util.ISlime;
@ -105,7 +106,12 @@ public class EntityEndSlime extends SlimeEntity {
}
public static boolean canSpawn(EntityType<EntityEndSlime> type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) {
return notManyEntities(world, pos, 32, 3) && isWaterNear(world, pos, 32);
return isPermanentBiome(world, pos) || (notManyEntities(world, pos, 32, 3) && isWaterNear(world, pos, 32, 8));
}
private static boolean isPermanentBiome(ServerWorldAccess world, BlockPos pos) {
Biome biome = world.getBiome(pos);
return BiomeRegistry.getFromBiome(biome) == BiomeRegistry.CHORUS_FOREST;
}
private static boolean notManyEntities(ServerWorldAccess world, BlockPos pos, int radius, int maxCount) {
@ -114,12 +120,12 @@ public class EntityEndSlime extends SlimeEntity {
return list.size() <= maxCount;
}
private static boolean isWaterNear(ServerWorldAccess world, BlockPos pos, int radius) {
private static boolean isWaterNear(ServerWorldAccess world, BlockPos pos, int radius, int radius2) {
for (int x = pos.getX() - radius; x <= pos.getX() + radius; x++) {
POS.setX(x);
for (int z = pos.getZ() - radius; z <= pos.getZ() + radius; z++) {
POS.setZ(z);
for (int y = pos.getY() - radius; y <= pos.getY() + radius; y++) {
for (int y = pos.getY() - radius2; y <= pos.getY() + radius2; y++) {
POS.setY(y);
if (world.getBlockState(POS).getBlock() == Blocks.WATER) {
return true;

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

@ -12,6 +12,7 @@ import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.Biome.Category;
import net.minecraft.world.biome.BiomeKeys;
import ru.betterend.world.biome.BiomeChorusForest;
import ru.betterend.world.biome.BiomeFoggyMushroomland;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.generator.BiomePicker;
@ -30,6 +31,7 @@ public class BiomeRegistry {
public static final EndBiome END_MIDLANDS = registerBiome(BiomeKeys.END_MIDLANDS, BiomeType.LAND, false);
public static final EndBiome SMALL_END_ISLANDS = registerBiome(BiomeKeys.SMALL_END_ISLANDS, BiomeType.VOID, true);
public static final EndBiome FOGGY_MUSHROOMLAND = registerBiome(new BiomeFoggyMushroomland(), BiomeType.LAND);
public static final EndBiome CHORUS_FOREST = registerBiome(new BiomeChorusForest(), BiomeType.LAND);
public static void register() {}

6
src/main/java/ru/betterend/registry/BlockRegistry.java
View file

@ -29,6 +29,7 @@ import ru.betterend.blocks.EndStoneSmelter;
import ru.betterend.blocks.EnderBlock;
import ru.betterend.blocks.TerminiteBlock;
import ru.betterend.blocks.basis.BlockGlowingFur;
import ru.betterend.blocks.basis.BlockPlant;
import ru.betterend.blocks.basis.BlockVine;
import ru.betterend.blocks.complex.WoodenMaterial;
import ru.betterend.tab.CreativeTab;
@ -38,10 +39,12 @@ public class BlockRegistry {
public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new BlockEndstoneDust());
public static final Block END_MYCELIUM = registerBlock("end_mycelium", new BlockTerrain(MaterialColor.LIGHT_BLUE));
public static final Block END_MOSS = registerBlock("end_moss", new BlockTerrain(MaterialColor.CYAN));
public static final Block CHORUS_NYLIUM = registerBlock("chorus_nylium", new BlockTerrain(MaterialColor.MAGENTA));
// Roads //
public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new BlockPath(END_MYCELIUM));
public static final Block END_MOSS_PATH = registerBlock("end_moss_path", new BlockPath(END_MOSS));
public static final Block CHORUS_NYLIUM_PATH = registerBlock("chorus_nylium_path", new BlockPath(CHORUS_NYLIUM));
// Rocks //
public static final Block FLAVOLITE = registerBlock("flavolite", new BlockStone(MaterialColor.SAND));
@ -52,6 +55,7 @@ public class BlockRegistry {
public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new BlockMossyGlowshroomHymenophore());
public static final Block MOSSY_GLOWSHROOM_FUR = registerBlock("mossy_glowshroom_fur", new BlockGlowingFur(MOSSY_GLOWSHROOM_SAPLING, 16));
public static final WoodenMaterial MOSSY_GLOWSHROOM = new WoodenMaterial("mossy_glowshroom", MaterialColor.GRAY, MaterialColor.WOOD);
public static final WoodenMaterial CHORUS = new WoodenMaterial("chorus", MaterialColor.MAGENTA, MaterialColor.PURPLE);
// Small Plants //
public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new BlockUmbrellaMoss());
@ -67,6 +71,8 @@ public class BlockRegistry {
public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily());
public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed());
public static final Block CHORUS_GRASS = registerBlock("chorus_grass", new BlockPlant(true));
// Vines //
public static final Block DENSE_VINE = registerBlock("dense_vine", new BlockVine(15, true));

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

@ -22,6 +22,7 @@ public class BlockTagRegistry {
public static void register() {
addSurfaceBlock(BlockRegistry.END_MOSS);
addSurfaceBlock(BlockRegistry.END_MYCELIUM);
addSurfaceBlock(BlockRegistry.CHORUS_NYLIUM);
TagHelper.addTag(GEN_TERRAIN, BlockRegistry.ENDER_ORE);
}

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

@ -16,11 +16,13 @@ public class FeatureRegistry {
public static final EndFeature UMBRELLA_MOSS = new EndFeature("umbrella_moss", new DoublePlantFeature(BlockRegistry.UMBRELLA_MOSS, BlockRegistry.UMBRELLA_MOSS_TALL, 5), 5);
public static final EndFeature CREEPING_MOSS = new EndFeature("creeping_moss", new SinglePlantFeature(BlockRegistry.CREEPING_MOSS, 5), 5);
public static final EndFeature BLUE_VINE = new EndFeature("blue_vine", new BlueVineFeature(), 1);
public static final EndFeature CHORUS_GRASS = new EndFeature("chorus_grass", new SinglePlantFeature(BlockRegistry.CHORUS_GRASS, 4), 4);
public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(BlockRegistry.DENSE_VINE, 24), 3);
// Features //
public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4);
public static final EndFeature RARE_END_LAKE = EndFeature.makeLakeFeature("rare_end_lake", new EndLakeFeature(), 40);
// Ores //
public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", BlockRegistry.ENDER_ORE, 6, 3, 0, 4, 96);

25
src/main/java/ru/betterend/world/biome/BiomeChorusForest.java Normal file
View file

@ -0,0 +1,25 @@
package ru.betterend.world.biome;
import net.minecraft.entity.EntityType;
import ru.betterend.registry.BlockRegistry;
import ru.betterend.registry.EntityRegistry;
import ru.betterend.registry.FeatureRegistry;
import ru.betterend.registry.StructureRegistry;
public class BiomeChorusForest extends EndBiome {
public BiomeChorusForest() {
super(new BiomeDefinition("chorus_forest")
.setFogColor(87, 26, 87)
.setFogDensity(3)
.setSurface(BlockRegistry.CHORUS_NYLIUM)
//.setParticles(ParticleRegistry.GLOWING_SPHERE, 0.001F)
//.setLoop(SoundRegistry.AMBIENT_FOGGY_MUSHROOMLAND)
//.setMusic(SoundRegistry.MUSIC_FOGGY_MUSHROOMLAND)
.addStructureFeature(StructureRegistry.GIANT_MOSSY_GLOWSHROOM)
.addFeature(FeatureRegistry.ENDER_ORE)
.addFeature(FeatureRegistry.RARE_END_LAKE)
.addFeature(FeatureRegistry.CHORUS_GRASS)
.addMobSpawn(EntityRegistry.END_SLIME, 5, 1, 2)
.addMobSpawn(EntityType.ENDERMAN, 50, 1, 4));
}
}

34
src/main/java/ru/betterend/world/features/EndLakeFeature.java
View file

@ -8,15 +8,18 @@ import net.minecraft.fluid.FluidState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockPos.Mutable;
import net.minecraft.world.StructureWorldAccess;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import ru.betterend.blocks.BlockEndLily;
import ru.betterend.blocks.BlockProperties.TripleShape;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.BiomeRegistry;
import ru.betterend.registry.BlockRegistry;
import ru.betterend.registry.BlockTagRegistry;
import ru.betterend.util.BlocksHelper;
import ru.betterend.util.MHelper;
import ru.betterend.world.biome.EndBiome;
public class EndLakeFeature extends DefaultFeature {
private static final BlockState END_STONE = Blocks.END_STONE.getDefaultState();
@ -165,18 +168,10 @@ public class EndLakeFeature extends DefaultFeature {
if (world.getBlockState(pos).getBlock().isIn(BlockTagRegistry.GEN_TERRAIN))
{
BlocksHelper.setWithoutUpdate(world, POS.down(), BlockRegistry.ENDSTONE_DUST.getDefaultState());
if (y < waterLevel - 1 && random.nextInt(3) == 0 && ((x + z) & 1) == 0) {
if (NOISE.eval(x * 0.1, z * 0.1, 0) > 0) {
BlocksHelper.setWithoutUpdate(world, POS, BlockRegistry.BUBBLE_CORAL.getDefaultState());
}
else if (NOISE.eval(x * 0.1, z * 0.1, 1) > 0) {
world.setBlockState(POS, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.BOTTOM), 0);
BlockPos up = POS.up();
while (up.getY() < waterLevel) {
BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.MIDDLE));
up = up.up();
}
BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.TOP));
if (random.nextInt(3) == 0 && pos.getY() < waterLevel - 1) {
EndBiome biome = BiomeRegistry.getFromBiome(world.getBiome(POS));
if (biome == BiomeRegistry.FOGGY_MUSHROOMLAND) {
generateFoggyMushroomland(world, x, z, waterLevel);
}
}
}
@ -214,4 +209,19 @@ public class EndLakeFeature extends DefaultFeature {
return true;
}
private void generateFoggyMushroomland(WorldAccess world, int x, int z, int waterLevel) {
if (NOISE.eval(x * 0.1, z * 0.1, 0) > 0) {
BlocksHelper.setWithoutUpdate(world, POS, BlockRegistry.BUBBLE_CORAL.getDefaultState());
}
else if (NOISE.eval(x * 0.1, z * 0.1, 1) > 0) {
world.setBlockState(POS, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.BOTTOM), 0);
BlockPos up = POS.up();
while (up.getY() < waterLevel) {
BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.MIDDLE));
up = up.up();
}
BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.TOP));
}
}
}

6
utility_res/blockstates/%name%_log.json → src/main/resources/assets/betterend/blockstates/chorus_bark.json
View file

@ -1,15 +1,15 @@
{
"variants": {
"axis=x": {
"model": "betterend:block/%name%_log",
"model": "betterend:block/chorus_bark",
"x": 90,
"y": 90
},
"axis=y": {
"model": "betterend:block/%name%_log"
"model": "betterend:block/chorus_bark"
},
"axis=z": {
"model": "betterend:block/%name%_log",
"model": "betterend:block/chorus_bark",
"x": 90
}
}

24
utility_res/blockstates/%name%_barrel.json → src/main/resources/assets/betterend/blockstates/chorus_barrel.json
View file

@ -1,54 +1,54 @@
{
"variants": {
"facing=down,open=false": {
"model": "betterend:block/%name%_barrel",
"model": "betterend:block/chorus_barrel",
"x": 180
},
"facing=down,open=true": {
"model": "betterend:block/%name%_barrel_open",
"model": "betterend:block/chorus_barrel_open",
"x": 180
},
"facing=east,open=false": {
"model": "betterend:block/%name%_barrel",
"model": "betterend:block/chorus_barrel",
"x": 90,
"y": 90
},
"facing=east,open=true": {
"model": "betterend:block/%name%_barrel_open",
"model": "betterend:block/chorus_barrel_open",
"x": 90,
"y": 90
},
"facing=north,open=false": {
"model": "betterend:block/%name%_barrel",
"model": "betterend:block/chorus_barrel",
"x": 90
},
"facing=north,open=true": {
"model": "betterend:block/%name%_barrel_open",
"model": "betterend:block/chorus_barrel_open",
"x": 90
},
"facing=south,open=false": {
"model": "betterend:block/%name%_barrel",
"model": "betterend:block/chorus_barrel",
"x": 90,
"y": 180
},
"facing=south,open=true": {
"model": "betterend:block/%name%_barrel_open",
"model": "betterend:block/chorus_barrel_open",
"x": 90,
"y": 180
},
"facing=up,open=false": {
"model": "betterend:block/%name%_barrel"
"model": "betterend:block/chorus_barrel"
},
"facing=up,open=true": {
"model": "betterend:block/%name%_barrel_open"
"model": "betterend:block/chorus_barrel_open"
},
"facing=west,open=false": {
"model": "betterend:block/%name%_barrel",
"model": "betterend:block/chorus_barrel",
"x": 90,
"y": 270
},
"facing=west,open=true": {
"model": "betterend:block/%name%_barrel_open",
"model": "betterend:block/chorus_barrel_open",
"x": 90,
"y": 270
}

48
utility_res/blockstates/%name%_button.json → src/main/resources/assets/betterend/blockstates/chorus_button.json
View file

@ -1,115 +1,115 @@
{
"variants": {
"face=ceiling,facing=east,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"x": 180,
"y": 270
},
"face=ceiling,facing=east,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"x": 180,
"y": 270
},
"face=ceiling,facing=north,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"x": 180,
"y": 180
},
"face=ceiling,facing=north,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"x": 180,
"y": 180
},
"face=ceiling,facing=south,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"x": 180
},
"face=ceiling,facing=south,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"x": 180
},
"face=ceiling,facing=west,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"x": 180,
"y": 90
},
"face=ceiling,facing=west,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"x": 180,
"y": 90
},
"face=floor,facing=east,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"y": 90
},
"face=floor,facing=east,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"y": 90
},
"face=floor,facing=north,powered=false": {
"model": "betterend:block/%name%_button"
"model": "betterend:block/chorus_button"
},
"face=floor,facing=north,powered=true": {
"model": "betterend:block/%name%_button_pressed"
"model": "betterend:block/chorus_button_pressed"
},
"face=floor,facing=south,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"y": 180
},
"face=floor,facing=south,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"y": 180
},
"face=floor,facing=west,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"y": 270
},
"face=floor,facing=west,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"y": 270
},
"face=wall,facing=east,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"uvlock": true,
"x": 90,
"y": 90
},
"face=wall,facing=east,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"uvlock": true,
"x": 90,
"y": 90
},
"face=wall,facing=north,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"uvlock": true,
"x": 90
},
"face=wall,facing=north,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"uvlock": true,
"x": 90
},
"face=wall,facing=south,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"uvlock": true,
"x": 90,
"y": 180
},
"face=wall,facing=south,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"uvlock": true,
"x": 90,
"y": 180
},
"face=wall,facing=west,powered=false": {
"model": "betterend:block/%name%_button",
"model": "betterend:block/chorus_button",
"uvlock": true,
"x": 90,
"y": 270
},
"face=wall,facing=west,powered=true": {
"model": "betterend:block/%name%_button_pressed",
"model": "betterend:block/chorus_button_pressed",
"uvlock": true,
"x": 90,
"y": 270

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

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "betterend:block/chorus_empty"
}
}
}

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

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "betterend:block/chorus_crafting_table"
}
}
}

64
utility_res/blockstates/%name%_door.json → src/main/resources/assets/betterend/blockstates/chorus_door.json
View file

@ -1,123 +1,123 @@
{
"variants": {
"facing=east,half=lower,hinge=left,open=false": {
"model": "betterend:block/%name%_door_bottom"
"model": "betterend:block/chorus_door_bottom"
},
"facing=east,half=lower,hinge=left,open=true": {
"model": "betterend:block/%name%_door_bottom_hinge",
"model": "betterend:block/chorus_door_bottom_hinge",
"y": 90
},
"facing=east,half=lower,hinge=right,open=false": {
"model": "betterend:block/%name%_door_bottom_hinge"
"model": "betterend:block/chorus_door_bottom_hinge"
},
"facing=east,half=lower,hinge=right,open=true": {
"model": "betterend:block/%name%_door_bottom",
"model": "betterend:block/chorus_door_bottom",
"y": 270
},
"facing=east,half=upper,hinge=left,open=false": {
"model": "betterend:block/%name%_door_top"
"model": "betterend:block/chorus_door_top"
},
"facing=east,half=upper,hinge=left,open=true": {
"model": "betterend:block/%name%_door_top_hinge",
"model": "betterend:block/chorus_door_top_hinge",
"y": 90
},
"facing=east,half=upper,hinge=right,open=false": {
"model": "betterend:block/%name%_door_top_hinge"
"model": "betterend:block/chorus_door_top_hinge"
},
"facing=east,half=upper,hinge=right,open=true": {
"model": "betterend:block/%name%_door_top",
"model": "betterend:block/chorus_door_top",
"y": 270
},
"facing=north,half=lower,hinge=left,open=false": {
"model": "betterend:block/%name%_door_bottom",
"model": "betterend:block/chorus_door_bottom",
"y": 270
},
"facing=north,half=lower,hinge=left,open=true": {
"model": "betterend:block/%name%_door_bottom_hinge"
"model": "betterend:block/chorus_door_bottom_hinge"
},
"facing=north,half=lower,hinge=right,open=false": {
"model": "betterend:block/%name%_door_bottom_hinge",
"model": "betterend:block/chorus_door_bottom_hinge",
"y": 270
},
"facing=north,half=lower,hinge=right,open=true": {
"model": "betterend:block/%name%_door_bottom",
"model": "betterend:block/chorus_door_bottom",
"y": 180
},
"facing=north,half=upper,hinge=left,open=false": {
"model": "betterend:block/%name%_door_top",
"model": "betterend:block/chorus_door_top",
"y": 270
},
"facing=north,half=upper,hinge=left,open=true": {
"model": "betterend:block/%name%_door_top_hinge"
"model": "betterend:block/chorus_door_top_hinge"
},
"facing=north,half=upper,hinge=right,open=false": {
"model": "betterend:block/%name%_door_top_hinge",
"model": "betterend:block/chorus_door_top_hinge",
"y": 270
},
"facing=north,half=upper,hinge=right,open=true": {
"model": "betterend:block/%name%_door_top",
"model": "betterend:block/chorus_door_top",
"y": 180
},
"facing=south,half=lower,hinge=left,open=false": {
"model": "betterend:block/%name%_door_bottom",
"model": "betterend:block/chorus_door_bottom",
"y": 90
},
"facing=south,half=lower,hinge=left,open=true": {
"model": "betterend:block/%name%_door_bottom_hinge",
"model": "betterend:block/chorus_door_bottom_hinge",
"y": 180
},
"facing=south,half=lower,hinge=right,open=false": {
"model": "betterend:block/%name%_door_bottom_hinge",
"model": "betterend:block/chorus_door_bottom_hinge",
"y": 90
},
"facing=south,half=lower,hinge=right,open=true": {
"model": "betterend:block/%name%_door_bottom"
"model": "betterend:block/chorus_door_bottom"
},
"facing=south,half=upper,hinge=left,open=false": {
"model": "betterend:block/%name%_door_top",
"model": "betterend:block/chorus_door_top",
"y": 90
},
"facing=south,half=upper,hinge=left,open=true": {
"model": "betterend:block/%name%_door_top_hinge",
"model": "betterend:block/chorus_door_top_hinge",
"y": 180
},
"facing=south,half=upper,hinge=right,open=false": {
"model": "betterend:block/%name%_door_top_hinge",
"model": "betterend:block/chorus_door_top_hinge",
"y": 90
},
"facing=south,half=upper,hinge=right,open=true": {
"model": "betterend:block/%name%_door_top"
"model": "betterend:block/chorus_door_top"
},
"facing=west,half=lower,hinge=left,open=false": {
"model": "betterend:block/%name%_door_bottom",
"model": "betterend:block/chorus_door_bottom",
"y": 180
},
"facing=west,half=lower,hinge=left,open=true": {
"model": "betterend:block/%name%_door_bottom_hinge",
"model": "betterend:block/chorus_door_bottom_hinge",
"y": 270
},
"facing=west,half=lower,hinge=right,open=false": {
"model": "betterend:block/%name%_door_bottom_hinge",
"model": "betterend:block/chorus_door_bottom_hinge",
"y": 180
},
"facing=west,half=lower,hinge=right,open=true": {
"model": "betterend:block/%name%_door_bottom",
"model": "betterend:block/chorus_door_bottom",
"y": 90
},
"facing=west,half=upper,hinge=left,open=false": {
"model": "betterend:block/%name%_door_top",
"model": "betterend:block/chorus_door_top",
"y": 180
},
"facing=west,half=upper,hinge=left,open=true": {
"model": "betterend:block/%name%_door_top_hinge",
"model": "betterend:block/chorus_door_top_hinge",
"y": 270
},
"facing=west,half=upper,hinge=right,open=false": {
"model": "betterend:block/%name%_door_top_hinge",
"model": "betterend:block/chorus_door_top_hinge",
"y": 180
},
"facing=west,half=upper,hinge=right,open=true": {
"model": "betterend:block/%name%_door_top",
"model": "betterend:block/chorus_door_top",
"y": 90
}
}

10
utility_res/blockstates/%name%_fence.json → src/main/resources/assets/betterend/blockstates/chorus_fence.json
View file

@ -2,12 +2,12 @@
"multipart": [
{
"apply": {
"model": "betterend:block/%name%_fence_post"
"model": "betterend:block/chorus_fence_post"
}
},
{
"apply": {
"model": "betterend:block/%name%_fence_side",
"model": "betterend:block/chorus_fence_side",
"uvlock": true
},
"when": {
@ -16,7 +16,7 @@
},
{
"apply": {
"model": "betterend:block/%name%_fence_side",
"model": "betterend:block/chorus_fence_side",
"uvlock": true,
"y": 90
},
@ -26,7 +26,7 @@
},
{
"apply": {
"model": "betterend:block/%name%_fence_side",
"model": "betterend:block/chorus_fence_side",
"uvlock": true,
"y": 180
},
@ -36,7 +36,7 @@
},
{
"apply": {
"model": "betterend:block/%name%_fence_side",
"model": "betterend:block/chorus_fence_side",
"uvlock": true,
"y": 270
},

32
utility_res/blockstates/%name%_gate.json → src/main/resources/assets/betterend/blockstates/chorus_gate.json
View file

@ -1,78 +1,78 @@
{
"variants": {
"facing=east,in_wall=false,open=false": {
"model": "betterend:block/%name%_fence_gate_closed",
"model": "betterend:block/chorus_fence_gate_closed",
"uvlock": true,
"y": 270
},
"facing=east,in_wall=false,open=true": {
"model": "betterend:block/%name%_fence_gate_open",
"model": "betterend:block/chorus_fence_gate_open",
"uvlock": true,
"y": 270
},
"facing=east,in_wall=true,open=false": {
"model": "betterend:block/%name%_wall_gate_closed",
"model": "betterend:block/chorus_wall_gate_closed",
"uvlock": true,
"y": 270
},
"facing=east,in_wall=true,open=true": {
"model": "betterend:block/%name%_wall_gate_open",
"model": "betterend:block/chorus_wall_gate_open",
"uvlock": true,
"y": 270
},
"facing=north,in_wall=false,open=false": {
"model": "betterend:block/%name%_fence_gate_closed",
"model": "betterend:block/chorus_fence_gate_closed",
"uvlock": true,
"y": 180
},
"facing=north,in_wall=false,open=true": {
"model": "betterend:block/%name%_fence_gate_open",
"model": "betterend:block/chorus_fence_gate_open",
"uvlock": true,
"y": 180
},
"facing=north,in_wall=true,open=false": {
"model": "betterend:block/%name%_wall_gate_closed",
"model": "betterend:block/chorus_wall_gate_closed",
"uvlock": true,
"y": 180
},
"facing=north,in_wall=true,open=true": {
"model": "betterend:block/%name%_wall_gate_open",
"model": "betterend:block/chorus_wall_gate_open",
"uvlock": true,
"y": 180
},
"facing=south,in_wall=false,open=false": {
"model": "betterend:block/%name%_fence_gate_closed",
"model": "betterend:block/chorus_fence_gate_closed",
"uvlock": true
},
"facing=south,in_wall=false,open=true": {
"model": "betterend:block/%name%_fence_gate_open",
"model": "betterend:block/chorus_fence_gate_open",
"uvlock": true
},
"facing=south,in_wall=true,open=false": {
"model": "betterend:block/%name%_wall_gate_closed",
"model": "betterend:block/chorus_wall_gate_closed",
"uvlock": true
},
"facing=south,in_wall=true,open=true": {
"model": "betterend:block/%name%_wall_gate_open",
"model": "betterend:block/chorus_wall_gate_open",
"uvlock": true
},
"facing=west,in_wall=false,open=false": {
"model": "betterend:block/%name%_fence_gate_closed",
"model": "betterend:block/chorus_fence_gate_closed",
"uvlock": true,
"y": 90
},
"facing=west,in_wall=false,open=true": {
"model": "betterend:block/%name%_fence_gate_open",
"model": "betterend:block/chorus_fence_gate_open",
"uvlock": true,
"y": 90
},
"facing=west,in_wall=true,open=false": {
"model": "betterend:block/%name%_wall_gate_closed",
"model": "betterend:block/chorus_wall_gate_closed",
"uvlock": true,
"y": 90
},
"facing=west,in_wall=true,open=true": {
"model": "betterend:block/%name%_wall_gate_open",
"model": "betterend:block/chorus_wall_gate_open",
"uvlock": true,
"y": 90
}

38
src/main/resources/assets/betterend/blockstates/chorus_grass.json Normal file
View file

@ -0,0 +1,38 @@
{
"variants": {
"": [
{ "model": "betterend:block/chorus_grass_01" },
{ "model": "betterend:block/chorus_grass_02" },
{ "model": "betterend:block/chorus_grass_03" },
{ "model": "betterend:block/chorus_grass_04" },
{ "model": "betterend:block/chorus_grass_05" },
{ "model": "betterend:block/chorus_grass_06" },
{ "model": "betterend:block/chorus_grass_07" },
{ "model": "betterend:block/chorus_grass_08" },
{ "model": "betterend:block/chorus_grass_01", "y": 90 },
{ "model": "betterend:block/chorus_grass_02", "y": 90 },
{ "model": "betterend:block/chorus_grass_03", "y": 90 },
{ "model": "betterend:block/chorus_grass_04", "y": 90 },
{ "model": "betterend:block/chorus_grass_05", "y": 90 },
{ "model": "betterend:block/chorus_grass_06", "y": 90 },
{ "model": "betterend:block/chorus_grass_07", "y": 90 },
{ "model": "betterend:block/chorus_grass_08", "y": 90 },
{ "model": "betterend:block/chorus_grass_01", "y": 180 },
{ "model": "betterend:block/chorus_grass_02", "y": 180 },
{ "model": "betterend:block/chorus_grass_03", "y": 180 },
{ "model": "betterend:block/chorus_grass_04", "y": 180 },
{ "model": "betterend:block/chorus_grass_05", "y": 180 },
{ "model": "betterend:block/chorus_grass_06", "y": 180 },
{ "model": "betterend:block/chorus_grass_07", "y": 180 },
{ "model": "betterend:block/chorus_grass_08", "y": 180 },
{ "model": "betterend:block/chorus_grass_01", "y": 270 },
{ "model": "betterend:block/chorus_grass_02", "y": 270 },
{ "model": "betterend:block/chorus_grass_03", "y": 270 },
{ "model": "betterend:block/chorus_grass_04", "y": 270 },
{ "model": "betterend:block/chorus_grass_05", "y": 270 },
{ "model": "betterend:block/chorus_grass_06", "y": 270 },
{ "model": "betterend:block/chorus_grass_07", "y": 270 },
{ "model": "betterend:block/chorus_grass_08", "y": 270 }
]
}
}

19
src/main/resources/assets/betterend/blockstates/chorus_ladder.json Normal file
View file

@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "betterend:block/chorus_ladder",
"y": 90
},
"facing=north": {
"model": "betterend:block/chorus_ladder"
},
"facing=south": {
"model": "betterend:block/chorus_ladder",
"y": 180
},
"facing=west": {
"model": "betterend:block/chorus_ladder",
"y": 270
}
}
}

6
utility_res/blockstates/%name%_bark.json → src/main/resources/assets/betterend/blockstates/chorus_log.json
View file

@ -1,15 +1,15 @@
{
"variants": {
"axis=x": {
"model": "betterend:block/%name%_bark",
"model": "betterend:block/chorus_log",
"x": 90,
"y": 90
},
"axis=y": {
"model": "betterend:block/%name%_bark"
"model": "betterend:block/chorus_log"
},
"axis=z": {
"model": "betterend:block/%name%_bark",
"model": "betterend:block/chorus_log",
"x": 90
}
}

10
src/main/resources/assets/betterend/blockstates/chorus_nylium.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"": [
{ "model": "betterend:block/chorus_nylium" },
{ "model": "betterend:block/chorus_nylium", "y": 90 },
{ "model": "betterend:block/chorus_nylium", "y": 180 },
{ "model": "betterend:block/chorus_nylium", "y": 270 }
]
}
}

10
src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"": [
{ "model": "betterend:block/chorus_nylium_path" },
{ "model": "betterend:block/chorus_nylium_path", "y": 90 },
{ "model": "betterend:block/chorus_nylium_path", "y": 180 },
{ "model": "betterend:block/chorus_nylium_path", "y": 270 }
]
}
}

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

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "betterend:block/chorus_planks"
}
}
}

10
src/main/resources/assets/betterend/blockstates/chorus_plate.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"powered=false": {
"model": "betterend:block/chorus_pressure_plate_up"
},
"powered=true": {
"model": "betterend:block/chorus_pressure_plate_down"
}
}
}

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

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "betterend:block/chorus_empty"
}
}
}

6
utility_res/blockstates/%name%_slab.json → src/main/resources/assets/betterend/blockstates/chorus_slab.json
View file

@ -1,13 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "betterend:block/%name%_half_slab"
"model": "betterend:block/chorus_half_slab"
},
"type=double": {
"model": "betterend:block/%name%_planks"
"model": "betterend:block/chorus_planks"
},
"type=top": {
"model": "betterend:block/%name%_half_slab",
"model": "betterend:block/chorus_half_slab",
"uvlock": true,
"x": 180
}

80
utility_res/blockstates/%name%_stairs.json → src/main/resources/assets/betterend/blockstates/chorus_stairs.json
View file

@ -1,206 +1,206 @@
{
"variants": {
"facing=east,half=bottom,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"y": 270
},
"facing=east,half=bottom,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs"
"model": "betterend:block/chorus_inner_stairs"
},
"facing=east,half=bottom,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"y": 270
},
"facing=east,half=bottom,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs"
"model": "betterend:block/chorus_outer_stairs"
},
"facing=east,half=bottom,shape=straight": {
"model": "betterend:block/%name%_stairs"
"model": "betterend:block/chorus_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180
},
"facing=east,half=top,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=east,half=top,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180
},
"facing=east,half=top,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=east,half=top,shape=straight": {
"model": "betterend:block/%name%_stairs",
"model": "betterend:block/chorus_stairs",
"uvlock": true,
"x": 180
},
"facing=north,half=bottom,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"y": 180
},
"facing=north,half=bottom,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"y": 270
},
"facing=north,half=bottom,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"y": 180
},
"facing=north,half=bottom,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"y": 270
},
"facing=north,half=bottom,shape=straight": {
"model": "betterend:block/%name%_stairs",
"model": "betterend:block/chorus_stairs",
"uvlock": true,
"y": 270
},
"facing=north,half=top,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=north,half=top,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180
},
"facing=north,half=top,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=north,half=top,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180
},
"facing=north,half=top,shape=straight": {
"model": "betterend:block/%name%_stairs",
"model": "betterend:block/chorus_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=south,half=bottom,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs"
"model": "betterend:block/chorus_inner_stairs"
},
"facing=south,half=bottom,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"y": 90
},
"facing=south,half=bottom,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs"
"model": "betterend:block/chorus_outer_stairs"
},
"facing=south,half=bottom,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"y": 90
},
"facing=south,half=bottom,shape=straight": {
"model": "betterend:block/%name%_stairs",
"model": "betterend:block/chorus_stairs",
"uvlock": true,
"y": 90
},
"facing=south,half=top,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=south,half=top,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=south,half=top,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=south,half=top,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=south,half=top,shape=straight": {
"model": "betterend:block/%name%_stairs",
"model": "betterend:block/chorus_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=west,half=bottom,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"y": 90
},
"facing=west,half=bottom,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"y": 180
},
"facing=west,half=bottom,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"y": 90
},
"facing=west,half=bottom,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"y": 180
},
"facing=west,half=bottom,shape=straight": {
"model": "betterend:block/%name%_stairs",
"model": "betterend:block/chorus_stairs",
"uvlock": true,
"y": 180
},
"facing=west,half=top,shape=inner_left": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=west,half=top,shape=inner_right": {
"model": "betterend:block/%name%_inner_stairs",
"model": "betterend:block/chorus_inner_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=west,half=top,shape=outer_left": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=west,half=top,shape=outer_right": {
"model": "betterend:block/%name%_outer_stairs",
"model": "betterend:block/chorus_outer_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=west,half=top,shape=straight": {
"model": "betterend:block/%name%_stairs",
"model": "betterend:block/chorus_stairs",
"uvlock": true,
"x": 180,
"y": 180

16
src/main/resources/assets/betterend/blockstates/chorus_stripped_bark.json Normal file
View file

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

16
src/main/resources/assets/betterend/blockstates/chorus_stripped_log.json Normal file
View file

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

32
utility_res/blockstates/%name%_trapdoor.json → src/main/resources/assets/betterend/blockstates/chorus_trapdoor.json
View file

@ -1,75 +1,75 @@
{
"variants": {
"facing=east,half=bottom,open=false": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"y": 90
},
"facing=east,half=bottom,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 90,
"y": 90
},
"facing=east,half=top,open=false": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 180,
"y": 90
},
"facing=east,half=top,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 270,
"y": 270
},
"facing=north,half=bottom,open=false": {
"model": "betterend:block/%name%_trapdoor"
"model": "betterend:block/chorus_trapdoor"
},
"facing=north,half=bottom,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 90
},
"facing=north,half=top,open=false": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 180
},
"facing=north,half=top,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 270,
"y": 180
},
"facing=south,half=bottom,open=false": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"y": 180
},
"facing=south,half=bottom,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 90,
"y": 180
},
"facing=south,half=top,open=false": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 180,
"y": 180
},
"facing=south,half=top,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 270,
"y": 0
},
"facing=west,half=bottom,open=false": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"y": 270
},
"facing=west,half=bottom,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 90,
"y": 270
},
"facing=west,half=top,open=false": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 180,
"y": 270
},
"facing=west,half=top,open=true": {
"model": "betterend:block/%name%_trapdoor",
"model": "betterend:block/chorus_trapdoor",
"x": 270,
"y": 90
}

21
src/main/resources/assets/betterend/lang/en_us.json
View file

@ -98,5 +98,24 @@
"block.betterend.bubble_coral": "Bubble Coral",
"block.betterend.aurora_crystal": "Aurora Crystal",
"category.rei.damage.amount&dmg": "Tool damage: %s"
"category.rei.damage.amount&dmg": "Tool damage: %s",
"block.betterend.chorus_bark": "Chorus Bark",
"block.betterend.chorus_barrel": "Chorus Barrel",
"block.betterend.chorus_button": "Chorus Button",
"block.betterend.chorus_chest": "Chorus Chest",
"block.betterend.chorus_crafting_table": "Chorus Crafting Table",
"block.betterend.chorus_door": "Chorus Door",
"block.betterend.chorus_fence": "Chorus Fence",
"block.betterend.chorus_gate": "Chorus Gate",
"block.betterend.chorus_ladder": "Chorus Ladder",
"block.betterend.chorus_log": "Chorus Log",
"block.betterend.chorus_planks": "Chorus Planks",
"block.betterend.chorus_plate": "Chorus Plate",
"block.betterend.chorus_sign": "Chorus Sign",
"block.betterend.chorus_slab": "Chorus Slab",
"block.betterend.chorus_stairs": "Chorus Stairs",
"block.betterend.chorus_stripped_bark": "Chorus Stripped Bark",
"block.betterend.chorus_stripped_log": "Chorus Stripped Log",
"block.betterend.chorus_trapdoor": "Chorus Trapdoor"
}

2
utility_res/block/%name%_planks.json → src/main/resources/assets/betterend/models/block/chorus_bark.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/%name%_planks"
"all": "betterend:block/chorus_log_side"
}
}

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

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "betterend:block/chorus_barrel_bottom",
"side": "betterend:block/chorus_barrel_side",
"top": "betterend:block/chorus_barrel_top"
}
}

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

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "betterend:block/chorus_barrel_bottom",
"side": "betterend:block/chorus_barrel_side",
"top": "betterend:block/chorus_barrel_top_open"
}
}

2
utility_res/block/%name%_button.json → src/main/resources/assets/betterend/models/block/chorus_button.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/button",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_button_inventory.json → src/main/resources/assets/betterend/models/block/chorus_button_inventory.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/button_inventory",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_button_pressed.json → src/main/resources/assets/betterend/models/block/chorus_button_pressed.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/button_pressed",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

12
src/main/resources/assets/betterend/models/block/chorus_crafting_table.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "minecraft:block/cube",
"textures": {
"down": "betterend:block/chorus_crafting_table_bottom",
"east": "betterend:block/chorus_crafting_table_side",
"north": "betterend:block/chorus_crafting_table_front",
"particle": "betterend:block/chorus_crafting_table_front",
"south": "betterend:block/chorus_crafting_table_side",
"up": "betterend:block/chorus_crafting_table_top",
"west": "betterend:block/chorus_crafting_table_front"
}
}

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

@ -0,0 +1,7 @@
{
"parent": "betterend:block/sided_door_bottom",
"textures": {
"facade": "betterend:block/chorus_door_bottom",
"side": "betterend:block/chorus_door_side"
}
}

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

@ -0,0 +1,7 @@
{
"parent": "betterend:block/sided_door_bottom_rh",
"textures": {
"facade": "betterend:block/chorus_door_bottom",
"side": "betterend:block/chorus_door_side"
}
}

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

@ -0,0 +1,7 @@
{
"parent": "betterend:block/sided_door_top",
"textures": {
"facade": "betterend:block/chorus_door_top",
"side": "betterend:block/chorus_door_side"
}
}

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

@ -0,0 +1,7 @@
{
"parent": "betterend:block/sided_door_top_rh",
"textures": {
"facade": "betterend:block/chorus_door_top",
"side": "betterend:block/chorus_door_side"
}
}

5
src/main/resources/assets/betterend/models/block/chorus_empty.json Normal file
View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_fence_gate_closed.json → src/main/resources/assets/betterend/models/block/chorus_fence_gate_closed.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/template_fence_gate",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_fence_gate_open.json → src/main/resources/assets/betterend/models/block/chorus_fence_gate_open.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/template_fence_gate_open",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_fence_inventory.json → src/main/resources/assets/betterend/models/block/chorus_fence_inventory.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_fence_post.json → src/main/resources/assets/betterend/models/block/chorus_fence_post.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/fence_post",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_fence_side.json → src/main/resources/assets/betterend/models/block/chorus_fence_side.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/fence_side",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/chorus_grass_01"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/chorus_grass_02"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/chorus_grass_03"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/chorus_grass_04"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block",
"textures": {
"texture": "betterend:block/chorus_grass_01"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block",
"textures": {
"texture": "betterend:block/chorus_grass_02"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block",
"textures": {
"texture": "betterend:block/chorus_grass_03"
}
}

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

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block",
"textures": {
"texture": "betterend:block/chorus_grass_04"
}
}

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

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

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

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

2
utility_res/block/%name%_ladder.json → src/main/resources/assets/betterend/models/block/chorus_ladder.json
View file

@ -1,6 +1,6 @@
{
"parent": "betterend:block/ladder",
"textures": {
"texture": "betterend:block/%name%_ladder"
"texture": "betterend:block/chorus_ladder"
}
}

12
src/main/resources/assets/betterend/models/block/chorus_log.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/chorus_log_top",
"east": "betterend:block/chorus_log_side",
"north": "betterend:block/chorus_log_side",
"particle": "betterend:block/chorus_log_side",
"south": "betterend:block/chorus_log_side",
"up": "betterend:block/chorus_log_top",
"west": "betterend:block/chorus_log_side"
}
}

12
src/main/resources/assets/betterend/models/block/chorus_nylium.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "block/end_stone",
"east": "betterend:block/chorus_nylium_side",
"north": "betterend:block/chorus_nylium_side",
"particle": "betterend:block/chorus_nylium_side",
"south": "betterend:block/chorus_nylium_side",
"up": "betterend:block/chorus_nylium_top",
"west": "betterend:block/chorus_nylium_side"
}
}

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

@ -0,0 +1,7 @@
{ "parent": "betterend:block/path",
"textures": {
"top": "betterend:block/chorus_nylium_path_top",
"side": "betterend:block/chorus_nylium_side",
"bottom": "block/end_stone"
}
}

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

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

2
utility_res/block/%name%_bark.json → src/main/resources/assets/betterend/models/block/chorus_planks.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/%name%_log_side"
"all": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_pressure_plate_down.json → src/main/resources/assets/betterend/models/block/chorus_pressure_plate_down.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/pressure_plate_down",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_pressure_plate_up.json → src/main/resources/assets/betterend/models/block/chorus_pressure_plate_up.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/pressure_plate_up",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

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

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

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

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/chorus_stripped_log_side"
}
}

12
src/main/resources/assets/betterend/models/block/chorus_stripped_log.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/chorus_stripped_log_top",
"east": "betterend:block/chorus_stripped_log_side",
"north": "betterend:block/chorus_stripped_log_side",
"particle": "betterend:block/chorus_stripped_log_side",
"south": "betterend:block/chorus_stripped_log_side",
"up": "betterend:block/chorus_stripped_log_top",
"west": "betterend:block/chorus_stripped_log_side"
}
}

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

@ -0,0 +1,7 @@
{
"parent": "betterend:block/sided_trapdoor",
"textures": {
"texture": "betterend:block/chorus_trapdoor",
"side": "betterend:block/chorus_door_side"
}
}

2
utility_res/block/%name%_wall_gate_closed.json → src/main/resources/assets/betterend/models/block/chorus_wall_gate_closed.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/template_fence_gate_wall",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

2
utility_res/block/%name%_wall_gate_open.json → src/main/resources/assets/betterend/models/block/chorus_wall_gate_open.json
View file

@ -1,6 +1,6 @@
{
"parent": "block/template_fence_gate_wall_open",
"textures": {
"texture": "betterend:block/%name%_planks"
"texture": "betterend:block/chorus_planks"
}
}

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

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

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

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

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

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

2
utility_res/item/%name%_chest.json → src/main/resources/assets/betterend/models/item/chorus_chest.json
View file

@ -1,6 +1,6 @@
{
"parent": "betterend:block/chest_item",
"textures": {
"texture": "betterend:entity/chest/%name%_chest"
"texture": "betterend:entity/chest/chorus_chest"
}
}

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

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

2
utility_res/item/%name%_door.json → src/main/resources/assets/betterend/models/item/chorus_door.json
View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/%name%_door"
"layer0": "betterend:item/chorus_door"
}
}

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

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

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

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

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

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:block/chorus_grass_01"
}
}

2
utility_res/item/%name%_sign.json → src/main/resources/assets/betterend/models/item/chorus_ladder.json
View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/%name%_sign"
"layer0": "betterend:block/chorus_ladder"
}
}

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

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

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

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

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

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

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

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

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

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

2
utility_res/item/%name%_ladder.json → src/main/resources/assets/betterend/models/item/chorus_sign.json
View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:block/%name%_ladder"
"layer0": "betterend:item/chorus_sign"
}
}

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

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

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

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

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

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

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

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

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

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

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 722 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 480 B

Some files were not shown because too many files have changed in this diff Show more