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

More fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-29 21:23:50 +02:00
parent 0d63f560d3
commit ca104912d6
121 changed files with 2623 additions and 2563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java
+4 -4
View File
@@ -19,8 +19,8 @@
package appeng.hooks;
import net.minecraft.block.DispenserBlock;
import net.minecraft.dispenser.DefaultDispenseItemBehavior;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.block.dispenser.ItemDispenserBehavior;
import net.minecraft.util.math.BlockPointer;
import net.minecraft.item.DirectionalPlaceContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -29,10 +29,10 @@ import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import net.minecraft.server.world.ServerWorld;
public final class BlockToolDispenseItemBehavior extends DefaultDispenseItemBehavior {
public final class BlockToolDispenseItemBehavior extends ItemDispenserBehavior {
@Override
protected ItemStack dispenseStack(final IBlockSource dispenser, final ItemStack dispensedItem) {
protected ItemStack dispenseSilently(final BlockPointer dispenser, final ItemStack dispensedItem) {
final Item i = dispensedItem.getItem();
if (i instanceof IBlockTool) {
final Direction direction = dispenser.getBlockState().get(DispenserBlock.FACING);
src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java
+4 -4
View File
@@ -20,8 +20,8 @@ package appeng.hooks;
import appeng.util.FakePlayer;
import net.minecraft.block.DispenserBlock;
import net.minecraft.dispenser.DefaultDispenseItemBehavior;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.block.dispenser.ItemDispenserBehavior;
import net.minecraft.util.math.BlockPointer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -33,10 +33,10 @@ import appeng.api.util.AEPartLocation;
import appeng.items.tools.powered.MatterCannonItem;
import appeng.util.Platform;
public final class MatterCannonDispenseItemBehavior extends DefaultDispenseItemBehavior {
public final class MatterCannonDispenseItemBehavior extends ItemDispenserBehavior {
@Override
protected ItemStack dispenseStack(final IBlockSource dispenser, ItemStack dispensedItem) {
protected ItemStack dispenseSilently(final BlockPointer dispenser, ItemStack dispensedItem) {
final Item i = dispensedItem.getItem();
if (i instanceof MatterCannonItem) {
final Direction Direction = dispenser.getBlockState().get(DispenserBlock.FACING);
src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java
-45
View File
@@ -1,45 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.hooks;
import net.minecraft.block.DispenserBlock;
import net.minecraft.dispenser.DefaultDispenseItemBehavior;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import appeng.entity.TinyTNTPrimedEntity;
public final class TinyTNTDispenseItemBehavior extends DefaultDispenseItemBehavior {
@Override
protected ItemStack dispenseStack(final IBlockSource dispenser, final ItemStack dispensedItem) {
final Direction Direction = dispenser.getBlockState().get(DispenserBlock.FACING);
final World world = dispenser.getWorld();
final int i = dispenser.getBlockPos().getX() + Direction.getOffsetX();
final int j = dispenser.getBlockPos().getY() + Direction.getOffsetY();
final int k = dispenser.getBlockPos().getZ() + Direction.getOffsetZ();
final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(world, i + 0.5F, j + 0.5F, k + 0.5F,
null);
world.spawnEntity(primedTinyTNTEntity);
dispensedItem.setCount(dispensedItem.getCount() - 1);
return dispensedItem;
}
}