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

Fence pattern

Browse source
This commit is contained in:
Aleksey 2020-10-14 10:37:30 +03:00
parent fe8070f0d4
commit 1dc48360dc
9 changed files with 103 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/ru/betterend/blocks/basis/BlockFence.java
View file

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis; package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -9,14 +10,44 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.FenceBlock; import net.minecraft.block.FenceBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext; import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockFence extends FenceBlock { public class BlockFence extends FenceBlock implements Patterned {
private final Block parent;
public BlockFence(Block source) { public BlockFence(Block source) {
super(FabricBlockSettings.copyOf(source).nonOpaque()); super(FabricBlockSettings.copyOf(source).nonOpaque());
this.parent = source;
} }
@Override @Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) { public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
return Collections.singletonList(new ItemStack(this)); return Collections.singletonList(new ItemStack(this));
} }
@Override
public String getStatesPattern(Reader data, String block) {
Identifier parentId = Registry.BLOCK.getId(parent);
return Patterned.createJson(data, parentId, block);
}
@Override
public String getModelPattern(String block) {
Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("item")) {
return Patterned.createJson(Patterned.FENCE_ITEM_MODEL, parentId, block);
}
if (block.contains("side")) {
return Patterned.createJson(Patterned.FENCE_SIDE_MODEL, parentId, block);
}
return Patterned.createJson(Patterned.FENCE_POST_MODEL, parentId, block);
}
@Override
public Identifier statePatternId() {
return Patterned.FENCE_STATES_PATTERN;
}
} }

1
src/main/java/ru/betterend/blocks/basis/BlockPillar.java
View file

@ -34,6 +34,7 @@ public class BlockPillar extends PillarBlock implements Patterned {
return Patterned.createJson(Patterned.PILLAR_BLOCK_MODEL, blockId, block); return Patterned.createJson(Patterned.PILLAR_BLOCK_MODEL, blockId, block);
} }
@Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.PILLAR_STATES_PATTERN; return Patterned.PILLAR_STATES_PATTERN;
} }

4
src/main/java/ru/betterend/interfaces/Patterned.java
View file

@ -20,6 +20,7 @@ public interface Patterned {
public final static Identifier SLAB_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_slab.json"); public final static Identifier SLAB_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_slab.json");
public final static Identifier STAIRS_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_stairs.json"); public final static Identifier STAIRS_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_stairs.json");
public final static Identifier WALL_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_wall.json"); public final static Identifier WALL_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_wall.json");
public final static Identifier FENCE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_fence.json");
public final static Identifier BUTTON_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_button.json"); public final static Identifier BUTTON_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_button.json");
public final static Identifier PILLAR_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pillar.json"); public final static Identifier PILLAR_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pillar.json");
public final static Identifier PLATE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pressure_plate.json"); public final static Identifier PLATE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pressure_plate.json");
@ -35,6 +36,8 @@ public interface Patterned {
public final static Identifier WALL_POST_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_post.json"); public final static Identifier WALL_POST_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_post.json");
public final static Identifier WALL_SIDE_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_side.json"); public final static Identifier WALL_SIDE_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_side.json");
public final static Identifier WALL_SIDE_TALL_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_side_tall.json"); public final static Identifier WALL_SIDE_TALL_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_side_tall.json");
public final static Identifier FENCE_POST_MODEL = BetterEnd.makeID("patterns/block/pattern_fence_post.json");
public final static Identifier FENCE_SIDE_MODEL = BetterEnd.makeID("patterns/block/pattern_fence_side.json");
public final static Identifier BUTTON_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_button.json"); public final static Identifier BUTTON_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_button.json");
public final static Identifier BUTTON_PRESSED_MODEL = BetterEnd.makeID("patterns/block/pattern_button_pressed.json"); public final static Identifier BUTTON_PRESSED_MODEL = BetterEnd.makeID("patterns/block/pattern_button_pressed.json");
public final static Identifier PILLAR_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_pillar.json"); public final static Identifier PILLAR_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_pillar.json");
@ -48,6 +51,7 @@ public interface Patterned {
//Models Item //Models Item
public final static Identifier WALL_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_wall.json"); public final static Identifier WALL_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_wall.json");
public final static Identifier FENCE_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_fence.json");
public final static Identifier BUTTON_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_button.json"); public final static Identifier BUTTON_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_button.json");
public final static Identifier ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_item.json"); public final static Identifier ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_item.json");

209
src/main/resources/assets/betterend/blockstates/pythadendron_stairs.json
View file

@ -1,209 +0,0 @@
{
"variants": {
"facing=east,half=bottom,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"y": 270
},
"facing=east,half=bottom,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs"
},
"facing=east,half=bottom,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"y": 270
},
"facing=east,half=bottom,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs"
},
"facing=east,half=bottom,shape=straight": {
"model": "betterend:block/pythadendron_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180
},
"facing=east,half=top,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=east,half=top,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180
},
"facing=east,half=top,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=east,half=top,shape=straight": {
"model": "betterend:block/pythadendron_stairs",
"uvlock": true,
"x": 180
},
"facing=north,half=bottom,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"y": 180
},
"facing=north,half=bottom,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"y": 270
},
"facing=north,half=bottom,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"y": 180
},
"facing=north,half=bottom,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"y": 270
},
"facing=north,half=bottom,shape=straight": {
"model": "betterend:block/pythadendron_stairs",
"uvlock": true,
"y": 270
},
"facing=north,half=top,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=north,half=top,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180
},
"facing=north,half=top,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=north,half=top,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180
},
"facing=north,half=top,shape=straight": {
"model": "betterend:block/pythadendron_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=south,half=bottom,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs"
},
"facing=south,half=bottom,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"y": 90
},
"facing=south,half=bottom,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs"
},
"facing=south,half=bottom,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"y": 90
},
"facing=south,half=bottom,shape=straight": {
"model": "betterend:block/pythadendron_stairs",
"uvlock": true,
"y": 90
},
"facing=south,half=top,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=south,half=top,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=south,half=top,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=south,half=top,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=south,half=top,shape=straight": {
"model": "betterend:block/pythadendron_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=west,half=bottom,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"y": 90
},
"facing=west,half=bottom,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"y": 180
},
"facing=west,half=bottom,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"y": 90
},
"facing=west,half=bottom,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"y": 180
},
"facing=west,half=bottom,shape=straight": {
"model": "betterend:block/pythadendron_stairs",
"uvlock": true,
"y": 180
},
"facing=west,half=top,shape=inner_left": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=west,half=top,shape=inner_right": {
"model": "betterend:block/pythadendron_inner_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=west,half=top,shape=outer_left": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=west,half=top,shape=outer_right": {
"model": "betterend:block/pythadendron_outer_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=west,half=top,shape=straight": {
"model": "betterend:block/pythadendron_stairs",
"uvlock": true,
"x": 180,
"y": 180
}
}
}

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

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

6
src/main/resources/assets/betterend/patterns/block/pattern_fence_post.json Normal file
View file

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

6
src/main/resources/assets/betterend/patterns/block/pattern_fence_side.json Normal file
View file

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

48
src/main/resources/assets/betterend/patterns/blockstate/pattern_fence.json Normal file
View file

@ -0,0 +1,48 @@
{
"multipart": [
{
"apply": {
"model": "betterend:pattern/%block%/%block%_post"
}
},
{
"apply": {
"model": "betterend:pattern/%block%/%block%_side",
"uvlock": true
},
"when": {
"north": true
}
},
{
"apply": {
"model": "betterend:pattern/%block%/%block%_side",
"uvlock": true,
"y": 90
},
"when": {
"east": true
}
},
{
"apply": {
"model": "betterend:pattern/%block%/%block%_side",
"uvlock": true,
"y": 180
},
"when": {
"south": true
}
},
{
"apply": {
"model": "betterend:pattern/%block%/%block%_side",
"uvlock": true,
"y": 270
},
"when": {
"west": true
}
}
]
}

6
src/main/resources/assets/betterend/patterns/item/pattern_fence.json Normal file
View file

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