From ca53495c08524d5bde7e5969994c6002f153931e Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 22 Jul 2020 16:01:10 -0400 Subject: [PATCH] Add More PoeticRainbow Textures --- .../energonrelics/block/BlockBreakerBlock.java | 2 +- .../energonrelics/block/DefensiveLaserBlock.java | 3 ++- .../block/structure/StructureGeneratorBlock.java | 4 ++-- .../textures/block/block_breaker_off.png | Bin 0 -> 805 bytes .../textures/block/block_breaker_on.png | Bin 0 -> 853 bytes .../textures/block/block_breaker_side.png | Bin 0 -> 898 bytes .../models/item/research_complex_generator.json | 3 +++ 7 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_off.png create mode 100644 src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_on.png create mode 100644 src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_side.png create mode 100644 src/main/resources/assets/energonrelics/models/item/research_complex_generator.json diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java index e8f1b7e..e2328c8 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java @@ -21,7 +21,7 @@ public class BlockBreakerBlock extends FacingEnergyProviderBlock { public static final BooleanProperty POWERED = Properties.POWERED; public BlockBreakerBlock() { - super(FabricBlockSettings.copy(Blocks.BLACKSTONE).strength(2.0F, 6.0F).lightLevel(state -> state.get(POWERED) ? 7 : 0)); + super(FabricBlockSettings.copy(Blocks.BLACKSTONE).strength(2.0F, 6.0F).nonOpaque().lightLevel(state -> state.get(POWERED) ? 7 : 0)); setDefaultState(getDefaultState().with(POWERED, false)); } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java index 3d15b69..dd98387 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java @@ -14,6 +14,7 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; @@ -26,7 +27,7 @@ public class DefensiveLaserBlock extends EnergyProviderBlock { public static final BooleanProperty POWERED = Properties.POWERED; public DefensiveLaserBlock() { - super(FabricBlockSettings.of(Material.GLASS, MaterialColor.BLACK).requiresTool().strength(50.0F, 1200.0F).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).lightLevel(state -> state.get(POWERED) ? 7 : 0)); + super(FabricBlockSettings.of(Material.GLASS, MaterialColor.BLACK).sounds(BlockSoundGroup.GLASS).requiresTool().strength(50.0F, 1200.0F).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).lightLevel(state -> state.get(POWERED) ? 7 : 0)); setDefaultState(getDefaultState().with(POWERED, false)); } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java index b3d9baf..51ebcad 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java @@ -9,7 +9,7 @@ import net.earthcomputer.libstructure.LibStructure; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Material; +import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.server.world.ServerWorld; @@ -49,7 +49,7 @@ public class StructureGeneratorBlock extends SimpleBlockWithEntity { final StructurePieceType piece = (structureManager, tag) -> new StructureGeneratorPiece(this, tag); private StructureGeneratorBlock(StructureGeneratorBlockEntity.StructurePartFactory structureFactory, StructureConfig structureConfig) { - super(FabricBlockSettings.of(Material.STONE).strength(-1f, 3600000f).dropsNothing()); + super(FabricBlockSettings.copy(Blocks.BEDROCK)); setDefaultState(getDefaultState().with(HORIZONTAL_FACING, Direction.NORTH)); this.structureFactory = structureFactory; this.structureConfig = structureConfig; diff --git a/src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_off.png b/src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_off.png new file mode 100644 index 0000000000000000000000000000000000000000..3e6fa8e94401ad8f7f447724f3d7a6c8d89af976 GIT binary patch literal 805 zcmV+=1KRwFP)4Tx04UFukvmHRK@^3*7$u?+5iLY4Qbe(c5ELY(#v)A+i4lz2WH&D%k7YMO zf~{a<5wH+#d=>r!Z3SBeK~Mw{3x9#HM#6e02_%RX&M+OctFp@6T*kWK2r`Te5G`)&d-X|b$(ZDMkBLwH`UXVZegv3^^BPl9uxNFvL(H7 z9(5CUGQYSWbx77Q77;=O@t{#+jVwjRrRF8G-+lg?Z;pa^bom;TF~yN4BVM1VCFz=! zni4%JGfP?J{xeT2H91l5?hZo7lWo6^fNKY;72EzgvhC_II3M96-}DzGr@)8km8RxB zfZk0wyKHLOE}U<{;DZr2<2A`Ct1Xp+*Hh?;LH`YOt<>~nGt(G7W`YuMX|QTe}j z^&8R*XZ7tnbKL*{010qNS#tmY3lRVS3lRZ-WM7d000C7=L_t(IPmNN`PQx$|^x8@D z5JCcqREYyOIB?*^|9=mnLeNJNdu=b{*g%Ua)X_-UY-ZLI+w}7Atj@+@r)1cTLut%# z-j_;Aj8e)3(b{M{C+A@Op%4C>Atp;9&x6d}&FXW%b>2ZCQ8;i`3q&!1&ROpv<`6@( zXp(`5x~2t{qPnW11Whz&P<6FHCsUKIOm!3q>sp=`+qc!nD~N)bz1AwiBAZ3uwf*TxdC~uo4D5Mw6X?BvH+oI74k3{Q zuMmvW06Mm)e2a6;FDX53;${>c;ZPVsR$*>vr&NC@8+92yl6>@`Ica^Ep zPoIpzl=2TH65GsbMmZT0pN^9MM#7D`>@T3eq;gE!;2z~QOXncc4%fypgW&*aQxAag jFwoQeBeoSUXF;himP9%OJ;DGs00000NkvXXu0mjf&R}QK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_on.png b/src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_on.png new file mode 100644 index 0000000000000000000000000000000000000000..0bc5b5efcc1fd342f77ea1b1e1573bf4ea6bb74a GIT binary patch literal 853 zcmV-b1FHOqP)4Tx04UFukvmHRK@^3*7$u?+5iLY4Qbe(c5ELY(#v)A+i4lz2WH&D%k7YMO zf~{a<5wH+#d=>r!Z3SBeK~Mw{3x9#HM#6e02_%RX&M+OctFp@6T*kWK2r`Te5G`)&d-X|b$(ZDMkBLwH`UXVZegv3^^BPl9uxNFvL(H7 z9(5CUGQYSWbx77Q77;=O@t{#+jVwjRrRF8G-+lg?Z;pa^bom;TF~yN4BVM1VCFz=! zni4%JGfP?J{xeT2H91l5?hZo7lWo6^fNKY;72EzgvhC_II3M96-}DzGr@)8km8RxB zfZk0wyKHLOE}U<{;DZr2<2A`Ct1Xp+*Hh?;LH`YOt<>~nGt(G7W`YuMX|QTe}j z^&8R*XZ7tnbKL*{010qNS#tmY3lRVS3lRZ-WM7d000D(bL_t(IPmNMLP6IIz9eeET zW+5aB4H8ADprD|lpyLRffQxbhjzGhw2Z<1}yZ+5E&YB<)MV{Wu_bJ z*7e!&*|p`z20q3T0TXcvGgxcXvi9DKb<3FIHxp$`Vb~qliPIRE?@^P)d!fS_q)5v4)dX3MCnUHY52nP%CZFWWz_h_A!JMtyCG^ZTEJw zUS0R=19neXF^WAyPArCPNt#L2CoV1sW(*AxvU?!iM<1deO3F=7n!WjCb~Kq;fI+>0 z4GFHC91GLB8Q0CoRwDj&OA`M=?z7&RtWlS379icAUKZE;}XX8T<%DG$cZ%F#w!};P& ft~Hmr3jn?V?kF{fNJo&|00000NkvXXu0mjfdxLxJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_side.png b/src/main/resources/assets/energonrelics-poeticrainbow/textures/block/block_breaker_side.png new file mode 100644 index 0000000000000000000000000000000000000000..49db21e219033cea803182d238bf9e212ce70288 GIT binary patch literal 898 zcmV-|1AY97P)4Tx04UFukvmHRK@^3*7$u?+5iLY4Qbe(c5ELY(#v)A+i4lz2WH&D%k7YMO zf~{a<5wH+#d=>r!Z3SBeK~Mw{3x9#HM#6e02_%RX&M+OctFp@6T*kWK2r`Te5G`)&d-X|b$(ZDMkBLwH`UXVZegv3^^BPl9uxNFvL(H7 z9(5CUGQYSWbx77Q77;=O@t{#+jVwjRrRF8G-+lg?Z;pa^bom;TF~yN4BVM1VCFz=! zni4%JGfP?J{xeT2H91l5?hZo7lWo6^fNKY;72EzgvhC_II3M96-}DzGr@)8km8RxB zfZk0wyKHLOE}U<{;DZr2<2A`Ct1Xp+*Hh?;LH`YOt<>~nGt(G7W`YuMX|QTe}j z^&8R*XZ7tnbKL*{010qNS#tmY3lRVS3lRZ-WM7d000FW|L_t(IPmNN`Zqq;%9nXv% zJ8_~=R0$CwBv67-7p#!z7xXi_?H91_n(ttTgjlfTH&_K_M@XBr%ENK&dEK7L7y@(w zN7we5>wA6A98dIm^ospA%DVCm#jb1;dnjWX#>hEps0VQ_IG&YKX#Ew&nxA2vZ)rmB zKO_bZAFZ|=32X3OSi_Iw&fhe(%0H;;(n;^c6#2{D2lRH3fInZmBJBXoJVhR ziT#1k4DDnmZDl;-Qb<2xv06eBUc&9?Zn1MzSvE*`Nd!KX$1pHS8e9L66d<^_E*5@! z8b9%HQht*pgvhfFgn`5|M)*U7Ja3kWAjvnZ%R*@#0&@c(<1b)>-^0n%7qB%<{5Kf8 Y0}@?PPz_RkbN~PV07*qoM6N<$f(Ra!J^%m! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics/models/item/research_complex_generator.json b/src/main/resources/assets/energonrelics/models/item/research_complex_generator.json new file mode 100644 index 0000000..98b86b0 --- /dev/null +++ b/src/main/resources/assets/energonrelics/models/item/research_complex_generator.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:block/structure_block_load" +} \ No newline at end of file