Merge remote-tracking branch 'remotes/origin/1.14' into 1.15

This commit is contained in:
modmuss50 2019-09-12 16:55:52 +01:00
commit 6e53132c59
285 changed files with 667 additions and 615 deletions

View file

@ -24,10 +24,8 @@
package techreborn.blocks.misc;
import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.minecraft.block.Material;
import net.minecraft.block.WoodButtonBlock;
import net.minecraft.sound.BlockSoundGroup;
import techreborn.utils.InitUtils;
/**
* @author drcrazy
@ -36,6 +34,6 @@ import net.minecraft.sound.BlockSoundGroup;
public class RubberButtonBlock extends WoodButtonBlock {
public RubberButtonBlock() {
super(FabricBlockSettings.of(Material.PART).noCollision().strength(0.5f, 0.5f).sounds(BlockSoundGroup.WOOD).build());
super(InitUtils.setupRubberBlockSettings(true, 0.5F, 0.5F));
}
}

View file

@ -24,11 +24,8 @@
package techreborn.blocks.misc;
import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.minecraft.block.DoorBlock;
import net.minecraft.block.Material;
import net.minecraft.block.MaterialColor;
import net.minecraft.sound.BlockSoundGroup;
import techreborn.utils.InitUtils;
/**
* @author drcrazy
@ -37,6 +34,6 @@ import net.minecraft.sound.BlockSoundGroup;
public class RubberDoorBlock extends DoorBlock {
public RubberDoorBlock() {
super(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).strength(3.0f, 3.0f).sounds(BlockSoundGroup.WOOD).build());
super(InitUtils.setupRubberBlockSettings(3.0F, 3.0F));
}
}

View file

@ -24,11 +24,8 @@
package techreborn.blocks.misc;
import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.minecraft.block.Material;
import net.minecraft.block.MaterialColor;
import net.minecraft.block.PressurePlateBlock;
import net.minecraft.sound.BlockSoundGroup;
import techreborn.utils.InitUtils;
/**
* @author drcrazy
@ -37,7 +34,7 @@ import net.minecraft.sound.BlockSoundGroup;
public class RubberPressurePlateBlock extends PressurePlateBlock {
public RubberPressurePlateBlock() {
super(PressurePlateBlock.ActivationRule.EVERYTHING, FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).noCollision().strength(0.5f, 0.5f).sounds(BlockSoundGroup.WOOD).build());
super(PressurePlateBlock.ActivationRule.EVERYTHING, InitUtils.setupRubberBlockSettings(true, 0.5F, 0.5F));
}
}

View file

@ -24,11 +24,8 @@
package techreborn.blocks.misc;
import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.minecraft.block.Material;
import net.minecraft.block.MaterialColor;
import net.minecraft.block.TrapdoorBlock;
import net.minecraft.sound.BlockSoundGroup;
import techreborn.utils.InitUtils;
/**
* @author drcrazy
@ -37,7 +34,6 @@ import net.minecraft.sound.BlockSoundGroup;
public class RubberTrapdoorBlock extends TrapdoorBlock {
public RubberTrapdoorBlock() {
super(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).strength(3f, 3f).sounds(BlockSoundGroup.WOOD).build());
super(InitUtils.setupRubberBlockSettings(3.0F, 3.0F));
}
}