fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fabric-1.16

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-01 01:16:18 +02:00
parent 007c7ceb56 400fcdb633
commit 1cda087c03
14 changed files with 140 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/appeng/api/networking/IGridCacheRegistry.java
+3 -3
View File
@@ -36,10 +36,10 @@ public interface IGridCacheRegistry {
* Register a new grid cache for use during operation, must be called during the
* loading phase.
*
* @param iface grid cache class
* @param iface grid cache class
* @param factory Factory for creating a new instance for each constructed grid
*/
void registerGridCache(@Nonnull Class<? extends IGridCache> iface,
@Nonnull Class<? extends IGridCache> implementation);
<T extends IGridCache> void registerGridCache(@Nonnull Class<T> iface, @Nonnull IGridCacheFactory<T> factory);
/**
* requests a new INSTANCE of a grid cache for use, used internally
api/src/main/java/appeng/api/parts/IPart.java
+3 -1
View File
@@ -353,7 +353,9 @@ public interface IPart extends ICustomCableConnection {
/**
* This will be used by the core to add information about this part to a crash
* report if it is attached to a host that caused a crash during tick processing.
* report if it is attached to a host that caused a crash during tick
* processing.
*
* @param section The crash report section the information will be added to.
*/
default void addEntityCrashInfo(CrashReportSection section) {
core/src/main/java/appeng/core/features/registries/GridCacheRegistry.java
+33 -30
View File
@@ -18,54 +18,57 @@
package appeng.core.features.registries;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridCache;
import appeng.api.networking.IGridCacheFactory;
import appeng.api.networking.IGridCacheRegistry;
import appeng.core.AELog;
public final class GridCacheRegistry implements IGridCacheRegistry {
private final Map<Class<? extends IGridCache>, Class<? extends IGridCache>> caches = new HashMap<>();
private final List<GridCacheRegistration<?>> registry = new ArrayList<>();
@Override
public void registerGridCache(final Class<? extends IGridCache> iface,
final Class<? extends IGridCache> implementation) {
if (iface.isAssignableFrom(implementation)) {
this.caches.put(iface, implementation);
} else {
throw new IllegalArgumentException(
"Invalid setup, grid cache must either be the same class, or an interface that the implementation implements. Gotten: "
+ iface + " and " + implementation);
public synchronized <T extends IGridCache> void registerGridCache(@Nonnull Class<T> iface,
@Nonnull IGridCacheFactory<T> factory) {
if (registry.stream().anyMatch(r -> r.cacheClass.equals(iface))) {
throw new IllegalArgumentException("Implementation for grid cache " + iface + " is already registered!");
}
registry.add(new GridCacheRegistration<>(iface, factory));
}
@Override
public HashMap<Class<? extends IGridCache>, IGridCache> createCacheInstance(final IGrid g) {
final HashMap<Class<? extends IGridCache>, IGridCache> map = new HashMap<>();
public Map<Class<? extends IGridCache>, IGridCache> createCacheInstance(final IGrid g) {
final Map<Class<? extends IGridCache>, IGridCache> map = new HashMap<>(registry.size());
for (final Class<? extends IGridCache> iface : this.caches.keySet()) {
try {
final Constructor<? extends IGridCache> c = this.caches.get(iface).getConstructor(IGrid.class);
map.put(iface, c.newInstance(g));
} catch (final NoSuchMethodException e) {
AELog.error("Grid Caches must have a constructor with IGrid as the single param.");
throw new IllegalArgumentException(e);
} catch (final InvocationTargetException e) {
AELog.error("Grid Caches must have a constructor with IGrid as the single param.");
throw new IllegalStateException(e);
} catch (final InstantiationException e) {
AELog.error("Grid Caches must have a constructor with IGrid as the single param.");
throw new IllegalStateException(e);
} catch (final IllegalAccessException e) {
AELog.error("Grid Caches must have a constructor with IGrid as the single param.");
throw new IllegalStateException(e);
}
for (GridCacheRegistration<?> registration : registry) {
map.put(registration.cacheClass, registration.factory.createCache(g));
}
return map;
}
private static class GridCacheRegistration<T extends IGridCache> {
private final Class<T> cacheClass;
private final IGridCacheFactory<T> factory;
public GridCacheRegistration(Class<T> cacheClass, IGridCacheFactory<T> factory) {
this.cacheClass = cacheClass;
this.factory = factory;
}
}
}
core/src/main/java/appeng/fluids/util/AEFluidStack.java
+4 -1
View File
@@ -259,7 +259,10 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
@Override
public void writeToPacket(final PacketByteBuf buffer) {
buffer.writeBoolean(this.isCraftable());
buffer.writeCompoundTag(this.getFluidStack().toTag());
// Cannot use writeFluidStack here because for FluidStacks with amount==0, it
// will not write the fluid
buffer.writeRegistryIdUnsafe(ForgeRegistries.FLUIDS, fluid);
buffer.writeCompoundTag(getFluidStack().getTag());
buffer.writeVarLong(this.getStackSize());
buffer.writeVarLong(this.getCountRequestable());
}
core/src/main/java/appeng/me/Grid.java
+2 -1
View File
@@ -42,7 +42,7 @@ import appeng.util.ReadOnlyCollection;
public class Grid implements IGrid {
private final NetworkEventBus eventBus = new NetworkEventBus();
private final Map<Class<? extends IGridHost>, MachineSet> machines = new HashMap<>();
private final Map<Class<? extends IGridCache>, GridCacheWrapper> caches = new HashMap<>();
private final Map<Class<? extends IGridCache>, GridCacheWrapper> caches;
private GridNode pivot;
private int priority; // how import is this network?
private GridStorage myStorage;
@@ -52,6 +52,7 @@ public class Grid implements IGrid {
final Map<Class<? extends IGridCache>, IGridCache> myCaches = AEApi.instance().registries().gridCache()
.createCacheInstance(this);
this.caches = new HashMap<>(myCaches.size());
for (final Entry<Class<? extends IGridCache>, IGridCache> c : myCaches.entrySet()) {
final Class<? extends IGridCache> key = c.getKey();
final IGridCache value = c.getValue();
core/src/main/java/appeng/me/cache/TickManagerCache.java
Vendored
+3 -12
View File
@@ -40,7 +40,6 @@ import appeng.me.cache.helpers.TickTracker;
public class TickManagerCache implements ITickManager {
private final IGrid myGrid;
private final HashMap<IGridNode, TickTracker> alertable = new HashMap<>();
private final HashMap<IGridNode, TickTracker> sleeping = new HashMap<>();
private final HashMap<IGridNode, TickTracker> awake = new HashMap<>();
@@ -48,12 +47,7 @@ public class TickManagerCache implements ITickManager {
private long currentTick = 0;
public TickManagerCache(final IGrid g) {
this.myGrid = g;
}
public long getCurrentTick() {
return this.currentTick;
public TickManagerCache(@SuppressWarnings("unused") final IGrid g) {
}
public long getAvgNanoTime(final IGridNode node) {
@@ -67,7 +61,7 @@ public class TickManagerCache implements ITickManager {
return -1;
}
return tt.getAvgNanos();
return 0;
}
@Override
@@ -147,7 +141,7 @@ public class TickManagerCache implements ITickManager {
Preconditions.checkNotNull(tr);
final TickTracker tt = new TickTracker(tr, gridNode, (IGridTickable) machine, this.currentTick, this);
final TickTracker tt = new TickTracker(tr, gridNode, (IGridTickable) machine, this.currentTick);
if (tr.canBeAlerted) {
this.alertable.put(gridNode, tt);
@@ -185,9 +179,6 @@ public class TickManagerCache implements ITickManager {
if (tt == null) {
return false;
}
// throw new RuntimeException(
// "Invalid alerted device, this node is not marked as alertable, or part of
// this grid." );
// set to awake, this is for sanity.
this.sleeping.remove(node);
core/src/main/java/appeng/me/cache/helpers/TickTracker.java
Vendored
+2 -8
View File
@@ -26,6 +26,7 @@ import net.minecraft.util.crash.CrashReportSection;
import appeng.api.networking.IGridNode;
import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPart;
import appeng.api.util.DimensionalCoord;
import appeng.me.cache.TickManagerCache;
@@ -35,13 +36,10 @@ public class TickTracker implements Comparable<TickTracker> {
private final IGridTickable gt;
private final IGridNode node;
private final long LastFiveTicksTime = 0;
private long lastTick;
private int currentRate;
public TickTracker(final TickingRequest req, final IGridNode node, final IGridTickable gt, final long currentTick,
final TickManagerCache tickManagerCache) {
public TickTracker(final TickingRequest req, final IGridNode node, final IGridTickable gt, final long currentTick) {
this.request = req;
this.gt = gt;
this.node = node;
@@ -49,10 +47,6 @@ public class TickTracker implements Comparable<TickTracker> {
this.setLastTick(currentTick);
}
public long getAvgNanos() {
return (this.LastFiveTicksTime / 5);
}
@Override
public int compareTo(@Nonnull final TickTracker t) {
int next = Long.compare(this.getNextTick(), t.getNextTick());
core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json
+3 -15
View File
@@ -1,18 +1,6 @@
{
"parent": "appliedenergistics2:block/drive/drive_cell",
"textures": {
"front": "appliedenergistics2:block/drive/fluid_cell"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [9, 13, 1],
"to": [15, 15, 3],
"rotation": { "angle": 0, "axis": "y", "origin": [9, 8, 8] },
"faces": {
"north": { "uv": [0, 2, 6, 4], "texture": "#front" },
"up": { "uv": [0, 0, 6, 2], "texture": "#front" },
"down": { "uv": [0, 4, 6, 6], "texture": "#front" }
}
}
]
"cell": "appliedenergistics2:block/drive/fluid_cell"
}
}
core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json
+3 -15
View File
@@ -1,18 +1,6 @@
{
"parent": "appliedenergistics2:block/drive/drive_cell",
"textures": {
"front": "appliedenergistics2:block/drive/item_cell"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [9, 13, 1],
"to": [15, 15, 3],
"rotation": { "angle": 0, "axis": "y", "origin": [9, 8, 8] },
"faces": {
"north": { "uv": [0, 2, 6, 4], "texture": "#front" },
"up": { "uv": [0, 0, 6, 2], "texture": "#front" },
"down": { "uv": [0, 4, 6, 6], "texture": "#front" }
}
}
]
"cell": "appliedenergistics2:block/drive/item_cell"
}
}
src/api/java/appeng/api/networking/IGridCacheFactory.java
+43
View File
@@ -0,0 +1,43 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2013 AlgorithmX2
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package appeng.api.networking;
import javax.annotation.Nonnull;
/**
* A factory for grid cache implementations.
*/
@FunctionalInterface
public interface IGridCacheFactory<T extends IGridCache> {
/**
* Creates a grid cache for the given grid.
*
* @param grid The grid for which the cache should be created.
* @return A new grid cache instance.
*/
@Nonnull
T createCache(IGrid grid);
}
src/main/java/appeng/block/networking/CableBusBlock.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusBlockEntity> implemen
public CableBusBlock() {
super(defaultProps(AEGlassMaterial.INSTANCE)
.nonOpaque()
.dropsNothing());
.dropsNothing().variableOpacity());
}
@Override
src/main/java/appeng/client/render/model/DriveBakedModel.java
+4 -4
View File
@@ -63,7 +63,7 @@ public class DriveBakedModel extends DelegateBakedModel {
DriveSlotsState slotsState = driveModelData.getSlotsState();
if (side == null && slotsState != null) {
if (slotsState != null) {
for (int row = 0; row < 5; row++) {
for (int col = 0; col < 2; col++) {
Matrix4f transform = new Matrix4f();
@@ -80,7 +80,7 @@ public class DriveBakedModel extends DelegateBakedModel {
// Add the drive chassis
Item cell = slotsState.getCell(slot);
BakedModel cellChassisModel = getCellChassisModel(cell);
addModel(state, rand, extraData, result, cellChassisModel, transform);
addModel(state, rand, extraData, result, side, cellChassisModel, transform);
}
}
}
@@ -112,9 +112,9 @@ public class DriveBakedModel extends DelegateBakedModel {
}
private static void addModel(@Nullable BlockState state, @Nonnull Random rand, @Nonnull IModelData extraData,
List<BakedQuad> result, BakedModel bakedCell, Matrix4f transform) {
List<BakedQuad> result, Direction side, IBakedModel bakedCell, Matrix4f transform) {
MatrixVertexTransformer transformer = new MatrixVertexTransformer(transform);
for (BakedQuad bakedQuad : bakedCell.getQuads(state, null, rand, extraData)) {
for (BakedQuad bakedQuad : bakedCell.getQuads(state, side, rand, extraData)) {
BakedQuadBuilder builder = new BakedQuadBuilder();
transformer.setParent(builder);
transformer.setVertexFormat(builder.getVertexFormat());
src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
+14 -6
View File
@@ -7,6 +7,9 @@ import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.util.math.MatrixStack;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.renderer.RenderState;
@@ -14,7 +17,6 @@ import net.minecraft.client.util.math.Vector3f;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import appeng.block.storage.DriveSlotState;
import appeng.client.render.FacingToRotation;
@@ -26,6 +28,14 @@ import appeng.tile.storage.DriveBlockEntity;
@Environment(EnvType.CLIENT)
public class DriveLedTileEntityRenderer extends BlockEntityRenderer<DriveBlockEntity> {
private static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = new RenderState.TransparencyState(
"translucent_transparency", () -> {
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
}, () -> {
RenderSystem.disableBlend();
});
private static final EnumMap<DriveSlotState, Vector3f> STATE_COLORS;
// Color used for the cell indicator for blinking during recent activity
@@ -80,11 +90,9 @@ public class DriveLedTileEntityRenderer extends BlockEntityRenderer<DriveBlockEn
FacingToRotation.get(drive.getForward(), drive.getUp()).push(ms);
ms.translate(-0.5, -0.5, -0.5);
RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = ObfuscationReflectionHelper
.getPrivateValue(RenderState.class, null, "field_228515_g_");
RenderLayer rt = RenderLayer.makeType("ae_drive_leds", DefaultVertexFormats.POSITION_COLOR, 7, 32565, false, true,
RenderLayer.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).build(false));
VertexConsumer buffer = buffers.getBuffer(STATE);
RenderType rt = RenderType.makeType("ae_drive_leds", DefaultVertexFormats.POSITION_COLOR, 7, 32565, false, true,
RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).build(false));
IVertexBuilder buffer = buffers.getBuffer(STATE);
for (int row = 0; row < 5; row++) {
for (int col = 0; col < 2; col++) {
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell.json
+22
View File
@@ -0,0 +1,22 @@
{
"textures": {
"cell": "appliedenergistics2:block/drive/item_cell"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [9, 13, 1],
"to": [15, 15, 3],
"rotation": { "angle": 0, "axis": "y", "origin": [9, 8, 8] },
"faces": {
"north": {
"uv": [0, 2, 6, 4],
"texture": "#cell",
"cullface": "north"
},
"up": { "uv": [0, 0, 6, 2], "texture": "#cell", "cullface": "north" },
"down": { "uv": [0, 4, 6, 6], "texture": "#cell", "cullface": "north" }
}
}
]
}