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

Migrations

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 16:18:20 +02:00
parent d638d083c2
commit ba71a82288
303 changed files with 1216 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
+6 -6
View File
@@ -2,11 +2,11 @@
package appeng.parts.automation;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import appeng.api.config.Actionable;
import appeng.api.config.Settings;
@@ -164,7 +164,7 @@ public abstract class AbstractFormationPlanePart<T extends IAEStack<T>> extends
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) {
if (pos.offset(this.getSide().getFacing()).equals(neighbor)) {
final TileEntity te = this.getHost().getTile();
final AEPartLocation side = this.getSide();
@@ -199,13 +199,13 @@ public abstract class AbstractFormationPlanePart<T extends IAEStack<T>> extends
}
@Override
public void readFromNBT(final CompoundNBT data) {
public void readFromNBT(final CompoundTag data) {
super.readFromNBT(data);
this.priority = data.getInt("priority");
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
super.writeToNBT(data);
data.putInt("priority", this.getPriority());
}
src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
+4 -4
View File
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.block.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.item.Item;
@@ -35,11 +35,11 @@ import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.client.model.data.IModelData;
@@ -214,7 +214,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) {
if (pos.offset(this.getSide().getFacing()).equals(neighbor)) {
this.refresh();
}
src/main/java/appeng/parts/automation/ExportBusPart.java
+3 -3
View File
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableSet;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.Vec3d;
@@ -102,14 +102,14 @@ public class ExportBusPart extends SharedItemBusPart implements ICraftingRequest
}
@Override
public void readFromNBT(final CompoundNBT extra) {
public void readFromNBT(final CompoundTag extra) {
super.readFromNBT(extra);
this.craftingTracker.readFromNBT(extra);
this.nextSlot = extra.getInt("nextSlot");
}
@Override
public void writeToNBT(final CompoundNBT extra) {
public void writeToNBT(final CompoundTag extra) {
super.writeToNBT(extra);
this.craftingTracker.writeToNBT(extra);
extra.putInt("nextSlot", this.nextSlot);
src/main/java/appeng/parts/automation/FormationPlanePart.java
+8 -8
View File
@@ -37,10 +37,10 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.item.WallOrFloorItem;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.ActionResult;
import net.minecraft.util.math.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
@@ -150,14 +150,14 @@ public class FormationPlanePart extends AbstractFormationPlanePart<IAEItemStack>
}
@Override
public void readFromNBT(final CompoundNBT data) {
public void readFromNBT(final CompoundTag data) {
super.readFromNBT(data);
this.Config.readFromNBT(data, "config");
this.updateHandler();
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
super.writeToNBT(data);
this.Config.writeToNBT(data, "config");
}
@@ -243,20 +243,20 @@ public class FormationPlanePart extends AbstractFormationPlanePart<IAEItemStack>
// Up or Down, Attempt 1??
if (side.xOffset == 0 && side.zOffset == 0) {
Worked = i.onItemUse(new DirectionalPlaceContext(w, placePos.offset(side.getFacing()),
lookDirection, is, side.getFacing())) == ActionResultType.SUCCESS;
lookDirection, is, side.getFacing())) == ActionResult.SUCCESS;
}
// Up or Down, Attempt 2??
if (!Worked && side.xOffset == 0 && side.zOffset == 0) {
Worked = i.onItemUse(new DirectionalPlaceContext(w,
placePos.offset(side.getFacing().getOpposite()), lookDirection, is,
side.getFacing().getOpposite())) == ActionResultType.SUCCESS;
side.getFacing().getOpposite())) == ActionResult.SUCCESS;
}
// Horizontal, attempt 1??
if (!Worked && side.yOffset == 0) {
Worked = i.onItemUse(new DirectionalPlaceContext(w, placePos.offset(Direction.DOWN),
lookDirection, is, Direction.DOWN)) == ActionResultType.SUCCESS;
lookDirection, is, Direction.DOWN)) == ActionResult.SUCCESS;
}
if (!Worked) {
src/main/java/appeng/parts/automation/LevelEmitterPart.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.util.Random;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.particles.RedstoneParticleData;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Hand;
@@ -437,7 +437,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH
}
@Override
public void readFromNBT(final CompoundNBT data) {
public void readFromNBT(final CompoundTag data) {
super.readFromNBT(data);
this.lastReportedValue = data.getLong("lastReportedValue");
this.reportingValue = data.getLong("reportingValue");
@@ -446,7 +446,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
super.writeToNBT(data);
data.putLong("lastReportedValue", this.lastReportedValue);
data.putLong("reportingValue", this.reportingValue);
src/main/java/appeng/parts/automation/PlaneBakedModel.java
+1 -1
View File
@@ -33,7 +33,7 @@ import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
src/main/java/appeng/parts/automation/SharedItemBusPart.java
+4 -4
View File
@@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
@@ -49,13 +49,13 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid
}
@Override
public void readFromNBT(final net.minecraft.nbt.CompoundNBT extra) {
public void readFromNBT(final net.minecraft.nbt.CompoundTag extra) {
super.readFromNBT(extra);
this.getConfig().readFromNBT(extra, "config");
}
@Override
public void writeToNBT(final net.minecraft.nbt.CompoundNBT extra) {
public void writeToNBT(final net.minecraft.nbt.CompoundTag extra) {
super.writeToNBT(extra);
this.getConfig().writeToNBT(extra, "config");
}
@@ -70,7 +70,7 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) {
this.updateState();
if (this.lastRedstone != this.getHost().hasRedstone(this.getSide())) {
this.lastRedstone = !this.lastRedstone;
src/main/java/appeng/parts/automation/UpgradeInventory.java
+2 -2
View File
@@ -21,7 +21,7 @@ package appeng.parts.automation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraftforge.items.IItemHandler;
import appeng.api.config.Upgrades;
@@ -123,7 +123,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
}
@Override
public void readFromNBT(final CompoundNBT target) {
public void readFromNBT(final CompoundTag target) {
super.readFromNBT(target);
this.updateUpgradeInfo();
}
src/main/java/appeng/parts/automation/UpgradeablePart.java
+2 -2
View File
@@ -106,14 +106,14 @@ public abstract class UpgradeablePart extends BasicStatePart implements IAEAppEn
}
@Override
public void readFromNBT(final net.minecraft.nbt.CompoundNBT extra) {
public void readFromNBT(final net.minecraft.nbt.CompoundTag extra) {
super.readFromNBT(extra);
this.manager.readFromNBT(extra);
this.upgrades.readFromNBT(extra, "upgrades");
}
@Override
public void writeToNBT(final net.minecraft.nbt.CompoundNBT extra) {
public void writeToNBT(final net.minecraft.nbt.CompoundTag extra) {
super.writeToNBT(extra);
this.manager.writeToNBT(extra);
this.upgrades.writeToNBT(extra, "upgrades");