From 48c0ee8ebe3b2c8989a302af0c6cdfb1950273dd Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 22 Jul 2020 17:03:32 -0400 Subject: [PATCH] Add Veridium Powder --- .../energonrelics/EnergonRelics.java | 6 +++++- .../reactor/ReactorControllerBlockEntity.java | 14 ++++++++------ .../entity/reactor/ReactorCoreBlockEntity.java | 4 ++-- .../assets/energonrelics/lang/en_us.json | 3 ++- .../models/item/veridium_powder.json | 6 ++++++ .../textures/item/veridium_powder.png | Bin 0 -> 1771 bytes .../energonrelics/recipes/veridium_powder.json | 8 ++++++++ 7 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/energonrelics/models/item/veridium_powder.json create mode 100644 src/main/resources/assets/energonrelics/textures/item/veridium_powder.png create mode 100644 src/main/resources/data/energonrelics/recipes/veridium_powder.json diff --git a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java index 2462dc5..21e5f02 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java +++ b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java @@ -68,6 +68,8 @@ public class EnergonRelics implements ModInitializer { public static final BlockBreakerBlock BLOCK_BREAKER_BLOCK = new BlockBreakerBlock(); + public static final Item VERIDIUM_POWDER_ITEM = new Item(new Item.Settings().group(ITEM_GROUP)); + @Override public void onInitialize() { NETWORK_CHIP_ITEM = Registry.register(Registry.ITEM, new Identifier(NAMESPACE, "network_chip"), new NetworkChipItem()); @@ -97,8 +99,10 @@ public class EnergonRelics implements ModInitializer { Registry.register(Registry.ITEM, new Identifier(NAMESPACE, "defensive_laser_core"), DEFENSIVE_LASER_CORE_ITEM); DEFENSIVE_LASER_BLOCK.register("defensive_laser"); + StructureGeneratorBlock.register(); + BLOCK_BREAKER_BLOCK.register("block_breaker"); - StructureGeneratorBlock.register(); + Registry.register(Registry.ITEM, new Identifier(NAMESPACE, "veridium_powder"), VERIDIUM_POWDER_ITEM); } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java index a93a0fb..f5efde6 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java @@ -36,25 +36,27 @@ public class ReactorControllerBlockEntity extends EnergyGeneratorBlockEntity { if (getCachedState().get(ReactorControllerBlock.POWERED)) { Reactor reactor = getReactor(); if (reactor != null && !reactor.core.isReacting()) { - int fuelMultiplier = 0; + float fuelMultiplier = 0f; for (ReactorInputBlockEntity input : reactor.inputs) { - if (fuelMultiplier != 0) { + if (fuelMultiplier != 0f) { break; } for (int i = 0; i < input.size(); i++) { Item item = input.getStack(i).getItem(); if (item == EnergonRelics.VERIDIUM_INGOT_ITEM) { - fuelMultiplier = 1; + fuelMultiplier = 1f; } else if (item == EnergonRelics.VERIDIUM_BLOCK_BLOCK.asItem()) { - fuelMultiplier = 9; + fuelMultiplier = 9f; + } else if (item == EnergonRelics.VERIDIUM_POWDER_ITEM) { + fuelMultiplier = 0.25f; } - if (fuelMultiplier != 0) { + if (fuelMultiplier != 0f) { input.removeStack(i, 1); break; } } } - if (fuelMultiplier != 0) { + if (fuelMultiplier != 0f) { reactor.core.startReaction(fuelMultiplier); } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java index 610c361..f92f28e 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java @@ -31,8 +31,8 @@ public class ReactorCoreBlockEntity extends BlockEntity implements Tickable { return reactionTime > 0; } - void startReaction(int fuelMultiplier) { - reactionTime = HardcodedConfig.REACTOR_TIME * fuelMultiplier; + void startReaction(float fuelMultiplier) { + reactionTime = (int) ((float) HardcodedConfig.REACTOR_TIME * fuelMultiplier); } @Override diff --git a/src/main/resources/assets/energonrelics/lang/en_us.json b/src/main/resources/assets/energonrelics/lang/en_us.json index decf303..8527f62 100644 --- a/src/main/resources/assets/energonrelics/lang/en_us.json +++ b/src/main/resources/assets/energonrelics/lang/en_us.json @@ -27,5 +27,6 @@ "death.attack.energonrelics.defensive_laser": "%s was evaporated by a laser", "death.attack.energonrelics.defensive_laser.player": "%s was evaporated by a laser whilst fighting %s", "block.energonrelics.research_complex_generator": "Research Complex Generator", - "block.energonrelics.block_breaker": "Block Breaker" + "block.energonrelics.block_breaker": "Block Breaker", + "item.energonrelics.veridium_powder": "Veridium Powder" } \ No newline at end of file diff --git a/src/main/resources/assets/energonrelics/models/item/veridium_powder.json b/src/main/resources/assets/energonrelics/models/item/veridium_powder.json new file mode 100644 index 0000000..dd9c596 --- /dev/null +++ b/src/main/resources/assets/energonrelics/models/item/veridium_powder.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "energonrelics:item/veridium_powder" + } +} diff --git a/src/main/resources/assets/energonrelics/textures/item/veridium_powder.png b/src/main/resources/assets/energonrelics/textures/item/veridium_powder.png new file mode 100644 index 0000000000000000000000000000000000000000..4f4fb5ec0af1a82e4e2b377558a4e7ce261eee21 GIT binary patch literal 1771 zcmV;P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_dk~1d^eCHH70!VWngN7HG~EJh`X9d!^BaCdR*es$F~w-{^T{X5XsA7YX}z8G>%BYn*0|WsIY2Nm zYCgJ>w||B`e0*@5!~z?j-+@v;8ZoKdLoGW{-Hr>& ze*6jRsAk_>3<8!~z(h>c*|A-3JrMBmWITd5!3TIbqU|}DWlB332)QipB+%XybRqfH zGLP(^tq1ZcZ#zG588=60yc}@h!OrJ2bU!hli0C>Hla;6C>}QOoWAtNn*+(!McSbF; z-7O3p3n=IHSws;$0c}|&p{UKaLh@#-EhyC`M^I%L=UsEz4cAv)T?Ir>odh*eC0;gV zp+uFZPJR|QNH}q0g;Z{AIiO@n+f`s zZuFIMW=i*WC}$wuvu-a`YxAC~OR-}YPEIXj_hGziHl%r8YWY{|{{#K&fd*1%*+ypW z?Q|H)_rsnlcU&p|G$H^o7bLysqwDHOg=1X3?zs-GSJ01O&EG)Js?8m`>x_YCk4hIi zwAj_b{l9D0b__SqZEzP8cVD=x4leuaU`HML%kqC0p37<$n}wUbQu~PfOW@|4Dt`*p zyg>Q|u{f|+uhbEc0(%|Ca?S5R{|c#jGav7H{h;;MNnA|rb$?B8w{=6yb@-2t?*K_h zrxwPE`perNPdV$k?xkxT1;l|WbGKbCXj(ct$zq#5lJWw#Ie?#& zy_Vz+Ma-v?4DYui=55vwT)vx3Z2flS%x3eP>@P)m(4_MY3N%vB%d7apZpd8^K*vYM)V&Hg#U{PH|L+khEAT0ELph#00D$)LqkwWLqi~Na&Km7Y-Iod zc$|HaJxIeq9K~N-r6LsvgNQg}s4iL%6>-!m6rn<>6nN zgNw7S4z7YA_yOYN=%nZ(CH^ldw21NGxF7HCJ?`EC!Fri#R>wG?>9(0l#KlZ@RSdr( zjD83hMO0>%F(*k$_>Ql81o(Ov<5~Xa{v17O&SF47B%Wo4X%lY{PjA`==Y3*<6=jw9 zoOsNn3lcwaUGeyhbHU{x&lJpbYMxji77J~xv@t818u1iyRMm9K4`w`8Id5^+%2n39 zCx2lir>`t?o#qe{Si}+}h)_^P31!%b(W;YTAw~OfAOE21m&m1%s{}@l1yrCxcKzUg z@Vi?pKRMwgMdCo`i{pF@1L0kuQFEN{W5;Qn0HJ5#N^kiqbztU`^jb@c9s#}Ez{Pb- zQ}%$%9bn+ekWJZ@LNtT8hC#Ie000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94 zoEQKA00(qQO+^Rf2No19A242f(EtDdtw}^dR5;7skkJi-KoCR+V+gg_0EG~Z9azEI zgcZ;MK`ev<)H==|44RA|$AWjKMENq#*X$+pZgzqH7R8WaI6Zv4k>vLfilL*bVTqj6 z!rI~!NDzK%Kr!PGXJ`GnYCpS!p11xRBj(gXIp0ytc4P^IB4 zv2z*&b^HDXCGxO#x4U}(2GJ`B04!xa)U8|F5WotXXcXXsRDSSx^Z<9T)t%618aDs{ N002ovPDHLkV1npXI=KJ< literal 0 HcmV?d00001 diff --git a/src/main/resources/data/energonrelics/recipes/veridium_powder.json b/src/main/resources/data/energonrelics/recipes/veridium_powder.json new file mode 100644 index 0000000..794b705 --- /dev/null +++ b/src/main/resources/data/energonrelics/recipes/veridium_powder.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "energonrelics:veridium_ingot" + }, + "result": "energonrelics:veridium_powder", + "count": 4 +} \ No newline at end of file