20w12a
This commit is contained in:
parent
99b2755887
commit
e4fb1773f3
31 changed files with 56 additions and 56 deletions
|
@ -25,16 +25,16 @@
|
|||
package techreborn.utils;
|
||||
|
||||
import net.fabricmc.fabric.api.block.FabricBlockSettings;
|
||||
import net.minecraft.block.AbstractBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Block.Settings;
|
||||
import net.minecraft.block.Material;
|
||||
import net.minecraft.block.MaterialColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.sound.BlockSoundGroup;
|
||||
import net.minecraft.sound.SoundEvent;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.collection.DefaultedList;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import reborncore.RebornRegistry;
|
||||
import team.reborn.energy.Energy;
|
||||
|
@ -66,7 +66,7 @@ public class InitUtils {
|
|||
itemList.add(charged);
|
||||
}
|
||||
|
||||
public static Settings setupRubberBlockSettings(boolean noCollision, float hardness, float resistance) {
|
||||
public static AbstractBlock.Settings setupRubberBlockSettings(boolean noCollision, float hardness, float resistance) {
|
||||
|
||||
FabricBlockSettings settings = FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE);
|
||||
settings.strength(hardness, resistance);
|
||||
|
@ -74,11 +74,11 @@ public class InitUtils {
|
|||
if (noCollision) {
|
||||
settings.noCollision();
|
||||
}
|
||||
|
||||
settings.materialColor(MaterialColor.SPRUCE);
|
||||
return settings.build();
|
||||
}
|
||||
|
||||
public static Settings setupRubberBlockSettings(float hardness, float resistance) {
|
||||
public static AbstractBlock.Settings setupRubberBlockSettings(float hardness, float resistance) {
|
||||
return setupRubberBlockSettings(false, hardness, resistance);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -69,7 +69,7 @@ public final class PoweredCraftingHandler implements ItemCraftCallback {
|
|||
if (ingredient.isEmpty()){
|
||||
continue;
|
||||
}
|
||||
EnchantmentHelper.getEnchantments(ingredient).forEach((key, value) -> map.merge(key, value, (v1, v2) -> v1 > v2 ? v1 : v2));
|
||||
EnchantmentHelper.get(ingredient).forEach((key, value) -> map.merge(key, value, (v1, v2) -> v1 > v2 ? v1 : v2));
|
||||
}
|
||||
if (!map.isEmpty()){
|
||||
EnchantmentHelper.set(map, stack);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue