From 8e1712e64c6e1762d5f72744c5dafb44260032f6 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 26 Aug 2020 21:12:47 -0400 Subject: [PATCH] 1.0.0 --- CHANGELOG.md | 3 ++ docs/API.md | 27 ++++++++++++++++++ docs/README.md | 4 ++- gradle.properties | 2 +- .../api/energy/tick/EnergyTicker.java | 5 ++-- .../api/item/MultimeterExtra.java | 2 +- .../block/entity/SolarPanelBlockEntity.java | 2 +- ... IndustrialLaserProjectorBlockEntity.java} | 4 +-- .../laser/IndustrialLaserProjectorBlock.java | 4 +-- .../render/HighlightBlockEntityRenderer.java | 1 + .../energonrelics/util/BooleanIterator.java | 2 ++ .../block/phase_shifter_off_input.png | Bin 0 -> 502 bytes .../block/phase_shifter_off_output.png | Bin 0 -> 497 bytes .../textures/block/phase_shifter_on_input.png | Bin 0 -> 508 bytes .../block/phase_shifter_on_output.png | Bin 0 -> 509 bytes .../textures/block/phase_shifter_tint.png | Bin 0 -> 372 bytes .../textures/item/multimeter.png | Bin 0 -> 403 bytes .../textures/item/network_chip.png | Bin 0 -> 363 bytes .../textures/block/solar_panel.png | Bin 575 -> 2513 bytes .../data/energonrelics/recipes/switch.json | 4 +-- 20 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 docs/API.md rename src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/{IndustrialLaserBlockEntity.java => IndustrialLaserProjectorBlockEntity.java} (96%) create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_input.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_output.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_input.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_output.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_tint.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/multimeter.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/network_chip.png diff --git a/CHANGELOG.md b/CHANGELOG.md index b19a598..fb07cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**1.0.8** +* Update Textures + **Beta 0.2.2** * Update To Fabric Structure API diff --git a/docs/API.md b/docs/API.md new file mode 100644 index 0000000..8d2443e --- /dev/null +++ b/docs/API.md @@ -0,0 +1,27 @@ +# API +The public API is in the package ``com.thebrokenrail.energonrelics.api``. Any registries are located in the package ``com.thebrokenrail.energonrelics.registry``. Anything else should be treated as unstable and may change at any moment. + +## Setup + +### ``build.gradle`` +```gradle +repositories { + maven { url 'https://maven.thebrokenrail.com' } +} +dependencies { + modImplementation 'com.thebrokenrail:energonrelics:VERSION' + // VERSION = "+", for example "1.0.0+1.16.2" +} +``` + +### ``fabric.mod.json`` +```json +{ + "depends": { + "energonrelics": "1.0.x" + } +} +``` + +## JavaDoc +[View JavaDoc](https://jenkins.thebrokenrail.com/job/EnergonRelics/job/master/JavaDoc/) \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index ebffbee..d236570 100644 --- a/docs/README.md +++ b/docs/README.md @@ -6,4 +6,6 @@ [View Blocks](BLOCKS.md) -[View Structures](STRUCTURES.md) \ No newline at end of file +[View Structures](STRUCTURES.md) + +[View API](API.md) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index dc2e412..f1b6845 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G fabric_loader_version = 0.9.2+build.206 # Mod Properties - mod_version = 0.2.2 + mod_version = 1.0.0 maven_group = com.thebrokenrail # Dependencies diff --git a/src/main/java/com/thebrokenrail/energonrelics/api/energy/tick/EnergyTicker.java b/src/main/java/com/thebrokenrail/energonrelics/api/energy/tick/EnergyTicker.java index 3690389..7faa101 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/api/energy/tick/EnergyTicker.java +++ b/src/main/java/com/thebrokenrail/energonrelics/api/energy/tick/EnergyTicker.java @@ -14,8 +14,7 @@ import java.util.Objects; /** * Energy Ticker */ -@ApiStatus.Internal -public class EnergyTicker { +public final class EnergyTicker { private static final List scheduled = new ArrayList<>(); private static List allLoaded = Collections.emptyList(); @@ -33,6 +32,7 @@ public class EnergyTicker { * Schedule For Next Energy Tick * @param tickable Object To Tick */ + @ApiStatus.Internal public static void schedule(EnergyTickable tickable) { scheduled.add(tickable); } @@ -41,6 +41,7 @@ public class EnergyTicker { * Tick Energy * @param world World */ + @ApiStatus.Internal public static void tick(World world) { if (Objects.requireNonNull(world.getServer()).getThread() == Thread.currentThread()) { world.getProfiler().push(EnergonRelics.NAMESPACE); diff --git a/src/main/java/com/thebrokenrail/energonrelics/api/item/MultimeterExtra.java b/src/main/java/com/thebrokenrail/energonrelics/api/item/MultimeterExtra.java index 94d1921..45a9a7c 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/api/item/MultimeterExtra.java +++ b/src/main/java/com/thebrokenrail/energonrelics/api/item/MultimeterExtra.java @@ -3,7 +3,7 @@ package com.thebrokenrail.energonrelics.api.item; import net.minecraft.text.MutableText; /** - * Implement To Provide Extra Information In Multimeter + * Implement To Provide Extra Information In Multimeter Output */ public interface MultimeterExtra { /** diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/SolarPanelBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/SolarPanelBlockEntity.java index 0843ff2..9651ee6 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/SolarPanelBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/SolarPanelBlockEntity.java @@ -26,7 +26,7 @@ public class SolarPanelBlockEntity extends EnergyGeneratorBlockEntity { for (Direction side : Direction.values()) { light = Math.max(light, getLight(side)); } - return (int) (((float) light) * Math.min(0, MathHelper.cos(Objects.requireNonNull(getWorld()).getSkyAngleRadians(1f)))); + return (int) (((float) light) * Math.max(0, MathHelper.cos(Objects.requireNonNull(getWorld()).getSkyAngleRadians(1f)))); } @Override diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserProjectorBlockEntity.java similarity index 96% rename from src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java rename to src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserProjectorBlockEntity.java index 58699dd..0c792fc 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserProjectorBlockEntity.java @@ -21,13 +21,13 @@ import net.minecraft.world.explosion.Explosion; import java.util.Objects; -public class IndustrialLaserBlockEntity extends FieldProjectorBlockEntity { +public class IndustrialLaserProjectorBlockEntity extends FieldProjectorBlockEntity { private BlockPos targetPos; private BlockState targetState; private int progress = 0; - public IndustrialLaserBlockEntity(BlockEntityType type) { + public IndustrialLaserProjectorBlockEntity(BlockEntityType type) { super(type, state -> EnergonRelics.Blocks.INDUSTRIAL_LASER); } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java index cf175a4..8305ea1 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java @@ -1,6 +1,6 @@ package com.thebrokenrail.energonrelics.block.forcefield.laser; -import com.thebrokenrail.energonrelics.block.entity.forcefield.laser.IndustrialLaserBlockEntity; +import com.thebrokenrail.energonrelics.block.entity.forcefield.laser.IndustrialLaserProjectorBlockEntity; import com.thebrokenrail.energonrelics.block.forcefield.util.FieldProjectorBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; @@ -14,6 +14,6 @@ public class IndustrialLaserProjectorBlock extends FieldProjectorBlock { @Override protected Function, BlockEntity> getFactory() { - return IndustrialLaserBlockEntity::new; + return IndustrialLaserProjectorBlockEntity::new; } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java index e03e932..535f251 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java +++ b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java @@ -88,6 +88,7 @@ public class HighlightBlockEntityRenderer extends BlockEntityRenderer function) { diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_input.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_input.png new file mode 100644 index 0000000000000000000000000000000000000000..f532a0caa8dca9ad1e953d93e90defbeda59fd2e GIT binary patch literal 502 zcmVeg^JZc_J-<{mgZL+*#&TdT-amR&Z!A)p=9DEVS&qYJ0Cq|Y;Rp=l5gX^( zmI2s<{@HdR99OuRn3&4(d-*`BVY*YCMzH!a2GPFYvica?}D02>I1AnTY7WDg@wfNqICTrNbE zp#d8yg@;RPBke4*gj+14B9M~t#01KN;IehVv`=*#a|%ogp@U^BQi!q;G|Xg4Ht5g} zBXcjzWHSAw>HnZsH<~o~`sPb8sLFyY+o3$u?b0I8mnQ?qU9fAe`NL3(=pnN|?bw)tKe6N*o}z_k(EtDd07*qoM6N<$g1*V&sQ>@~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_output.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_output.png new file mode 100644 index 0000000000000000000000000000000000000000..85e9c4581da9e0066c6206f49db1dc2d0e5b1559 GIT binary patch literal 497 zcmV0POl0ZOg$w`4$3lbA7NyYA_L?&=H-vbSoA!2I zXU4F`rZpGZ) zz~d+G0vpedam3kRK)`GgQ@O}YAP#^h?4DQU1G_?HTwb2v*$EUKH!uN!E{Y}Py&4Az z1K1TRg8>4O9Y8{$8J0)6w1XC{;oZFv@u0E8TEt%yD)W?V<#J+SfcH%( zR6_tVf{8eWqg$@7JfHH}j5^0%6UxH=PWj!I-h_7R>dZKT`k>V#<@00000NkvXXu0mjflhD;3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_input.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_input.png new file mode 100644 index 0000000000000000000000000000000000000000..3559a2cc77b96791f2127568e26fcf07236bbf35 GIT binary patch literal 508 zcmV;#II?P>rl zOOl-Omd7ArfP00^U;rSZ!w?X5P`}{4{o3SRbbz58lxW=EKWY)Ts~fC^{}WI;i^xqa8uL6Q5BK&iH)1 zd&O)3&e9n#wcHYvAQ_Mu^2z*M1u?Awnu;blzZC-d+$c#hl^@E*2 z(Q-TufMrRNQ=Y3ZNEqNY04DdZ^3fTZaL@*J@^UbZCW@nJIc(~P27WTKt-=@?iw2#)C+7Z-upC9%4 zWUa|;0M618FI8*_N{|f5jC!#wS9hD)<)zr%DOD5&B_J!<*tIepuQV8(gd+~R_wq!o zB>C6Jv~m$;Xuw8F;o%x4g<${u@*+K`yRHP84 z>{az-Nj6Xhknan#A(QD&=l_GM&DW{>)!|Dp$kK#si=%P7#v)IaCj-Y_FiW=n!%&Lo zA+tXT62lamxL8`O>ns2uh%gd>lqkPC??m(mB$XaaXCOin00000NkvXXu0mjf$mij4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_tint.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_tint.png new file mode 100644 index 0000000000000000000000000000000000000000..e43d13e02ee54da5b92ee17a2cbbcf396551e5bc GIT binary patch literal 372 zcmV-)0gL{LP)smTK6&f((6K@~uDC6EG^{|P@@XuLa)HzBNRc7Q*yC}`vMfvv zrfH-&PGm#B5q)giM)Uk4H-Tx}_H^+t+-@Jj3zZy2(Obl#C?s~>r$+;s>?t@#czAGi0Mm-1xUA^IR8@7%-LLi!gcm3Yk0i@7Y`(jQi0B8P0n6(O SZrNi10000P)!R9YF7(mY7 zwfZTFAp{M8*(}W@iC-Zo5V7HTp(p+$(=ZGJEO<>_`}aT0<`ds;F))NNfMX(Yl{s-< z06E_+RGQ&U(#QW6Txt+Q&;VW+ocs2X;pxg7V2!~%_6!URm9V9(8nJ;(68 zIF*5!nVI45-@gnU%5xdYZpJY%v9Ll6KE0a}mXP2s0BQD}{f^<^w*-bcx0o5&*xA71 z%q+|d)eq7bIJmhP{{H#P@cZWv1_MKf|1ir@!T_ZC@59${zW9_GU`-$ZqNQfchPwi5 zAc8bMI&c!M;m;?CW{^gZS3vxKe}3aO0Hj&Y0TM+Zr#{V30Bd}h7z-8y@zDX?0N>f~ x7_XiC$FQUCIM^nbQ(-ou*$fYS$^Zic0|4D;xY-lE72E&-002ovPDHLkV1nzAvHSo4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/network_chip.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/network_chip.png new file mode 100644 index 0000000000000000000000000000000000000000..c422fed4ee016fcba7af9f9a905fbfb804863269 GIT binary patch literal 363 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 delta 551 zcmV+?0@(f06TbwIBYy#JX+uL$X=7sm04R}lkvmHRK@^2Q6E)(46k3Q{Ecn2}fGCKi z#v)CS5F_|%HtQx4@>q5gL~I2c3&BFP@m2T_v=wX>1VIr*Ec^w&8VTziS4a>u%k2F) zGv_jM27J-1k#p*YA(t=O@km&kn_tiZF9c|$onE?i!?7k~v41Ev$LAe&s@{fFuiE?m z9WBeIV?bS#@R(uQMd1nI=xWhYyd~UWWb|d>L*XG?4k&!3^rXkniqjsyE4CByDe$SD zTDpppRcvJJobaG1s+%iEhf5WliP&H%})uI^uP24MW3|>%R3vUhZHScA`+n4|V002ovPDHLkV1iKR`5FKK diff --git a/src/main/resources/data/energonrelics/recipes/switch.json b/src/main/resources/data/energonrelics/recipes/switch.json index 7eb03a2..d21e7d3 100644 --- a/src/main/resources/data/energonrelics/recipes/switch.json +++ b/src/main/resources/data/energonrelics/recipes/switch.json @@ -10,7 +10,7 @@ "item": "energonrelics:circuit_board" }, "I": { - "item": "minecraft:iron_ingot" + "item": "minecraft:iron_nugget" }, "L": { "item": "minecraft:lever" @@ -18,6 +18,6 @@ }, "result": { "item": "energonrelics:switch", - "count": 2 + "count": 4 } } \ No newline at end of file