mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev

Browse source
This commit is contained in:
simibubi 2020-10-14 20:52:40 +02:00
commit dcd0598e16
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java
View file

@ -1,12 +1,8 @@
package com.simibubi.create.content.contraptions.components.crank; package com.simibubi.create.content.contraptions.components.crank;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.tterrag.registrate.util.entry.BlockEntry;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -16,9 +12,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public class ValveHandleBlock extends HandCrankBlock { public class ValveHandleBlock extends HandCrankBlock {
public static final List<BlockEntry<ValveHandleBlock>> entries = new ArrayList<>();
private final boolean inCreativeTab; private final boolean inCreativeTab;
public static ValveHandleBlock copper(Properties properties) { public static ValveHandleBlock copper(Properties properties) {

6
src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java
View file

@ -40,7 +40,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public class BlazeBurnerBlockItem extends BlockItem { public class BlazeBurnerBlockItem extends BlockItem {
private boolean capturedBlaze; private final boolean capturedBlaze;
public static BlazeBurnerBlockItem empty(Properties properties) { public static BlazeBurnerBlockItem empty(Properties properties) {
return new BlazeBurnerBlockItem(AllBlocks.BLAZE_BURNER.get(), properties, false); return new BlazeBurnerBlockItem(AllBlocks.BLAZE_BURNER.get(), properties, false);
@ -104,7 +104,7 @@ public class BlazeBurnerBlockItem extends BlockItem {
continue; continue;
spawnCaptureEffects(world, VecHelper.getCenterOf(pos)); spawnCaptureEffects(world, VecHelper.getCenterOf(pos));
if (world.isRemote) if (world.isRemote || player == null)
return ActionResultType.SUCCESS; return ActionResultType.SUCCESS;
giveBurnerItemTo(player, context.getItem(), context.getHand()); giveBurnerItemTo(player, context.getItem(), context.getHand());
@ -128,7 +128,7 @@ public class BlazeBurnerBlockItem extends BlockItem {
giveBurnerItemTo(player, heldItem, hand); giveBurnerItemTo(player, heldItem, hand);
entity.remove(); entity.remove();
return true; return false;
} }
protected void giveBurnerItemTo(PlayerEntity player, ItemStack heldItem, Hand hand) { protected void giveBurnerItemTo(PlayerEntity player, ItemStack heldItem, Hand hand) {