MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MaterialColor -> MapColor

Browse source
This commit is contained in:
Frank 2023-05-24 19:04:49 +02:00
parent d79885e15f
commit 295f9926bd
26 changed files with 101 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/betterx/betterend/blocks/AeterniumBlock.java
View file

@ -8,14 +8,14 @@ import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class AeterniumBlock extends BaseBlock implements CustomItemProvider {
public AeterniumBlock() {
super(FabricBlockSettings
.of(Material.METAL, MaterialColor.COLOR_GRAY)
.of(Material.METAL, MapColor.COLOR_GRAY)
.hardness(65F)
.resistance(1200F)
.requiresCorrectToolForDrops()

4
src/main/java/org/betterx/betterend/blocks/AmaranitaStemBlock.java
View file

@ -3,12 +3,12 @@ package org.betterx.betterend.blocks;
import org.betterx.bclib.blocks.BaseRotatedPillarBlock;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class AmaranitaStemBlock extends BaseRotatedPillarBlock {
public AmaranitaStemBlock() {
super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).mapColor(MaterialColor.COLOR_LIGHT_GREEN));
super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).mapColor(MapColor.COLOR_LIGHT_GREEN));
}
}

4
src/main/java/org/betterx/betterend/blocks/AmberBlock.java
View file

@ -3,12 +3,12 @@ package org.betterx.betterend.blocks;
import org.betterx.bclib.blocks.BaseBlock;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class AmberBlock extends BaseBlock {
public AmberBlock() {
super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MaterialColor.COLOR_YELLOW));
super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.COLOR_YELLOW));
}
}

4
src/main/java/org/betterx/betterend/blocks/BrimstoneBlock.java
View file

@ -20,7 +20,7 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -30,7 +30,7 @@ public class BrimstoneBlock extends BaseBlock {
public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
public BrimstoneBlock() {
super(FabricBlockSettings.copyOf(Blocks.END_STONE).mapColor(MaterialColor.COLOR_BROWN).randomTicks());
super(FabricBlockSettings.copyOf(Blocks.END_STONE).mapColor(MapColor.COLOR_BROWN).randomTicks());
registerDefaultState(stateDefinition.any().setValue(ACTIVATED, false));
}

4
src/main/java/org/betterx/betterend/blocks/BulbVineLanternBlock.java
View file

@ -16,7 +16,7 @@ import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
@ -38,7 +38,7 @@ public class BulbVineLanternBlock extends EndLanternBlock implements RenderLayer
this(FabricBlockSettings.of(Material.METAL)
.hardness(1)
.resistance(1)
.mapColor(MaterialColor.COLOR_LIGHT_GRAY)
.mapColor(MapColor.COLOR_LIGHT_GRAY)
.luminance(15)
.requiresCorrectToolForDrops()
.sound(SoundType.LANTERN));

4
src/main/java/org/betterx/betterend/blocks/CrystalMossCoverBlock.java
View file

@ -21,7 +21,7 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -29,7 +29,7 @@ public class CrystalMossCoverBlock extends MultifaceBlock implements Bonemealabl
private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
private final MultifaceSpreader spreader = new MultifaceSpreader(this);
public CrystalMossCoverBlock(MaterialColor color) {
public CrystalMossCoverBlock(MapColor color) {
super(FabricBlockSettings.of(Material.REPLACEABLE_PLANT, color)
.noCollission()
.strength(0.2f)

4
src/main/java/org/betterx/betterend/blocks/EndStoneSmelter.java
View file

@ -28,7 +28,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.DirectionProperty;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.minecraft.world.phys.BlockHitResult;
@ -48,7 +48,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity implements AlloyingReci
public static final String ID = "end_stone_smelter";
public EndStoneSmelter() {
super(FabricBlockSettings.of(Material.STONE, MaterialColor.COLOR_GRAY)
super(FabricBlockSettings.of(Material.STONE, MapColor.COLOR_GRAY)
.luminance(state -> state.getValue(LIT) ? 15 : 0)
.hardness(4F)
.resistance(100F)

4
src/main/java/org/betterx/betterend/blocks/EnderBlock.java
View file

@ -7,7 +7,7 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@ -16,7 +16,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class EnderBlock extends BaseBlock {
public EnderBlock() {
super(FabricBlockSettings.of(Material.STONE, MaterialColor.WARPED_WART_BLOCK)
super(FabricBlockSettings.of(Material.STONE, MapColor.WARPED_WART_BLOCK)
.hardness(5F)
.resistance(6F)
.requiresCorrectToolForDrops()

4
src/main/java/org/betterx/betterend/blocks/GlowingPillarLuminophorBlock.java
View file

@ -15,7 +15,7 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -24,7 +24,7 @@ public class GlowingPillarLuminophorBlock extends BaseBlock implements AddMineab
public GlowingPillarLuminophorBlock() {
super(FabricBlockSettings.of(Material.LEAVES)
.mapColor(MaterialColor.COLOR_ORANGE)
.mapColor(MapColor.COLOR_ORANGE)
.strength(0.2F)
.luminance(15)
.sound(SoundType.GRASS));

4
src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java
View file

@ -22,7 +22,7 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.level.storage.loot.LootContext;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -36,7 +36,7 @@ public class HelixTreeLeavesBlock extends BaseBlock implements CustomColorProvid
public HelixTreeLeavesBlock() {
super(FabricBlockSettings
.of(Material.LEAVES)
.mapColor(MaterialColor.COLOR_ORANGE)
.mapColor(MapColor.COLOR_ORANGE)
.sound(SoundType.WART_BLOCK)
.sound(SoundType.GRASS)
.strength(0.2F)

4
src/main/java/org/betterx/betterend/blocks/HydraluxPetalBlock.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -20,7 +20,7 @@ public class HydraluxPetalBlock extends BaseBlock implements AddMineableAxe {
.of(Material.PLANT)
.hardness(1)
.resistance(1)
.mapColor(MaterialColor.PODZOL)
.mapColor(MapColor.PODZOL)
.sound(SoundType.WART_BLOCK)
);
}

4
src/main/java/org/betterx/betterend/blocks/PallidiumBlock.java
View file

@ -15,7 +15,7 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.phys.BlockHitResult;
import net.fabricmc.api.EnvType;
@ -27,7 +27,7 @@ public class PallidiumBlock extends EndTerrainBlock {
private final Block nextLevel;
public PallidiumBlock(String thickness, Block nextLevel) {
super(MaterialColor.COLOR_LIGHT_GRAY);
super(MapColor.COLOR_LIGHT_GRAY);
this.nextLevel = nextLevel;
}

4
src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@ -21,7 +21,7 @@ import java.util.List;
public class ShadowGrassBlock extends EndTerrainBlock implements TagProvider {
public ShadowGrassBlock() {
super(MaterialColor.COLOR_BLACK);
super(MapColor.COLOR_BLACK);
}
@Environment(EnvType.CLIENT)

2
src/main/java/org/betterx/betterend/blocks/SmaragdantCrystalShardBlock.java
View file

@ -37,7 +37,7 @@ public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements Ad
public SmaragdantCrystalShardBlock() {
super(FabricBlockSettings.of(Material.STONE)
.materialColor(MaterialColor.COLOR_GREEN)
.materialColor(MapColor.COLOR_GREEN)
.luminance(15)
.sound(SoundType.AMETHYST_CLUSTER)
.requiresCorrectToolForDrops()

2
src/main/java/org/betterx/betterend/blocks/SulphurCrystalBlock.java
View file

@ -47,7 +47,7 @@ public class SulphurCrystalBlock extends BaseAttachedBlock implements AddMineabl
public SulphurCrystalBlock() {
super(FabricBlockSettings.of(Material.STONE)
.materialColor(MaterialColor.COLOR_YELLOW)
.materialColor(MapColor.COLOR_YELLOW)
.sound(SoundType.GLASS)
.requiresCorrectToolForDrops()
.noCollission());

4
src/main/java/org/betterx/betterend/blocks/UmbrellaTreeClusterBlock.java
View file

@ -20,7 +20,7 @@ import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.phys.BlockHitResult;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -31,7 +31,7 @@ public class UmbrellaTreeClusterBlock extends BaseBlock {
public UmbrellaTreeClusterBlock() {
super(FabricBlockSettings
.copyOf(Blocks.NETHER_WART_BLOCK)
.mapColor(MaterialColor.COLOR_PURPLE)
.mapColor(MapColor.COLOR_PURPLE)
.luminance(15)
);
registerDefaultState(stateDefinition.any().setValue(NATURAL, false));

4
src/main/java/org/betterx/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -22,7 +22,7 @@ public class UmbrellaTreeClusterEmptyBlock extends BaseBlock {
public UmbrellaTreeClusterEmptyBlock() {
super(FabricBlockSettings
.copyOf(Blocks.NETHER_WART_BLOCK)
.mapColor(MaterialColor.COLOR_PURPLE)
.mapColor(MapColor.COLOR_PURPLE)
.randomTicks()
);
registerDefaultState(stateDefinition.any().setValue(NATURAL, false));

6
src/main/java/org/betterx/betterend/blocks/basis/EndAnvilBlock.java
View file

@ -3,16 +3,16 @@ package org.betterx.betterend.blocks.basis;
import org.betterx.bclib.blocks.LeveledAnvilBlock;
import org.betterx.betterend.complexmaterials.MetalMaterial;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
public class EndAnvilBlock extends LeveledAnvilBlock {
protected MetalMaterial metalMaterial;
public EndAnvilBlock(MaterialColor color, int level) {
public EndAnvilBlock(MapColor color, int level) {
super(color, level);
}
public EndAnvilBlock(MetalMaterial metalMaterial, MaterialColor color, int level) {
public EndAnvilBlock(MetalMaterial metalMaterial, MapColor color, int level) {
super(color, level);
this.metalMaterial = metalMaterial;
}

4
src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java
View file

@ -9,12 +9,12 @@ import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import java.util.List;
public class EndTerrainBlock extends BaseTerrainBlock implements PottableTerrain, TagProvider {
public EndTerrainBlock(MaterialColor color) {
public EndTerrainBlock(MapColor color) {
super(Blocks.END_STONE, color);
}

4
src/main/java/org/betterx/betterend/blocks/basis/EndTripleTerrain.java
View file

@ -4,10 +4,10 @@ import org.betterx.bclib.blocks.TripleTerrainBlock;
import org.betterx.betterend.interfaces.PottableTerrain;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
public class EndTripleTerrain extends TripleTerrainBlock implements PottableTerrain {
public EndTripleTerrain(MaterialColor color) {
public EndTripleTerrain(MapColor color) {
super(Blocks.END_STONE, color);
}
}

6
src/main/java/org/betterx/betterend/blocks/basis/PottableLeavesBlock.java
View file

@ -4,15 +4,15 @@ import org.betterx.bclib.blocks.BaseLeavesBlock;
import org.betterx.betterend.interfaces.PottablePlant;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
public class PottableLeavesBlock extends BaseLeavesBlock implements PottablePlant {
public PottableLeavesBlock(Block sapling, MaterialColor color) {
public PottableLeavesBlock(Block sapling, MapColor color) {
super(sapling, color);
}
public PottableLeavesBlock(Block sapling, MaterialColor color, int light) {
public PottableLeavesBlock(Block sapling, MapColor color, int light) {
super(sapling, color, light);
}