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

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/hooks/DispenserBlockTool.java → src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java
+1 -1
View File
@@ -29,7 +29,7 @@ import net.minecraft.util.Direction;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
public final class DispenserBlockTool extends DefaultDispenseItemBehavior {
public final class BlockToolDispenseItemBehavior extends DefaultDispenseItemBehavior {
@Override
protected ItemStack dispenseStack(final IBlockSource dispenser, final ItemStack dispensedItem) {
src/main/java/appeng/hooks/CompassManager.java
+2 -5
View File
@@ -21,11 +21,8 @@ package appeng.hooks;
import java.util.HashMap;
import java.util.Iterator;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.server.ServerWorld;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketCompassRequest;
import appeng.core.sync.packets.CompassRequestPacket;
public class CompassManager {
@@ -67,7 +64,7 @@ public class CompassManager {
}
private void requestUpdate(final CompassRequest r) {
NetworkHandler.instance().sendToServer(new PacketCompassRequest(r.attunement, r.cx, r.cz, r.cdy));
NetworkHandler.instance().sendToServer(new CompassRequestPacket(r.attunement, r.cx, r.cz, r.cdy));
}
private static class CompassRequest {
src/main/java/appeng/hooks/DispenserMatterCannon.java → src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java
+4 -4
View File
@@ -29,15 +29,15 @@ import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import appeng.api.util.AEPartLocation;
import appeng.items.tools.powered.ToolMatterCannon;
import appeng.items.tools.powered.MatterCannonItem;
import appeng.util.Platform;
public final class DispenserMatterCannon extends DefaultDispenseItemBehavior {
public final class MatterCannonDispenseItemBehavior extends DefaultDispenseItemBehavior {
@Override
protected ItemStack dispenseStack(final IBlockSource dispenser, ItemStack dispensedItem) {
final Item i = dispensedItem.getItem();
if (i instanceof ToolMatterCannon) {
if (i instanceof MatterCannonItem) {
final Direction Direction = dispenser.getBlockState().get(DispenserBlock.FACING);
AEPartLocation dir = AEPartLocation.INTERNAL;
for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) {
@@ -47,7 +47,7 @@ public final class DispenserMatterCannon extends DefaultDispenseItemBehavior {
}
}
final ToolMatterCannon tm = (ToolMatterCannon) i;
final MatterCannonItem tm = (MatterCannonItem) i;
final World w = dispenser.getWorld();
if (w instanceof ServerWorld) {
src/main/java/appeng/hooks/TickHandler.java
+7 -7
View File
@@ -49,10 +49,10 @@ import appeng.api.util.AEColor;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.AppEng;
import appeng.core.sync.packets.PacketPaintedEntity;
import appeng.core.sync.packets.PaintedEntityPacket;
import appeng.crafting.CraftingJob;
import appeng.me.Grid;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
import appeng.util.IWorldCallable;
import appeng.util.Platform;
@@ -90,7 +90,7 @@ public class TickHandler {
}
}
public void addInit(final AEBaseTile tile) {
public void addInit(final AEBaseTileEntity tile) {
if (Platform.isServer()) // for no there is no reason to care about this on the client...
{
this.getRepo().tiles.add(tile);
@@ -181,7 +181,7 @@ public class TickHandler {
// ready tiles.
final HandlerRep repo = this.getRepo();
while (!repo.tiles.isEmpty()) {
final AEBaseTile bt = repo.tiles.poll();
final AEBaseTileEntity bt = repo.tiles.poll();
if (!bt.isRemoved()) {
bt.onReady();
}
@@ -249,7 +249,7 @@ public class TickHandler {
private static class HandlerRep {
private Queue<AEBaseTile> tiles = new ArrayDeque<>();
private Queue<AEBaseTileEntity> tiles = new ArrayDeque<>();
private Set<Grid> networks = new HashSet<>();
private Set<Grid> toAdd = new HashSet<>();
private Set<Grid> toRemove = new HashSet<>();
@@ -292,8 +292,8 @@ public class TickHandler {
this.ticksLeft = ticks;
}
public PacketPaintedEntity getPacket() {
return new PacketPaintedEntity(this.myEntity, this.myColor, this.ticksLeft);
public PaintedEntityPacket getPacket() {
return new PaintedEntityPacket(this.myEntity, this.myColor, this.ticksLeft);
}
}
}
src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java → src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java
+3 -3
View File
@@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.world.World;
import appeng.entity.EntityTinyTNTPrimed;
import appeng.entity.TinyTNTPrimedEntity;
public final class DispenserBehaviorTinyTNT extends DefaultDispenseItemBehavior {
public final class TinyTNTDispenseItemBehavior extends DefaultDispenseItemBehavior {
@Override
protected ItemStack dispenseStack(final IBlockSource dispenser, final ItemStack dispensedItem) {
@@ -36,7 +36,7 @@ public final class DispenserBehaviorTinyTNT extends DefaultDispenseItemBehavior
final int i = dispenser.getBlockPos().getX() + Direction.getXOffset();
final int j = dispenser.getBlockPos().getY() + Direction.getYOffset();
final int k = dispenser.getBlockPos().getZ() + Direction.getZOffset();
final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed(world, i + 0.5F, j + 0.5F, k + 0.5F,
final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(world, i + 0.5F, j + 0.5F, k + 0.5F,
null);
world.addEntity(primedTinyTNTEntity);
dispensedItem.setCount(dispensedItem.getCount() - 1);