diff --git a/api/src/main/java/appeng/api/networking/IGridCacheRegistry.java b/api/src/main/java/appeng/api/networking/IGridCacheRegistry.java index 6febca132..6c6cadb8a 100644 --- a/api/src/main/java/appeng/api/networking/IGridCacheRegistry.java +++ b/api/src/main/java/appeng/api/networking/IGridCacheRegistry.java @@ -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 iface, - @Nonnull Class implementation); + void registerGridCache(@Nonnull Class iface, @Nonnull IGridCacheFactory factory); /** * requests a new INSTANCE of a grid cache for use, used internally diff --git a/api/src/main/java/appeng/api/parts/IPart.java b/api/src/main/java/appeng/api/parts/IPart.java index f1fe13f62..b7c9e609e 100644 --- a/api/src/main/java/appeng/api/parts/IPart.java +++ b/api/src/main/java/appeng/api/parts/IPart.java @@ -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) { diff --git a/core/src/main/java/appeng/core/features/registries/GridCacheRegistry.java b/core/src/main/java/appeng/core/features/registries/GridCacheRegistry.java index 35f6d2fc4..520d06839 100644 --- a/core/src/main/java/appeng/core/features/registries/GridCacheRegistry.java +++ b/core/src/main/java/appeng/core/features/registries/GridCacheRegistry.java @@ -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> caches = new HashMap<>(); + + private final List> registry = new ArrayList<>(); @Override - public void registerGridCache(final Class iface, - final Class 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 void registerGridCache(@Nonnull Class iface, + @Nonnull IGridCacheFactory 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, IGridCache> createCacheInstance(final IGrid g) { - final HashMap, IGridCache> map = new HashMap<>(); + public Map, IGridCache> createCacheInstance(final IGrid g) { + final Map, IGridCache> map = new HashMap<>(registry.size()); - for (final Class iface : this.caches.keySet()) { - try { - final Constructor 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 { + + private final Class cacheClass; + + private final IGridCacheFactory factory; + + public GridCacheRegistration(Class cacheClass, IGridCacheFactory factory) { + this.cacheClass = cacheClass; + this.factory = factory; + } + + } + } diff --git a/core/src/main/java/appeng/fluids/util/AEFluidStack.java b/core/src/main/java/appeng/fluids/util/AEFluidStack.java index 431eeb70b..9701386ff 100644 --- a/core/src/main/java/appeng/fluids/util/AEFluidStack.java +++ b/core/src/main/java/appeng/fluids/util/AEFluidStack.java @@ -259,7 +259,10 @@ public final class AEFluidStack extends AEStack 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()); } diff --git a/core/src/main/java/appeng/me/Grid.java b/core/src/main/java/appeng/me/Grid.java index 1c86bba91..40caef967 100644 --- a/core/src/main/java/appeng/me/Grid.java +++ b/core/src/main/java/appeng/me/Grid.java @@ -42,7 +42,7 @@ import appeng.util.ReadOnlyCollection; public class Grid implements IGrid { private final NetworkEventBus eventBus = new NetworkEventBus(); private final Map, MachineSet> machines = new HashMap<>(); - private final Map, GridCacheWrapper> caches = new HashMap<>(); + private final Map, 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, IGridCache> myCaches = AEApi.instance().registries().gridCache() .createCacheInstance(this); + this.caches = new HashMap<>(myCaches.size()); for (final Entry, IGridCache> c : myCaches.entrySet()) { final Class key = c.getKey(); final IGridCache value = c.getValue(); diff --git a/core/src/main/java/appeng/me/cache/TickManagerCache.java b/core/src/main/java/appeng/me/cache/TickManagerCache.java index 62d3721fa..1f8e43b61 100644 --- a/core/src/main/java/appeng/me/cache/TickManagerCache.java +++ b/core/src/main/java/appeng/me/cache/TickManagerCache.java @@ -40,7 +40,6 @@ import appeng.me.cache.helpers.TickTracker; public class TickManagerCache implements ITickManager { - private final IGrid myGrid; private final HashMap alertable = new HashMap<>(); private final HashMap sleeping = new HashMap<>(); private final HashMap 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); diff --git a/core/src/main/java/appeng/me/cache/helpers/TickTracker.java b/core/src/main/java/appeng/me/cache/helpers/TickTracker.java index 4c3962098..ac8bcb39a 100644 --- a/core/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/core/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -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 { 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 { 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()); diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json b/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json index 178a52dc5..c1e46c708 100644 --- a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json +++ b/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json @@ -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" + } } diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json b/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json index a4f06fb19..5fcaa819c 100644 --- a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json +++ b/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json @@ -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" + } } diff --git a/src/api/java/appeng/api/networking/IGridCacheFactory.java b/src/api/java/appeng/api/networking/IGridCacheFactory.java new file mode 100644 index 000000000..3bab888ee --- /dev/null +++ b/src/api/java/appeng/api/networking/IGridCacheFactory.java @@ -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 { + + /** + * 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); + +} diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index 5d7a8ace1..9bc000609 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -83,7 +83,7 @@ public class CableBusBlock extends AEBaseTileBlock implemen public CableBusBlock() { super(defaultProps(AEGlassMaterial.INSTANCE) .nonOpaque() - .dropsNothing()); + .dropsNothing().variableOpacity()); } @Override diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java index 091ca6e46..44bce5c65 100644 --- a/src/main/java/appeng/client/render/model/DriveBakedModel.java +++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java @@ -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 result, BakedModel bakedCell, Matrix4f transform) { + List 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()); diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java index efb790a43..3db6cbcc9 100644 --- a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java @@ -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 { + private static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = new RenderState.TransparencyState( + "translucent_transparency", () -> { + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + }, () -> { + RenderSystem.disableBlend(); + }); + private static final EnumMap STATE_COLORS; // Color used for the cell indicator for blinking during recent activity @@ -80,11 +90,9 @@ public class DriveLedTileEntityRenderer extends BlockEntityRenderer