From 36fa1ade9d1873a61f99ce804e4ea93ba818842d Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 5 Nov 2020 22:51:36 +0300 Subject: [PATCH] Infusion pedestal (WIP), fix for #11 --- psd/infusion_pedestal.psd | Bin 0 -> 23222 bytes .../ru/betterend/blocks/BlockProperties.java | 22 ++++-- .../ru/betterend/blocks/InfusionPedestal.java | 16 +++- .../betterend/blocks/basis/BlockPedestal.java | 8 ++ .../entities/render/PedestalItemRenderer.java | 10 +-- .../betterend/registry/EndBlockEntities.java | 3 + .../java/ru/betterend/registry/EndBlocks.java | 2 + .../ru/betterend/rituals/InfusionRitual.java | 4 +- .../blockstates/infusion_pedestal.json | 22 ++++++ .../block/infusion_pedestal_bottom.json | 8 ++ .../block/infusion_pedestal_column.json | 8 ++ .../block/infusion_pedestal_column_top.json | 7 ++ .../block/infusion_pedestal_default.json | 73 ++++++++++++++++++ .../block/infusion_pedestal_pillar.json | 6 ++ .../models/block/infusion_pedestal_top.json | 47 +++++++++++ .../models/block/pedestal_default.json | 2 +- .../models/item/infusion_pedestal.json | 3 + .../textures/block/infusion_pedestal_base.png | Bin 0 -> 602 bytes .../block/infusion_pedestal_pillar.png | Bin 0 -> 662 bytes .../textures/block/infusion_pedestal_top.png | Bin 0 -> 672 bytes 20 files changed, 220 insertions(+), 21 deletions(-) create mode 100644 psd/infusion_pedestal.psd create mode 100644 src/main/resources/assets/betterend/blockstates/infusion_pedestal.json create mode 100644 src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json create mode 100644 src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json create mode 100644 src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json create mode 100644 src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json create mode 100644 src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json create mode 100644 src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json create mode 100644 src/main/resources/assets/betterend/models/item/infusion_pedestal.json create mode 100644 src/main/resources/assets/betterend/textures/block/infusion_pedestal_base.png create mode 100644 src/main/resources/assets/betterend/textures/block/infusion_pedestal_pillar.png create mode 100644 src/main/resources/assets/betterend/textures/block/infusion_pedestal_top.png diff --git a/psd/infusion_pedestal.psd b/psd/infusion_pedestal.psd new file mode 100644 index 0000000000000000000000000000000000000000..c42ca618a8eb131cd4294d17be64209bc444ee43 GIT binary patch literal 23222 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 ETERNAL_PEDESTAL = registerBlockEntity("eternal_pedestal", BlockEntityType.Builder.create(EternalPedestalEntity::new, EndBlocks.ETERNAL_PEDESTAL)); + public final static BlockEntityType INFUSION_PEDESTAL = registerBlockEntity("infusion_pedestal", + BlockEntityType.Builder.create(InfusionPedestalEntity::new, EndBlocks.INFUSION_PEDESTAL)); public static final BlockEntityType CHEST = registerBlockEntity("chest", BlockEntityType.Builder.create(EChestBlockEntity::new, getChests())); public static final BlockEntityType BARREL = registerBlockEntity("barrel", diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index f4409edb..4b03e41c 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -43,6 +43,7 @@ import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.EternalRunedFlavolite; +import ru.betterend.blocks.InfusionPedestal; import ru.betterend.blocks.PedestalVanilla; import ru.betterend.blocks.RunedFlavolite; import ru.betterend.blocks.TerminiteBlock; @@ -158,6 +159,7 @@ public class EndBlocks { // Blocks With Entity // public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter()); public static final Block ETERNAL_PEDESTAL = registerBlock("eternal_pedestal", new EternalPedestal()); + public static final Block INFUSION_PEDESTAL = registerBlock("infusion_pedestal", new InfusionPedestal()); //Technical public static final Block END_PORTAL_BLOCK = registerBlock("end_portal_block", new EndPortalBlock()); diff --git a/src/main/java/ru/betterend/rituals/InfusionRitual.java b/src/main/java/ru/betterend/rituals/InfusionRitual.java index f9d84014..2887283e 100644 --- a/src/main/java/ru/betterend/rituals/InfusionRitual.java +++ b/src/main/java/ru/betterend/rituals/InfusionRitual.java @@ -3,11 +3,9 @@ package ru.betterend.rituals; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.Tickable; -public class InfusionRitual implements Tickable, Inventory { +public class InfusionRitual implements Inventory { - @Override public void tick() { // TODO } diff --git a/src/main/resources/assets/betterend/blockstates/infusion_pedestal.json b/src/main/resources/assets/betterend/blockstates/infusion_pedestal.json new file mode 100644 index 00000000..361a4d38 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/infusion_pedestal.json @@ -0,0 +1,22 @@ +{ + "variants": { + "state=default": { + "model": "betterend:block/infusion_pedestal_default" + }, + "state=pedestal_top": { + "model": "betterend:block/infusion_pedestal_top" + }, + "state=column": { + "model": "betterend:block/infusion_pedestal_column" + }, + "state=column_top": { + "model": "betterend:block/infusion_pedestal_column_top" + }, + "state=bottom": { + "model": "betterend:block/infusion_pedestal_bottom" + }, + "state=pillar": { + "model": "betterend:block/infusion_pedestal_pillar" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json new file mode 100644 index 00000000..2cddb558 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_bottom", + "textures": { + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "bottom": "betterend:block/infusion_pedestal_base" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json new file mode 100644 index 00000000..a14800d7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_column", + "textures": { + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "bottom": "betterend:block/infusion_pedestal_base" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json new file mode 100644 index 00000000..f934033d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/pedestal_column_top", + "textures": { + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json new file mode 100644 index 00000000..7e9504a0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "top": "betterend:block/infusion_pedestal_top", + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "bottom": "betterend:block/infusion_pedestal_base", + "particle": "#base" + }, + "elements": [ + { + "__comment": "eye", + "from": [ 4, 15, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "south": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "west": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "east": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" } + } + }, + { + "__comment": "basin_1", + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } + } + }, + { + "__comment": "basin_2", + "from": [ 2, 3, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 4, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "north": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 13, 1 ], + "to": [ 15, 15, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "east": { "uv": [ 15, 16, 1, 14 ], "texture": "#top" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json new file mode 100644 index 00000000..268ab428 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/pedestal_pillar", + "textures": { + "pillar": "betterend:block/infusion_pedestal_pillar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json new file mode 100644 index 00000000..e4f66fc4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "top": "betterend:block/infusion_pedestal_top", + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "particle": "#base" + }, + "elements": [ + { + "__comment": "eye", + "from": [ 4, 10, 4 ], + "to": [ 12, 11, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "south": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "west": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "east": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 0, 3 ], + "to": [ 13, 8, 13 ], + "faces": { + "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 8, 1 ], + "to": [ 15, 10, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "east": { "uv": [ 15, 16, 1, 14 ], "texture": "#top" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_default.json b/src/main/resources/assets/betterend/models/block/pedestal_default.json index 0ea02919..43fdecb9 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_default.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_default.json @@ -3,7 +3,7 @@ "textures": { "particle": "#base" }, - "elements": [ + "elements": [ { "__comment": "basin_1", "from": [ 0, 0, 0 ], diff --git a/src/main/resources/assets/betterend/models/item/infusion_pedestal.json b/src/main/resources/assets/betterend/models/item/infusion_pedestal.json new file mode 100644 index 00000000..ad8068fc --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/infusion_pedestal.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/infusion_pedestal_default" +} diff --git a/src/main/resources/assets/betterend/textures/block/infusion_pedestal_base.png b/src/main/resources/assets/betterend/textures/block/infusion_pedestal_base.png new file mode 100644 index 0000000000000000000000000000000000000000..b29003287d67c3ec26f5047a87c1437c2f2171c1 GIT binary patch literal 602 zcmV-g0;Tt2_Qw-skO>_5QrA~G$fE5oaaxFahHNnNFv@sVQBU%9*{dto4q0C+D{~^Y!@6 zRzHV;aLFIMpZJ@Qk>t9sa=)S#PBAM=;d%MS|HY|9LCi5NK!(x#ck4x!RF^s{kAQOAv zV?6anrf|w<%x0?ZD3vS|*Ych2jjey;bpC=bxY6|>OW~4lOl4sj-d)++gSG#{2M0UC zMl_`*>h2xMvUrk-Tlvm;c@kFZm}yM4>KEPC82)cEm;8-RWo@4$>dfFEBGJ6JjiYbj zuuLbGd<9a7jXfDJ3la`lX3A2&p?X9t-aMS8fHvXo(I}+XilqR&={;&At)ki^4)r6* zj)Ufj4JX?Y0;hCEIpHsGHbh03^O<5^nbQgPnZs5L4QL}ONriL1a9!S_X+Ry%{UtI$ zmQ%U$wtS%4u*0eLczzR-!pcY`Nuu_hL-#N(N6;OG0Wx_a orNS%|t3R;e+yCFbxVr-I2ib;`L%+VAs{jB107*qoM6N<$f{{xkDF6Tf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/infusion_pedestal_pillar.png b/src/main/resources/assets/betterend/textures/block/infusion_pedestal_pillar.png new file mode 100644 index 0000000000000000000000000000000000000000..d16d3983fb905848f822840baec4ada42317723c GIT binary patch literal 662 zcmV;H0%`q;P)})*oGJ@gs@ptjGcLw@ ztZ|M`r)Xl$D*SEqfkf#?^!jl&4O z8_uT-Q5L)l7-OeHOvm=xXsHZw7JuNh9EtwGIlki##oCuH$R-oYhzD|($YjJAB zea>&KM`Bn2H`D&-+uzeo)r#qzu6+vQ9Ae+_w$|87LR&@cAla2x%NyUav!;!z<9%n{ zHhNc1a^!NlB6u7Ir40iF1Y1kOi4bgLk-%F6n1YQmi9DX4c)mUp!)b8GOT>0ZQANh) zd^{8U5pM;tqu2wAMU2PKv>iPcv=#6cZyY#7DLdk9pmu0uZbsKfQZmJ?fueMwT*V1fZg+r`*ve1D@8NW1jGm-E{vA8UP$>)E`^R#Yop|mQ=UQETr2DCm7+V^ w@~o}t(2YT4)YnWZHSK7xD23V-#=0y20w-TyuOPRcb^rhX07*qoM6N<$f?4`J-v9sr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/infusion_pedestal_top.png b/src/main/resources/assets/betterend/textures/block/infusion_pedestal_top.png new file mode 100644 index 0000000000000000000000000000000000000000..34e0164746dd212bb2957cd44cc3c1b8b30594b3 GIT binary patch literal 672 zcmV;R0$=@!P)s2!VN+K@eD|P0xr4ZF}dQ33!VW45+Fh;w4pTZHoMuiJ;)A+ zj*s;$KtM^vSYo>GL$REP-kqo26cu>GsUiA6>7Lr9-s z#84Uw^!ONXs#t5W;yFA%f%68J9u~%-Z$2T$&<_o({(`81+Knk(ML%@3VTo#FuyYBBb+K*b_`CzOd-bH=GT12>8Qe}GCmA&c$O!od`69b6ig9_5hsS)Y_pCl{K*1#cX