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

Ported to 1.16.2-pre

Browse Source
This commit is contained in:
Sebastian Hartte
2020-08-01 17:14:12 +02:00
parent 3d1a919e69
commit 1b31185cdb
90 changed files with 356 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/parts/FacadeItem.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte
BlockState blockState = block.getDefaultState();
final boolean areTileEntitiesEnabled = AEConfig.instance().isFeatureEnabled(AEFeature.TILE_ENTITY_FACADES);
Tag<Block> whitelistTag = BlockTags.getContainer().getOrCreate(TAG_WHITELISTED);
Tag<Block> whitelistTag = BlockTags.getTagGroup().getTagOrEmpty(TAG_WHITELISTED);
final boolean isWhiteListed = block.isIn(whitelistTag);
final boolean isModel = blockState.getRenderType() == BlockRenderType.MODEL;
src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem
return ipb.getColor();
} else {
for (Map.Entry<Identifier, AEColor> entry : TAG_TO_COLOR.entrySet()) {
Tag<Item> tag = ItemTags.getContainer().get(entry.getKey());
Tag<Item> tag = ItemTags.getTagGroup().getTag(entry.getKey());
if (tag != null && paintBall.getItem().isIn(tag)) {
return entry.getValue();
}
src/main/java/appeng/items/tools/powered/MatterCannonItem.java
+2 -2
View File
@@ -185,7 +185,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<
Entity entity = null;
Vec3d entityIntersection = null;
final List list = w.getEntities(p, bb);
final List list = w.getOtherEntities(p, bb);
double closest = 9999999.0D;
for (int l = 0; l < list.size(); ++l) {
@@ -291,7 +291,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<
Entity entity = null;
Vec3d entityIntersection = null;
final List list = w.getEntities(p, bb);
final List list = w.getOtherEntities(p, bb);
double closest = 9999999.0D;
for (int l = 0; l < list.size(); ++l) {