Fix formatting
This commit is contained in:
@@ -67,7 +67,8 @@ public class TinyTNTBlock extends AEBaseBlock {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) {
|
public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player,
|
||||||
|
Hand handIn, BlockRayTraceResult hit) {
|
||||||
ItemStack heldItem = player.getHeldItem(handIn);
|
ItemStack heldItem = player.getHeldItem(handIn);
|
||||||
if (!heldItem.isEmpty() && heldItem.getItem() == Items.FLINT_AND_STEEL) {
|
if (!heldItem.isEmpty() && heldItem.getItem() == Items.FLINT_AND_STEEL) {
|
||||||
this.startFuse(world, pos, player);
|
this.startFuse(world, pos, player);
|
||||||
|
|||||||
@@ -20,9 +20,6 @@ package appeng.core.api.definitions;
|
|||||||
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
import appeng.bootstrap.IItemRendering;
|
|
||||||
import appeng.bootstrap.ItemRenderingCustomizer;
|
|
||||||
import appeng.fluids.items.FluidDummyItemColor;
|
|
||||||
import net.minecraft.entity.EntityClassification;
|
import net.minecraft.entity.EntityClassification;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemGroup;
|
import net.minecraft.item.ItemGroup;
|
||||||
@@ -36,6 +33,8 @@ import appeng.api.features.AEFeature;
|
|||||||
import appeng.api.util.AEColor;
|
import appeng.api.util.AEColor;
|
||||||
import appeng.api.util.AEColoredItemDefinition;
|
import appeng.api.util.AEColoredItemDefinition;
|
||||||
import appeng.bootstrap.FeatureFactory;
|
import appeng.bootstrap.FeatureFactory;
|
||||||
|
import appeng.bootstrap.IItemRendering;
|
||||||
|
import appeng.bootstrap.ItemRenderingCustomizer;
|
||||||
import appeng.core.features.ActivityState;
|
import appeng.core.features.ActivityState;
|
||||||
import appeng.core.features.ColoredItemDefinition;
|
import appeng.core.features.ColoredItemDefinition;
|
||||||
import appeng.core.features.ItemStackSrc;
|
import appeng.core.features.ItemStackSrc;
|
||||||
@@ -47,6 +46,7 @@ import appeng.debug.ReplicatorCardItem;
|
|||||||
import appeng.entity.GrowingCrystalEntity;
|
import appeng.entity.GrowingCrystalEntity;
|
||||||
import appeng.fluids.items.BasicFluidStorageCell;
|
import appeng.fluids.items.BasicFluidStorageCell;
|
||||||
import appeng.fluids.items.FluidDummyItem;
|
import appeng.fluids.items.FluidDummyItem;
|
||||||
|
import appeng.fluids.items.FluidDummyItemColor;
|
||||||
import appeng.hooks.BlockToolDispenseItemBehavior;
|
import appeng.hooks.BlockToolDispenseItemBehavior;
|
||||||
import appeng.hooks.MatterCannonDispenseItemBehavior;
|
import appeng.hooks.MatterCannonDispenseItemBehavior;
|
||||||
import appeng.items.materials.MaterialType;
|
import appeng.items.materials.MaterialType;
|
||||||
@@ -313,8 +313,7 @@ public final class ApiItems implements IItems {
|
|||||||
public void customize(IItemRendering rendering) {
|
public void customize(IItemRendering rendering) {
|
||||||
rendering.color(new FluidDummyItemColor());
|
rendering.color(new FluidDummyItemColor());
|
||||||
}
|
}
|
||||||
})
|
}).build();
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static AEColoredItemDefinition createPaintBalls(FeatureFactory registry, String idSuffix, boolean lumen) {
|
private static AEColoredItemDefinition createPaintBalls(FeatureFactory registry, String idSuffix, boolean lumen) {
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ package appeng.entity;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
@@ -41,6 +43,7 @@ import net.minecraft.world.Explosion;
|
|||||||
import net.minecraft.world.Explosion.Mode;
|
import net.minecraft.world.Explosion.Mode;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
|
import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
|
||||||
|
import net.minecraftforge.fml.network.NetworkHooks;
|
||||||
|
|
||||||
import appeng.api.AEApi;
|
import appeng.api.AEApi;
|
||||||
import appeng.api.features.AEFeature;
|
import appeng.api.features.AEFeature;
|
||||||
@@ -48,9 +51,6 @@ import appeng.core.AEConfig;
|
|||||||
import appeng.core.AppEng;
|
import appeng.core.AppEng;
|
||||||
import appeng.core.sync.packets.MockExplosionPacket;
|
import appeng.core.sync.packets.MockExplosionPacket;
|
||||||
import appeng.util.Platform;
|
import appeng.util.Platform;
|
||||||
import net.minecraftforge.fml.network.NetworkHooks;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAdditionalSpawnData {
|
public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAdditionalSpawnData {
|
||||||
|
|
||||||
@@ -67,8 +67,8 @@ public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAddit
|
|||||||
final LivingEntity igniter) {
|
final LivingEntity igniter) {
|
||||||
super(TYPE, w);
|
super(TYPE, w);
|
||||||
this.setPosition(x, y, z);
|
this.setPosition(x, y, z);
|
||||||
double d0 = w.rand.nextDouble() * (double)((float)Math.PI * 2F);
|
double d0 = w.rand.nextDouble() * (double) ((float) Math.PI * 2F);
|
||||||
this.setMotion(-Math.sin(d0) * 0.02D, (double)0.2F, -Math.cos(d0) * 0.02D);
|
this.setMotion(-Math.sin(d0) * 0.02D, (double) 0.2F, -Math.cos(d0) * 0.02D);
|
||||||
this.setFuse(80);
|
this.setFuse(80);
|
||||||
this.prevPosX = x;
|
this.prevPosX = x;
|
||||||
this.prevPosY = y;
|
this.prevPosY = y;
|
||||||
|
|||||||
@@ -254,7 +254,8 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
|
|||||||
@Override
|
@Override
|
||||||
public void writeToPacket(final PacketBuffer buffer) {
|
public void writeToPacket(final PacketBuffer buffer) {
|
||||||
buffer.writeBoolean(this.isCraftable());
|
buffer.writeBoolean(this.isCraftable());
|
||||||
// Cannot use writeFluidStack here because for FluidStacks with amount==0, it will not write the fluid
|
// Cannot use writeFluidStack here because for FluidStacks with amount==0, it
|
||||||
|
// will not write the fluid
|
||||||
buffer.writeRegistryIdUnsafe(ForgeRegistries.FLUIDS, fluid);
|
buffer.writeRegistryIdUnsafe(ForgeRegistries.FLUIDS, fluid);
|
||||||
buffer.writeCompoundTag(getFluidStack().getTag());
|
buffer.writeCompoundTag(getFluidStack().getTag());
|
||||||
buffer.writeVarLong(this.getStackSize());
|
buffer.writeVarLong(this.getStackSize());
|
||||||
|
|||||||
Reference in New Issue
Block a user