From ef5ba52ef969f0a845c30393ea6a94db22ec68a0 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Thu, 16 Jul 2020 23:55:31 -0400 Subject: [PATCH] 20w29a Add Thermal Glass Improve Recipes Tweak Defensive Laser --- gradle.properties | 8 ++--- .../thebrokenrail/energonrelics/Config.java | 2 +- .../energonrelics/EnergonRelics.java | 7 +++-- .../block/DefensiveLaserBlock.java | 4 +-- .../block/ThermalGlassBlock.java | 28 ++++++++++++++++++ .../entity/DefensiveLaserBlockEntity.java | 6 ++-- .../PassiveBatteryControllerBlockEntity.java | 6 +++- .../reactor/ReactorControllerBlockEntity.java | 3 +- .../block/util/EnergyProviderBlock.java | 2 +- .../client/EnergonRelicsClient.java | 1 + .../DefensiveLaserBlockEntityRenderer.java | 2 +- .../render/HighlightBlockEntityRenderer.java | 4 +-- .../blockstates/thermal_glass.json | 7 +++++ .../assets/energonrelics/lang/en_us.json | 1 + .../models/block/thermal_glass.json | 6 ++++ .../models/item/thermal_glass.json | 3 ++ .../textures/block/reactor_input.png | Bin 732 -> 771 bytes .../textures/block/thermal_glass.png | Bin 0 -> 730 bytes .../loot_tables/blocks/defensive_laser.json | 19 ++++++++++++ .../loot_tables/blocks/thermal_glass.json | 19 ++++++++++++ .../recipes/defensive_laser_core.json | 6 ++-- .../energonrelics/recipes/solar_panel.json | 2 +- .../energonrelics/recipes/thermal_glass.json | 20 +++++++++++++ 23 files changed, 134 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java rename src/main/java/com/thebrokenrail/energonrelics/client/{ => block/entity}/render/DefensiveLaserBlockEntityRenderer.java (96%) rename src/main/java/com/thebrokenrail/energonrelics/client/{ => block/entity}/render/HighlightBlockEntityRenderer.java (91%) create mode 100644 src/main/resources/assets/energonrelics/blockstates/thermal_glass.json create mode 100644 src/main/resources/assets/energonrelics/models/block/thermal_glass.json create mode 100644 src/main/resources/assets/energonrelics/models/item/thermal_glass.json create mode 100644 src/main/resources/assets/energonrelics/textures/block/thermal_glass.png create mode 100644 src/main/resources/data/energonrelics/loot_tables/blocks/defensive_laser.json create mode 100644 src/main/resources/data/energonrelics/loot_tables/blocks/thermal_glass.json create mode 100644 src/main/resources/data/energonrelics/recipes/thermal_glass.json diff --git a/gradle.properties b/gradle.properties index a2aaed0..081d2cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs = -Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version = 20w28a - yarn_build = 20 - fabric_loader_version = 0.8.9+build.203 + minecraft_version = 20w29a + yarn_build = 8 + fabric_loader_version = 0.9.0+build.204 # Mod Properties mod_version = 1.0.0 @@ -13,4 +13,4 @@ org.gradle.jvmargs = -Xmx1G # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_api_version = 0.14.5+build.376-1.16 + fabric_api_version = 0.14.6+build.377-1.16 diff --git a/src/main/java/com/thebrokenrail/energonrelics/Config.java b/src/main/java/com/thebrokenrail/energonrelics/Config.java index 8e95e51..e7b3fc1 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/Config.java +++ b/src/main/java/com/thebrokenrail/energonrelics/Config.java @@ -13,6 +13,6 @@ public class Config { public static final int REACTOR_ENERGY_OUTPUT = 250; public static final int DEFENSIVE_LASER_RANGE = 18; - public static final int DEFENSIVE_LASER_IDLE_ENERGY_REQUIRED = 25; + public static final int DEFENSIVE_LASER_IDLE_ENERGY_REQUIRED = 32; public static final int DEFENSIVE_LASER_FIRE_ENERGY_REQUIRED = 64; } diff --git a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java index 179dd65..9888a6a 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java +++ b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java @@ -1,6 +1,7 @@ package com.thebrokenrail.energonrelics; import com.thebrokenrail.energonrelics.block.DefensiveLaserBlock; +import com.thebrokenrail.energonrelics.block.ThermalGlassBlock; import com.thebrokenrail.energonrelics.block.battery.ActiveBatteryControllerBlock; import com.thebrokenrail.energonrelics.block.reactor.ReactorControllerBlock; import com.thebrokenrail.energonrelics.block.reactor.ReactorCoreBlock; @@ -43,6 +44,7 @@ public class EnergonRelics implements ModInitializer { public static final MultimeterItem MULTIMETER_ITEM = new MultimeterItem(); public static final ThermalCasingBlock THERMAL_CASING_BLOCK = new ThermalCasingBlock(); + public static final ThermalGlassBlock THERMAL_GLASS_BLOCK = new ThermalGlassBlock(); public static final BatteryCoreBlock BATTERY_CORE_BLOCk = new BatteryCoreBlock(); public static final PassiveBatteryControllerBlock PASSIVE_BATTERY_CONTROLLER_BLOCk = new PassiveBatteryControllerBlock(); @@ -55,11 +57,11 @@ public class EnergonRelics implements ModInitializer { public static final Item VERIDIUM_INGOT_ITEM = new Item(new Item.Settings().group(ITEM_GROUP)); public static final SimpleBlock VERIDIUM_ORE_BLOCK = new SimpleBlock(FabricBlockSettings.of(Material.STONE).requiresTool().strength(3.0F, 3.0F)); public static final SimpleBlock VERIDIUM_BLOCK_BLOCK = new SimpleBlock(FabricBlockSettings.of(Material.METAL, MaterialColor.GOLD).requiresTool().strength(3.0F, 6.0F).sounds(BlockSoundGroup.METAL)); - public static final ConfiguredFeature VERIDIUM_ORE_FEATURE = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.class_5436.field_25845, EnergonRelics.VERIDIUM_ORE_BLOCK.getDefaultState(), 9)).method_30377(32).method_30371().method_30375(2); + public static final ConfiguredFeature VERIDIUM_ORE_FEATURE = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.class_5436.field_25845, EnergonRelics.VERIDIUM_ORE_BLOCK.getDefaultState(), 9)).method_30377(32).spreadHorizontally().repeat(2); public static final Item CIRCUIT_BOARD_ITEM = new Item(new Item.Settings().group(ITEM_GROUP)); - public static final Item DEFENSIVE_LASER_CORE_ITEM = new Item(new Item.Settings().group(ITEM_GROUP));; + public static final Item DEFENSIVE_LASER_CORE_ITEM = new Item(new Item.Settings().group(ITEM_GROUP)); public static final DefensiveLaserBlock DEFENSIVE_LASER_BLOCK = new DefensiveLaserBlock(); @Override @@ -73,6 +75,7 @@ public class EnergonRelics implements ModInitializer { SWITCH_BLOCk.register("switch"); THERMAL_CASING_BLOCK.register("thermal_casing"); + THERMAL_GLASS_BLOCK.register("thermal_glass"); BATTERY_CORE_BLOCk.register("battery_core"); PASSIVE_BATTERY_CONTROLLER_BLOCk.register("passive_battery_controller"); diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java index e0d7f54..658108a 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java @@ -2,7 +2,7 @@ package com.thebrokenrail.energonrelics.block; import com.thebrokenrail.energonrelics.block.entity.DefensiveLaserBlockEntity; import com.thebrokenrail.energonrelics.block.util.EnergyProviderBlock; -import com.thebrokenrail.energonrelics.client.render.DefensiveLaserBlockEntityRenderer; +import com.thebrokenrail.energonrelics.client.block.entity.render.DefensiveLaserBlockEntityRenderer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -26,7 +26,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)); + super(FabricBlockSettings.of(Material.GLASS, MaterialColor.BLACK).requiresTool().strength(50.0F, 1200.0F)); setDefaultState(getDefaultState().with(POWERED, false)); } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java new file mode 100644 index 0000000..7d4f841 --- /dev/null +++ b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java @@ -0,0 +1,28 @@ +package com.thebrokenrail.energonrelics.block; + +import com.thebrokenrail.energonrelics.block.util.SimpleBlock; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; + +public class ThermalGlassBlock extends SimpleBlock { + public ThermalGlassBlock() { + super(FabricBlockSettings.of(Material.STONE).requiresTool().strength(1.5f, 6.0f).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false)); + } + + @Override + @SuppressWarnings("deprecation") + @Environment(EnvType.CLIENT) + public float getAmbientOcclusionLightLevel(BlockState state, BlockView world, BlockPos pos) { + return 1.0F; + } + + @Override + public boolean isTranslucent(BlockState state, BlockView world, BlockPos pos) { + return true; + } +} diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java index cf0ef4d..9ae3d8a 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java @@ -174,7 +174,7 @@ public class DefensiveLaserBlockEntity extends EnergyReceiverBlockEntity { } private List getEntities(Predicate predicate) { - return Objects.requireNonNull(getWorld()).getEntities(LivingEntity.class, new Box(getPos()).expand(Config.DEFENSIVE_LASER_RANGE), predicate); + return Objects.requireNonNull(getWorld()).getEntitiesByClass(LivingEntity.class, new Box(getPos()).expand(Config.DEFENSIVE_LASER_RANGE), predicate); } private Entity getDummyEntity() { @@ -206,7 +206,7 @@ public class DefensiveLaserBlockEntity extends EnergyReceiverBlockEntity { double distance; if (collision != null) { - world.createExplosion(null, collision.getX(), collision.getY(), collision.getZ(), 3, Explosion.DestructionType.NONE); + world.createExplosion(null, collision.getX(), collision.getY(), collision.getZ(), 1, Explosion.DestructionType.NONE); distance = posVec.distanceTo(collision); } else { @@ -217,7 +217,7 @@ public class DefensiveLaserBlockEntity extends EnergyReceiverBlockEntity { distance = distance * multiplier; for (int i = 0; i < distance; i++) { Vec3d vec = rotationVec.multiply(i / multiplier).add(posVec); - ((ServerWorld) world).spawnParticles(ParticleTypes.END_ROD, vec.getX(), vec.getY(), vec.getZ(), 1, 0, 0, 0, 0.25f); + ((ServerWorld) world).spawnParticles(ParticleTypes.END_ROD, vec.getX(), vec.getY(), vec.getZ(), 1, 0, 0, 0, 0.1f); } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/battery/PassiveBatteryControllerBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/battery/PassiveBatteryControllerBlockEntity.java index 85b8917..b5d801d 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/battery/PassiveBatteryControllerBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/battery/PassiveBatteryControllerBlockEntity.java @@ -66,6 +66,10 @@ public class PassiveBatteryControllerBlockEntity extends EnergyReceiverBlockEnti return false; } + public static boolean isInvalidBlock(BlockState block) { + return !block.isOf(EnergonRelics.THERMAL_GLASS_BLOCK) && !block.isOf(EnergonRelics.THERMAL_CASING_BLOCK); + } + @Override public void setEnergy(long value) { BatteryCoreBlockEntity core = getBatteryCore(); @@ -111,7 +115,7 @@ public class PassiveBatteryControllerBlockEntity extends EnergyReceiverBlockEnti for (Direction side : Direction.values()) { if (side != facing) { BlockState state = getWorld().getBlockState(corePos.offset(side)); - if (state == null || state.getBlock() != EnergonRelics.THERMAL_CASING_BLOCK) { + if (state == null || isInvalidBlock(state)) { valid = false; break; } 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 19fef39..d65f5ac 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 @@ -3,6 +3,7 @@ package com.thebrokenrail.energonrelics.block.entity.reactor; import com.thebrokenrail.energonrelics.Config; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.block.battery.PassiveBatteryControllerBlock; +import com.thebrokenrail.energonrelics.block.entity.battery.PassiveBatteryControllerBlockEntity; import com.thebrokenrail.energonrelics.block.reactor.ReactorControllerBlock; import com.thebrokenrail.energonrelics.energy.helper.EnergyGeneratorBlockEntity; import net.minecraft.block.BlockState; @@ -81,7 +82,7 @@ public class ReactorControllerBlockEntity extends EnergyGeneratorBlockEntity { inputs.add((ReactorInputBlockEntity) potentialInput); } else { BlockState state = getWorld().getBlockState(checkPos); - if (state == null || state.getBlock() != EnergonRelics.THERMAL_CASING_BLOCK) { + if (state == null || PassiveBatteryControllerBlockEntity.isInvalidBlock(state)) { valid = false; break; } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/util/EnergyProviderBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/util/EnergyProviderBlock.java index fbba3cb..fb88154 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/util/EnergyProviderBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/util/EnergyProviderBlock.java @@ -1,7 +1,7 @@ package com.thebrokenrail.energonrelics.block.util; import com.thebrokenrail.energonrelics.EnergonRelics; -import com.thebrokenrail.energonrelics.client.render.HighlightBlockEntityRenderer; +import com.thebrokenrail.energonrelics.client.block.entity.render.HighlightBlockEntityRenderer; import com.thebrokenrail.energonrelics.component.NetworkComponent; import com.thebrokenrail.energonrelics.energy.core.EnergyProviderBlockEntity; import net.fabricmc.api.EnvType; diff --git a/src/main/java/com/thebrokenrail/energonrelics/client/EnergonRelicsClient.java b/src/main/java/com/thebrokenrail/energonrelics/client/EnergonRelicsClient.java index bd15761..52c5c11 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/client/EnergonRelicsClient.java +++ b/src/main/java/com/thebrokenrail/energonrelics/client/EnergonRelicsClient.java @@ -13,6 +13,7 @@ public class EnergonRelicsClient implements ClientModInitializer { @Override public void onInitializeClient() { EnergyProviderBlock.initRenderer(); + BlockRenderLayerMap.INSTANCE.putBlock(EnergonRelics.THERMAL_GLASS_BLOCK, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(EnergonRelics.DEFENSIVE_LASER_BLOCK, RenderLayer.getCutout()); } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/client/render/DefensiveLaserBlockEntityRenderer.java b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/DefensiveLaserBlockEntityRenderer.java similarity index 96% rename from src/main/java/com/thebrokenrail/energonrelics/client/render/DefensiveLaserBlockEntityRenderer.java rename to src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/DefensiveLaserBlockEntityRenderer.java index 5e7655d..3b7d04c 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/client/render/DefensiveLaserBlockEntityRenderer.java +++ b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/DefensiveLaserBlockEntityRenderer.java @@ -1,4 +1,4 @@ -package com.thebrokenrail.energonrelics.client.render; +package com.thebrokenrail.energonrelics.client.block.entity.render; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.block.entity.DefensiveLaserBlockEntity; diff --git a/src/main/java/com/thebrokenrail/energonrelics/client/render/HighlightBlockEntityRenderer.java b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java similarity index 91% rename from src/main/java/com/thebrokenrail/energonrelics/client/render/HighlightBlockEntityRenderer.java rename to src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java index a3dfbd3..0620524 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/client/render/HighlightBlockEntityRenderer.java +++ b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java @@ -1,4 +1,4 @@ -package com.thebrokenrail.energonrelics.client.render; +package com.thebrokenrail.energonrelics.client.block.entity.render; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.energy.core.EnergyReceiverBlockEntity; @@ -27,7 +27,7 @@ public class HighlightBlockEntityRenderer extends BlockEntityRenderer=O^{$K*jNNC zL>pg)|3F*8RzVOHLBzse;Hwc??<7J*l38Z&$C){onKR&u=JdSX9)x_MWW^(4|59Sv z?|H#PFK)bqG~G65VzDSK$LAews@?`vuh#pTj;@qp>(JIIJb$H|R!MkTIJ#ak6>kgo z>sc)&d?-9_$pMA0l%A~fv*Jvh-xXU6@mX-Gp8m`qPX1v%YvqNb(3zR zusAPuQ05ReaUz8AlcdZVIZ6bi79_LgzF^HaM^QYw{7ouY;>eH{@3^RC>1s$#i*Cr5 zqoQ*EpQoLkoMfnX?+!!9ljFRNfM*B3tB&(^R~y>!0r)oI z?6RRHcj0^s1|Ce!(rS`hrYoI>*Hh?8K;I2`SL#{)u5)q^3mfu8*RZz_qq5((`UBDo zXZ1Aoh^UjC0T_QeNkl15QWD=DFbQjE)Y_rvd|%X0N+9+XHezB?quQv znbfWfcH_zzT)Hs?ROp9fpJrz@`h!Hxz^vZxH*aP}Ns|1K`HG@I7>s3E_MZF5M$ub! z$RA(Sjon-v@5z&w|0^EZhbjUsUat?Xj6UqeA|Me%=QDo+V?#Xucz0K(8Rye1x3Q!+ z-q30paFIsaAdqsxNkJF7Qb^BLe6jI(8rQ(~QR{&i$LAv2o^vP0B_PqnDACg%AOURr z4Dsysp+TUYcV!O}w8c!ovml;H%c+e)WU8u(xm~eZS zeVc!u=qpjXoA_wRZmxCO3p)o~7ls6VmL4~exx~%q)cK(1fC(^RG9-W7395HNk7xfP n33$D1jsRQLhpiWFXx)DSJ2L-FtG5Cc00000NkvXXu0mjfpl(<* delta 666 zcmV;L0%iS!2HXXZI)63dgA`hbS}gd$!hk4UNZaNH~iz9rXU_e{uXQ4;z*Mb?~te^>1s+%iEhf5 zWliP&H%})uI%MK?Zw*7klk2|qLtqEW+pha{3VY#Ad$pqF_a!4!PpRQ7jrL(^lXs8CoW3b1@;Uyf`Ck6 z!-kIL$#9YIGx3F46t`R3O~EFB3Ag3wukT$KZa1i$cR+l$=5zqE{Q*@B#QX;q0=Z zC3oR`3kDuc&C+U;Tc#_WhSyW*NkHEXcvtFK{jPIz4+|UeMAxvl52Lc*xB3Ip3}^K; z^@ykd000SaNLh0L01sgR01sgSs6VG^0003INklUfw@leN|%;C43iMbMFTzfRX%W4I)4Jz(Qp+2#Ha0wR&bXfc#GqQKY??^jDN z$tVJ!xF{(L>=|eT0hz*v`8+_4C&QP7zl9;8oQ5Q5r_jY1m~dN;PKw>&*&I+`2npuQ zGj@@w#r!MFTWw<-Og>wRR910 M07*qoM6N<$f)j2^5C8xG literal 0 HcmV?d00001 diff --git a/src/main/resources/data/energonrelics/loot_tables/blocks/defensive_laser.json b/src/main/resources/data/energonrelics/loot_tables/blocks/defensive_laser.json new file mode 100644 index 0000000..b0792cf --- /dev/null +++ b/src/main/resources/data/energonrelics/loot_tables/blocks/defensive_laser.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "energonrelics:defensive_laser" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/energonrelics/loot_tables/blocks/thermal_glass.json b/src/main/resources/data/energonrelics/loot_tables/blocks/thermal_glass.json new file mode 100644 index 0000000..4686881 --- /dev/null +++ b/src/main/resources/data/energonrelics/loot_tables/blocks/thermal_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "energonrelics:thermal_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/energonrelics/recipes/defensive_laser_core.json b/src/main/resources/data/energonrelics/recipes/defensive_laser_core.json index 349ff79..b285245 100644 --- a/src/main/resources/data/energonrelics/recipes/defensive_laser_core.json +++ b/src/main/resources/data/energonrelics/recipes/defensive_laser_core.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "pattern": [ "#I#", - "IGI", + "IDI", "#I#" ], "key": { @@ -12,8 +12,8 @@ "I": { "item": "minecraft:gold_ingot" }, - "G": { - "item": "minecraft:gunpowder" + "D": { + "item": "minecraft:diamond" } }, "result": { diff --git a/src/main/resources/data/energonrelics/recipes/solar_panel.json b/src/main/resources/data/energonrelics/recipes/solar_panel.json index b3b0219..e70682d 100644 --- a/src/main/resources/data/energonrelics/recipes/solar_panel.json +++ b/src/main/resources/data/energonrelics/recipes/solar_panel.json @@ -18,6 +18,6 @@ }, "result": { "item": "energonrelics:solar_panel", - "count": 1 + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/energonrelics/recipes/thermal_glass.json b/src/main/resources/data/energonrelics/recipes/thermal_glass.json new file mode 100644 index 0000000..34997b8 --- /dev/null +++ b/src/main/resources/data/energonrelics/recipes/thermal_glass.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#G#", + " # " + ], + "key": { + "#": { + "item": "energonrelics:thermal_casing" + }, + "G": { + "item": "minecraft:glass" + } + }, + "result": { + "item": "energonrelics:thermal_glass", + "count": 2 + } +} \ No newline at end of file