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 0000000..f532a0c Binary files /dev/null and b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_input.png differ 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 0000000..85e9c45 Binary files /dev/null and b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_off_output.png differ 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 0000000..3559a2c Binary files /dev/null and b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_input.png differ diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_output.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_output.png new file mode 100644 index 0000000..e82a6c7 Binary files /dev/null and b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_on_output.png differ 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 0000000..e43d13e Binary files /dev/null and b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/phase_shifter_tint.png differ diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/multimeter.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/multimeter.png new file mode 100644 index 0000000..fdaaa38 Binary files /dev/null and b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/multimeter.png differ 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 0000000..c422fed Binary files /dev/null and b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/item/network_chip.png differ diff --git a/src/main/resources/assets/energonrelics/textures/block/solar_panel.png b/src/main/resources/assets/energonrelics/textures/block/solar_panel.png index 5f429af..438d405 100644 Binary files a/src/main/resources/assets/energonrelics/textures/block/solar_panel.png and b/src/main/resources/assets/energonrelics/textures/block/solar_panel.png differ 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