1.0.0
All checks were successful
EnergonRelics/pipeline/head This commit looks good

This commit is contained in:
TheBrokenRail 2020-08-26 21:12:47 -04:00
parent 3f59e506a4
commit 8e1712e64c
20 changed files with 48 additions and 12 deletions

View File

@ -1,5 +1,8 @@
# Changelog # Changelog
**1.0.8**
* Update Textures
**Beta 0.2.2** **Beta 0.2.2**
* Update To Fabric Structure API * Update To Fabric Structure API

27
docs/API.md Normal file
View File

@ -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 = "<Mod Version>+<MC 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/)

View File

@ -7,3 +7,5 @@
[View Blocks](BLOCKS.md) [View Blocks](BLOCKS.md)
[View Structures](STRUCTURES.md) [View Structures](STRUCTURES.md)
[View API](API.md)

View File

@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
fabric_loader_version = 0.9.2+build.206 fabric_loader_version = 0.9.2+build.206
# Mod Properties # Mod Properties
mod_version = 0.2.2 mod_version = 1.0.0
maven_group = com.thebrokenrail maven_group = com.thebrokenrail
# Dependencies # Dependencies

View File

@ -14,8 +14,7 @@ import java.util.Objects;
/** /**
* Energy Ticker * Energy Ticker
*/ */
@ApiStatus.Internal public final class EnergyTicker {
public class EnergyTicker {
private static final List<EnergyTickable> scheduled = new ArrayList<>(); private static final List<EnergyTickable> scheduled = new ArrayList<>();
private static List<EnergyTickable> allLoaded = Collections.emptyList(); private static List<EnergyTickable> allLoaded = Collections.emptyList();
@ -33,6 +32,7 @@ public class EnergyTicker {
* Schedule For Next Energy Tick * Schedule For Next Energy Tick
* @param tickable Object To Tick * @param tickable Object To Tick
*/ */
@ApiStatus.Internal
public static void schedule(EnergyTickable tickable) { public static void schedule(EnergyTickable tickable) {
scheduled.add(tickable); scheduled.add(tickable);
} }
@ -41,6 +41,7 @@ public class EnergyTicker {
* Tick Energy * Tick Energy
* @param world World * @param world World
*/ */
@ApiStatus.Internal
public static void tick(World world) { public static void tick(World world) {
if (Objects.requireNonNull(world.getServer()).getThread() == Thread.currentThread()) { if (Objects.requireNonNull(world.getServer()).getThread() == Thread.currentThread()) {
world.getProfiler().push(EnergonRelics.NAMESPACE); world.getProfiler().push(EnergonRelics.NAMESPACE);

View File

@ -3,7 +3,7 @@ package com.thebrokenrail.energonrelics.api.item;
import net.minecraft.text.MutableText; import net.minecraft.text.MutableText;
/** /**
* Implement To Provide Extra Information In Multimeter * Implement To Provide Extra Information In Multimeter Output
*/ */
public interface MultimeterExtra { public interface MultimeterExtra {
/** /**

View File

@ -26,7 +26,7 @@ public class SolarPanelBlockEntity extends EnergyGeneratorBlockEntity {
for (Direction side : Direction.values()) { for (Direction side : Direction.values()) {
light = Math.max(light, getLight(side)); 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 @Override

View File

@ -21,13 +21,13 @@ import net.minecraft.world.explosion.Explosion;
import java.util.Objects; import java.util.Objects;
public class IndustrialLaserBlockEntity extends FieldProjectorBlockEntity { public class IndustrialLaserProjectorBlockEntity extends FieldProjectorBlockEntity {
private BlockPos targetPos; private BlockPos targetPos;
private BlockState targetState; private BlockState targetState;
private int progress = 0; private int progress = 0;
public IndustrialLaserBlockEntity(BlockEntityType<?> type) { public IndustrialLaserProjectorBlockEntity(BlockEntityType<?> type) {
super(type, state -> EnergonRelics.Blocks.INDUSTRIAL_LASER); super(type, state -> EnergonRelics.Blocks.INDUSTRIAL_LASER);
} }

View File

@ -1,6 +1,6 @@
package com.thebrokenrail.energonrelics.block.forcefield.laser; 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 com.thebrokenrail.energonrelics.block.forcefield.util.FieldProjectorBlock;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.entity.BlockEntityType;
@ -14,6 +14,6 @@ public class IndustrialLaserProjectorBlock extends FieldProjectorBlock {
@Override @Override
protected Function<BlockEntityType<BlockEntity>, BlockEntity> getFactory() { protected Function<BlockEntityType<BlockEntity>, BlockEntity> getFactory() {
return IndustrialLaserBlockEntity::new; return IndustrialLaserProjectorBlockEntity::new;
} }
} }

View File

@ -88,6 +88,7 @@ public class HighlightBlockEntityRenderer extends BlockEntityRenderer<BlockEntit
} }
} }
@SuppressWarnings("SameParameterValue")
private static void vertex(VertexConsumer consumer, Matrix4f model, float x, float y, float z) { private static void vertex(VertexConsumer consumer, Matrix4f model, float x, float y, float z) {
consumer.vertex(model, x, y, z).color(1f, 1f, 1f, 1f).next(); consumer.vertex(model, x, y, z).color(1f, 1f, 1f, 1f).next();
} }

View File

@ -2,9 +2,11 @@ package com.thebrokenrail.energonrelics.util;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import org.jetbrains.annotations.ApiStatus;
import java.util.function.Consumer; import java.util.function.Consumer;
@ApiStatus.Internal
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class BooleanIterator { public class BooleanIterator {
public static void run(Consumer<Boolean> function) { public static void run(Consumer<Boolean> function) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 502 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 508 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 363 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -10,7 +10,7 @@
"item": "energonrelics:circuit_board" "item": "energonrelics:circuit_board"
}, },
"I": { "I": {
"item": "minecraft:iron_ingot" "item": "minecraft:iron_nugget"
}, },
"L": { "L": {
"item": "minecraft:lever" "item": "minecraft:lever"
@ -18,6 +18,6 @@
}, },
"result": { "result": {
"item": "energonrelics:switch", "item": "energonrelics:switch",
"count": 2 "count": 4
} }
} }