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

Colored lanterns

Browse source
This commit is contained in:
paulevsGitch 2020-11-27 01:50:11 +03:00
parent 6564429aa1
commit 3399253010
31 changed files with 378 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTyp
public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;
public BlockBulbVineLantern() {
super(FabricBlockSettings.of(Material.METAL)
this(FabricBlockSettings.of(Material.METAL)
.sounds(BlockSoundGroup.LANTERN)
.hardness(1)
.resistance(1)
@ -40,6 +40,10 @@ public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTyp
.luminance(15));
}
public BlockBulbVineLantern(FabricBlockSettings settings) {
super(settings);
}
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> stateManager) {
stateManager.add(WATERLOGGED);

54
src/main/java/ru/betterend/blocks/BlockBulbVineLanternColored.java Normal file
View file

@ -0,0 +1,54 @@
package ru.betterend.blocks;
import java.io.Reader;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.client.color.block.BlockColorProvider;
import net.minecraft.client.color.item.ItemColorProvider;
import net.minecraft.util.Identifier;
import ru.betterend.interfaces.IColorProvider;
import ru.betterend.patterns.BlockPatterned;
import ru.betterend.patterns.Patterns;
public class BlockBulbVineLanternColored extends BlockBulbVineLantern implements IColorProvider, BlockPatterned {
private final BlockColorProvider blockProvider;
private final ItemColorProvider itemProvider;
public BlockBulbVineLanternColored(FabricBlockSettings settings) {
super(settings);
blockProvider = (state, world, pos, tintIndex) -> {
return this.getDefaultMaterialColor().color;
};
itemProvider = (stack, tintIndex) -> {
return this.getDefaultMaterialColor().color;
};
}
@Override
public BlockColorProvider getProvider() {
return blockProvider;
}
@Override
public ItemColorProvider getItemProvider() {
return itemProvider;
}
@Override
public String getStatesPattern(Reader data) {
String path = "betterend:block/bulb_lantern_colored";
return Patterns.createJson(data, path, path);
}
@Override
public String getModelPattern(String block) {
return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_COLORED, "", "");
}
@Override
public Identifier statePatternId() {
return Patterns.STATE_DIRECT;
}
}

33
src/main/java/ru/betterend/blocks/complex/ColoredMaterial.java Normal file
View file

@ -0,0 +1,33 @@
package ru.betterend.blocks.complex;
import java.util.Map;
import java.util.function.Function;
import com.google.common.collect.Maps;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.item.DyeItem;
import net.minecraft.util.DyeColor;
import net.minecraft.util.registry.Registry;
import ru.betterend.recipe.builders.GridRecipe;
import ru.betterend.registry.EndBlocks;
public class ColoredMaterial {
private final Map<DyeColor, Block> colors = Maps.newEnumMap(DyeColor.class);
public ColoredMaterial(Function<FabricBlockSettings, Block> constructor, Block source) {
String id = Registry.BLOCK.getId(source).getPath();
for (DyeColor color: DyeColor.values()) {
Block block = constructor.apply(FabricBlockSettings.copyOf(source).materialColor(color));
String blockName = id + "_" + color.getName();
EndBlocks.registerBlock(blockName, block);
GridRecipe.make(blockName, block).setList("#D").addMaterial('#', source).addMaterial('D', DyeItem.byColor(color)).build();
colors.put(color, block);
}
}
public Block getByColor(DyeColor color) {
return colors.get(color);
}
}

2
src/main/java/ru/betterend/patterns/Patterns.java
View file

@ -33,6 +33,7 @@ public class Patterns {
public final static Identifier STATE_BARREL = BetterEnd.makeID("patterns/blockstate/pattern_barrel.json");
public final static Identifier STATE_PEDESTAL = BetterEnd.makeID("patterns/blockstate/pattern_pedestal.json");
public final static Identifier STATE_STONE_LANTERN = BetterEnd.makeID("patterns/blockstate/stone_lantern.json");
public final static Identifier STATE_DIRECT = BetterEnd.makeID("patterns/blockstate/pattern_direct.json");
//Models Block
public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/pattern_empty.json");
@ -74,6 +75,7 @@ public class Patterns {
public final static Identifier BLOCK_BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json");
public final static Identifier BLOCK_STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json");
public final static Identifier BLOCK_STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json");
public final static Identifier BLOCK_BULB_LANTERN_COLORED = BetterEnd.makeID("models/block/bulb_lantern_colored.json");
//Models Item
public final static Identifier ITEM_WALL = BetterEnd.makeID("patterns/item/pattern_wall.json");

2
src/main/java/ru/betterend/recipe/CraftingRecipes.java
View file

@ -113,7 +113,7 @@ public class CraftingRecipes {
GridRecipe.make("amber_gem", EndItems.AMBER_GEM).setShape("##", "##").addMaterial('#', EndItems.RAW_AMBER).build();
GridRecipe.make("amber_block", EndBlocks.AMBER_BLOCK).setShape("###", "###", "###").addMaterial('#', EndItems.AMBER_GEM).build();
GridRecipe.make("bulb_lantern", EndBlocks.BULB_VINE_LANTERN).addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).setShape("C", "I", "#").addMaterial('#', EndItems.GLOWING_BULB).build();
GridRecipe.make("bulb_lantern", EndBlocks.BULB_LANTERN).addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).setShape("C", "I", "#").addMaterial('#', EndItems.GLOWING_BULB).build();
}
private static void registerLantern(String name, Block lantern, Block slab) {

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

@ -17,6 +17,7 @@ import ru.betterend.blocks.BlockBlueVineSeed;
import ru.betterend.blocks.BlockBubbleCoral;
import ru.betterend.blocks.BlockBulbVine;
import ru.betterend.blocks.BlockBulbVineLantern;
import ru.betterend.blocks.BlockBulbVineLanternColored;
import ru.betterend.blocks.BlockBulbVineSeed;
import ru.betterend.blocks.BlockChorusGrass;
import ru.betterend.blocks.BlockDragonTreeSapling;
@ -61,6 +62,7 @@ import ru.betterend.blocks.basis.BlockStoneLantern;
import ru.betterend.blocks.basis.BlockVine;
import ru.betterend.blocks.basis.BlockWallMushroom;
import ru.betterend.blocks.basis.BlockWallPlant;
import ru.betterend.blocks.complex.ColoredMaterial;
import ru.betterend.blocks.complex.StoneMaterial;
import ru.betterend.blocks.complex.WoodenMaterial;
import ru.betterend.config.MainConfig;
@ -189,7 +191,9 @@ public class EndBlocks {
public static final Block PURPUR_LANTERN = registerBlock("purpur_lantern", new BlockStoneLantern(Blocks.PURPUR_BLOCK));
public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new BlockStoneLantern(Blocks.END_STONE));
public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new BlockStoneLantern(Blocks.BLACKSTONE));
public static final Block BULB_VINE_LANTERN = registerBlock("bulb_vine_lantern", new BlockBulbVineLantern());
public static final Block BULB_LANTERN = registerBlock("bulb_lantern", new BlockBulbVineLantern());
public static final ColoredMaterial BULB_LANTERN_COLORED = new ColoredMaterial(BlockBulbVineLanternColored::new, BULB_LANTERN);
// Blocks With Entity //
public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter());