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

Patterns

Browse source
This commit is contained in:
Aleksey 2020-10-13 17:54:18 +03:00
parent 0d5e6d544c
commit f862bc8792
57 changed files with 493 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/ru/betterend/blocks/basis/BlockBase.java
View file

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -7,8 +8,11 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockBase extends Block {
public class BlockBase extends Block implements Patterned {
public BlockBase(Settings settings) {
super(settings);
}
@ -17,4 +21,20 @@ public class BlockBase extends Block {
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
return Collections.singletonList(new ItemStack(this));
}
@Override
public String getStatesPattern(Reader data, String block) {
Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(data, blockId, block);
}
@Override
public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, blockId, block);
}
public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN;
}
}

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

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -7,8 +8,11 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.PillarBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockPillar extends PillarBlock {
public class BlockPillar extends PillarBlock implements Patterned {
public BlockPillar(Settings settings) {
super(settings);
}
@ -17,4 +21,20 @@ public class BlockPillar extends PillarBlock {
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
return Collections.singletonList(new ItemStack(this));
}
@Override
public String getStatesPattern(Reader data, String block) {
Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(data, blockId, block);
}
@Override
public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(Patterned.PILLAR_BLOCK_MODEL, blockId, block);
}
public Identifier statePatternId() {
return Patterned.PILLAR_STATES_PATTERN;
}
}

29
src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java
View file

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -9,14 +10,40 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.PressurePlateBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockPressurePlate extends PressurePlateBlock {
public class BlockPressurePlate extends PressurePlateBlock implements Patterned {
private final Block parent;
public BlockPressurePlate(Block source) {
super(ActivationRule.EVERYTHING, FabricBlockSettings.copyOf(source).nonOpaque());
this.parent = source;
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
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("down")) {
return Patterned.createJson(Patterned.PLATE_MODEL_DOWN, parentId, block);
}
return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, block);
}
public Identifier statePatternId() {
return Patterned.PLATE_STATES_PATTERN;
}
}

15
src/main/java/ru/betterend/blocks/basis/BlockSlab.java
View file

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -11,14 +12,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.interfaces.Patterned;
public class BlockSlab extends SlabBlock implements Patterned {
private final static Identifier STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_slab.json");
private final static Identifier MODEL_PATTERN = BetterEnd.makeID("patterns/block/pattern_slab.json");
private final Block parent;
public BlockSlab(Block source) {
@ -32,18 +29,18 @@ public class BlockSlab extends SlabBlock implements Patterned {
}
@Override
public String blockStatePattern(String name) {
public String getStatesPattern(Reader data, String block) {
Identifier parentId = Registry.BLOCK.getId(parent);
return Patterned.createJson(STATES_PATTERN, parentId.getPath());
return Patterned.createJson(data, parentId, block);
}
@Override
public String modelPattern(String name) {
public String getModelPattern(String block) {
Identifier parentId = Registry.BLOCK.getId(parent);
return Patterned.createJson(MODEL_PATTERN, parentId.getPath());
return Patterned.createJson(Patterned.SLAB_BLOCK_MODEL, parentId, block);
}
public Identifier statePatternId() {
return STATES_PATTERN;
return Patterned.SLAB_STATES_PATTERN;
}
}

32
src/main/java/ru/betterend/blocks/basis/BlockStairs.java
View file

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -9,14 +10,43 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.StairsBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockStairs extends StairsBlock {
public class BlockStairs extends StairsBlock implements Patterned {
private final Block parent;
public BlockStairs(Block source) {
super(source.getDefaultState(), FabricBlockSettings.copyOf(source));
this.parent = source;
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
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("inner")) {
return Patterned.createJson(Patterned.STAIRS_MODEL_INNER, parentId, block);
}
if (block.contains("outer")) {
return Patterned.createJson(Patterned.STAIRS_MODEL_OUTER, parentId, block);
}
return Patterned.createJson(Patterned.STAIRS_MODEL, parentId, block);
}
public Identifier statePatternId() {
return Patterned.STAIRS_STATES_PATTERN;
}
}

35
src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java
View file

@ -1,22 +1,55 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.StoneButtonBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
public class BlockStoneButton extends StoneButtonBlock {
import ru.betterend.interfaces.Patterned;
public class BlockStoneButton extends StoneButtonBlock implements Patterned {
private final Block parent;
public BlockStoneButton(Block source) {
super(FabricBlockSettings.copyOf(source).nonOpaque());
this.parent = source;
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
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.BUTTON_ITEM_MODEL, parentId, block);
}
if (block.contains("pressed")) {
return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, block);
}
return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, block);
}
@Override
public Identifier statePatternId() {
return Patterned.BUTTON_STATES_PATTERN;
}
}

29
src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java
View file

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -9,14 +10,40 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.PressurePlateBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockStonePressurePlate extends PressurePlateBlock {
public class BlockStonePressurePlate extends PressurePlateBlock implements Patterned {
private final Block parent;
public BlockStonePressurePlate(Block source) {
super(ActivationRule.MOBS, FabricBlockSettings.copyOf(source).nonOpaque());
this.parent = source;
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
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("down")) {
return Patterned.createJson(Patterned.PLATE_MODEL_DOWN, parentId, block);
}
return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, block);
}
public Identifier statePatternId() {
return Patterned.PLATE_STATES_PATTERN;
}
}

35
src/main/java/ru/betterend/blocks/basis/BlockWall.java
View file

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -9,14 +10,46 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.WallBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockWall extends WallBlock {
public class BlockWall extends WallBlock implements Patterned {
private final Block parent;
public BlockWall(Block source) {
super(FabricBlockSettings.copyOf(source).nonOpaque());
this.parent = source;
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
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.WALL_ITEM_MODEL, parentId, block);
}
if (block.contains("side_tall")) {
return Patterned.createJson(Patterned.WALL_SIDE_TALL_MODEL, parentId, block);
}
if (block.contains("side")) {
return Patterned.createJson(Patterned.WALL_SIDE_MODEL, parentId, block);
}
return Patterned.createJson(Patterned.WALL_POST_MODEL, parentId, block);
}
public Identifier statePatternId() {
return Patterned.WALL_STATES_PATTERN;
}
}

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

@ -1,5 +1,6 @@
package ru.betterend.blocks.basis;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
@ -9,14 +10,44 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.WoodenButtonBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.Patterned;
public class BlockWoodenButton extends WoodenButtonBlock {
public class BlockWoodenButton extends WoodenButtonBlock implements Patterned {
private final Block parent;
public BlockWoodenButton(Block source) {
super(FabricBlockSettings.copyOf(source).nonOpaque());
this.parent = source;
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
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.BUTTON_ITEM_MODEL, parentId, block);
}
if (block.contains("pressed")) {
return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, block);
}
return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, block);
}
@Override
public Identifier statePatternId() {
return Patterned.BUTTON_STATES_PATTERN;
}
}

20
src/main/java/ru/betterend/blocks/complex/StoneMaterial.java
View file

@ -38,8 +38,8 @@ public class StoneMaterial {
FabricBlockSettings material = FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color);
stone = BlockRegistry.registerBlock(name, new BlockBase(material));
tile = BlockRegistry.registerBlock(name + "_tile", new BlockBase(material));
small_tiles = BlockRegistry.registerBlock(name + "_small_tiles", new BlockBase(material));
tile = BlockRegistry.registerBlock(name + "_polished", new BlockBase(material));
small_tiles = BlockRegistry.registerBlock(name + "_tiles", new BlockBase(material));
pillar = BlockRegistry.registerBlock(name + "_pillar", new BlockPillar(material));
stairs = BlockRegistry.registerBlock(name + "_stairs", new BlockStairs(stone));
slab = BlockRegistry.registerBlock(name + "_slab", new BlockSlab(stone));
@ -48,23 +48,23 @@ public class StoneMaterial {
pressure_plate = BlockRegistry.registerBlock(name + "_plate", new BlockStonePressurePlate(stone));
bricks = BlockRegistry.registerBlock(name + "_bricks", new BlockBase(material));
brick_stairs = BlockRegistry.registerBlock(name + "_brick_stairs", new BlockStairs(bricks));
brick_slab = BlockRegistry.registerBlock(name + "_brick_slab", new BlockSlab(bricks));
brick_wall = BlockRegistry.registerBlock(name + "_brick_wall", new BlockWall(bricks));
brick_stairs = BlockRegistry.registerBlock(name + "_bricks_stairs", new BlockStairs(bricks));
brick_slab = BlockRegistry.registerBlock(name + "_bricks_slab", new BlockSlab(bricks));
brick_wall = BlockRegistry.registerBlock(name + "_bricks_wall", new BlockWall(bricks));
// Recipes //
RecipeBuilder.make(name + "_bricks", bricks).setOutputCount(4).setShape("##", "##").addMaterial('#', stone).setGroup("end_bricks").build();
RecipeBuilder.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', bricks).setGroup("end_tile").build();
RecipeBuilder.make(name + "_small_tiles", small_tiles).setOutputCount(4).setShape("##", "##").addMaterial('#', tile).setGroup("end_small_tile").build();
RecipeBuilder.make(name + "_polished", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', bricks).setGroup("end_tile").build();
RecipeBuilder.make(name + "_tiles", small_tiles).setOutputCount(4).setShape("##", "##").addMaterial('#', tile).setGroup("end_small_tile").build();
RecipeBuilder.make(name + "_pillar", pillar).setShape("#", "#").addMaterial('#', slab).setGroup("end_pillar").build();
RecipeBuilder.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', stone).setGroup("end_stone_stairs").build();
RecipeBuilder.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', stone).setGroup("end_stone_slabs").build();
RecipeBuilder.make(name + "_brick_stairs", brick_stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', bricks).setGroup("end_stone_stairs").build();
RecipeBuilder.make(name + "_brick_slab", brick_slab).setOutputCount(6).setShape("###").addMaterial('#', bricks).setGroup("end_stone_slabs").build();
RecipeBuilder.make(name + "_bricks_stairs", brick_stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', bricks).setGroup("end_stone_stairs").build();
RecipeBuilder.make(name + "_bricks_slab", brick_slab).setOutputCount(6).setShape("###").addMaterial('#', bricks).setGroup("end_stone_slabs").build();
RecipeBuilder.make(name + "_wall", wall).setOutputCount(6).setShape("###", "###").addMaterial('#', stone).setGroup("end_wall").build();
RecipeBuilder.make(name + "_brick_wall", brick_wall).setOutputCount(6).setShape("###", "###").addMaterial('#', bricks).setGroup("end_wall").build();
RecipeBuilder.make(name + "_bricks_wall", brick_wall).setOutputCount(6).setShape("###", "###").addMaterial('#', bricks).setGroup("end_wall").build();
RecipeBuilder.make(name + "_button", button).setList("#").addMaterial('#', stone).setGroup("end_stone_buttons").build();
RecipeBuilder.make(name + "_pressure_plate", pressure_plate).setShape("##").addMaterial('#', stone).setGroup("end_stone_plates").build();

2
src/main/java/ru/betterend/blocks/model/SlabModel.java
View file

@ -18,6 +18,7 @@ import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedQuad;
@ -35,6 +36,7 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.BlockRenderView;
import ru.betterend.BetterEnd;
public class SlabModel implements UnbakedModel, BakedModel, FabricBakedModel {