Skip to content

Commit

Permalink
Resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@YocyCraft
YocyCraft committed Jan 24, 2025
1 parent 4a3ba6d commit 030d54a
Showing 1 changed file with 24 additions and 22 deletions.
46 changes: 24 additions & 22 deletions src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@
import dev.dubhe.anvilcraft.util.ModelProviderUtil;
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.recipes.RecipeCategory;
Expand Down Expand Up @@ -175,14 +175,16 @@
import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.neoforged.neoforge.client.model.generators.ConfiguredModel;
import net.neoforged.neoforge.common.Tags;
import org.jetbrains.annotations.NotNull;

import javax.annotation.ParametersAreNonnullByDefault;
import java.util.function.Supplier;

import static dev.dubhe.anvilcraft.AnvilCraft.REGISTRATE;
import static dev.dubhe.anvilcraft.api.power.IPowerComponent.OVERLOAD;
import static dev.dubhe.anvilcraft.api.power.IPowerComponent.SWITCH;

@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@SuppressWarnings({"unused", "CodeBlock2Expr"})
public class ModBlocks {

Expand Down Expand Up @@ -3245,7 +3247,7 @@ public class ModBlocks {

public static final Object2ObjectMap<Color, BlockEntry<CementCauldronBlock>> CEMENT_CAULDRONS = registerAllCementCauldrons();

private static @NotNull Object2ObjectMap<Color, BlockEntry<ReinforcedConcreteBlock>> registerReinforcedConcretes() {
private static Object2ObjectMap<Color, BlockEntry<ReinforcedConcreteBlock>> registerReinforcedConcretes() {
Object2ObjectMap<Color, BlockEntry<ReinforcedConcreteBlock>> map = new Object2ObjectLinkedOpenHashMap<>();
for (Color color : Color.values()) {
var entry = registerReinforcedConcreteBlock(color);
Expand All @@ -3254,7 +3256,7 @@ public class ModBlocks {
return map;
}

private static @NotNull BlockEntry<ReinforcedConcreteBlock> registerReinforcedConcreteBlock(@NotNull Color color) {
private static BlockEntry<ReinforcedConcreteBlock> registerReinforcedConcreteBlock(Color color) {
return REGISTRATE
.block("reinforced_concrete_" + color, ReinforcedConcreteBlock::new)
.initialProperties(() -> Blocks.TERRACOTTA)
Expand Down Expand Up @@ -3298,7 +3300,7 @@ public class ModBlocks {
.register();
}

private static @NotNull Object2ObjectMap<Color, BlockEntry<SlabBlock>> registerReinforcedConcreteSlabs() {
private static Object2ObjectMap<Color, BlockEntry<SlabBlock>> registerReinforcedConcreteSlabs() {
Object2ObjectMap<Color, BlockEntry<SlabBlock>> map = new Object2ObjectLinkedOpenHashMap<>();
for (Color color : Color.values()) {
var entry = registerReinforcedConcreteSlabBlock(color, REINFORCED_CONCRETES.get(color));
Expand All @@ -3307,8 +3309,8 @@ public class ModBlocks {
return map;
}

private static @NotNull BlockEntry<SlabBlock> registerReinforcedConcreteSlabBlock(
@NotNull Color color, BlockEntry<ReinforcedConcreteBlock> parent) {
private static BlockEntry<SlabBlock> registerReinforcedConcreteSlabBlock(
Color color, BlockEntry<ReinforcedConcreteBlock> parent) {
return REGISTRATE
.block("reinforced_concrete_" + color + "_slab", SlabBlock::new)
.initialProperties(() -> Blocks.TERRACOTTA)
Expand Down Expand Up @@ -3345,7 +3347,7 @@ public class ModBlocks {
.register();
}

private static @NotNull Object2ObjectMap<Color, BlockEntry<StairBlock>> registerReinforcedConcreteStairs() {
private static Object2ObjectMap<Color, BlockEntry<StairBlock>> registerReinforcedConcreteStairs() {
Object2ObjectMap<Color, BlockEntry<StairBlock>> map = new Object2ObjectLinkedOpenHashMap<>();
for (Color color : Color.values()) {
var entry = registerReinforcedConcreteStairBlock(color, REINFORCED_CONCRETES.get(color));
Expand All @@ -3354,8 +3356,8 @@ public class ModBlocks {
return map;
}

private static @NotNull BlockEntry<StairBlock> registerReinforcedConcreteStairBlock(
@NotNull Color color, BlockEntry<ReinforcedConcreteBlock> parent) {
private static BlockEntry<StairBlock> registerReinforcedConcreteStairBlock(
Color color, BlockEntry<ReinforcedConcreteBlock> parent) {
return REGISTRATE
.block(
"reinforced_concrete_" + color + "_stair",
Expand Down Expand Up @@ -3392,7 +3394,7 @@ public class ModBlocks {
.register();
}

private static @NotNull Object2ObjectMap<Color, BlockEntry<WallBlock>> registerReinforcedConcreteWalls() {
private static Object2ObjectMap<Color, BlockEntry<WallBlock>> registerReinforcedConcreteWalls() {
Object2ObjectMap<Color, BlockEntry<WallBlock>> map = new Object2ObjectLinkedOpenHashMap<>();
for (Color color : Color.values()) {
var entry = registerReinforcedConcreteWallBlock(color, REINFORCED_CONCRETES.get(color));
Expand All @@ -3401,8 +3403,8 @@ public class ModBlocks {
return map;
}

private static @NotNull BlockEntry<WallBlock> registerReinforcedConcreteWallBlock(
@NotNull Color color, BlockEntry<ReinforcedConcreteBlock> parent) {
private static BlockEntry<WallBlock> registerReinforcedConcreteWallBlock(
Color color, BlockEntry<ReinforcedConcreteBlock> parent) {
return REGISTRATE
.block("reinforced_concrete_" + color + "_wall", WallBlock::new)
.initialProperties(() -> Blocks.TERRACOTTA)
Expand Down Expand Up @@ -3439,7 +3441,7 @@ public class ModBlocks {
.register();
}

private static @NotNull Object2ObjectMap<Color, BlockEntry<CementCauldronBlock>> registerAllCementCauldrons() {
private static Object2ObjectMap<Color, BlockEntry<CementCauldronBlock>> registerAllCementCauldrons() {
Object2ObjectMap<Color, BlockEntry<CementCauldronBlock>> map = new Object2ObjectLinkedOpenHashMap<>();
for (Color color : Color.values()) {
var entry = registerCementCauldron(color);
Expand All @@ -3448,7 +3450,7 @@ public class ModBlocks {
return map;
}

private static @NotNull BlockEntry<CementCauldronBlock> registerCementCauldron(Color color) {
private static BlockEntry<CementCauldronBlock> registerCementCauldron(Color color) {
return REGISTRATE
.block("%s_cement_cauldron".formatted(color), p -> new CementCauldronBlock(p, color))
.initialProperties(() -> Blocks.CAULDRON)
Expand All @@ -3472,7 +3474,7 @@ public class ModBlocks {
.register();
}

private static @NotNull BlockEntry<? extends TimeCountedPressurePlateBlock> registerOtherCopperPressurePlate(String prefix, @NotNull Block block, int tickCount) {
private static BlockEntry<? extends TimeCountedPressurePlateBlock> registerOtherCopperPressurePlate(String prefix, Block block, int tickCount) {
ResourceLocation location = BuiltInRegistries.BLOCK.getKey(block);
String id = prefix + "copper" + "_pressure_plate";
return REGISTRATE
Expand All @@ -3499,8 +3501,8 @@ public class ModBlocks {
}

@SuppressWarnings("SameParameterValue")
private static @NotNull BlockEntry<? extends PowerLevelPressurePlateBlock> registerPressurePlate(
String type, @NotNull Supplier<? extends Block> block,
private static BlockEntry<? extends PowerLevelPressurePlateBlock> registerPressurePlate(
String type, Supplier<? extends Block> block,
NonNullFunction<BlockBehaviour.Properties, ? extends PowerLevelPressurePlateBlock> plateBlockFactory,
Item... ingredients
) {
Expand Down Expand Up @@ -3544,8 +3546,8 @@ public class ModBlocks {
}

@SafeVarargs
private static @NotNull BlockEntry<? extends PowerLevelPressurePlateBlock> registerPressurePlate(
String type, @NotNull Supplier<? extends Block> block,
private static BlockEntry<? extends PowerLevelPressurePlateBlock> registerPressurePlate(
String type, Supplier<? extends Block> block,
NonNullFunction<BlockBehaviour.Properties, ? extends PowerLevelPressurePlateBlock> plateBlockFactory,
TagKey<Item>... ingredients
) {
Expand Down Expand Up @@ -3649,7 +3651,7 @@ public class ModBlocks {

public static final Object2ObjectMap<Color, BlockEntry<LiquidBlock>> CEMENTS = registerAllCementLiquidBlock();

private static @NotNull Object2ObjectMap<Color, BlockEntry<LiquidBlock>> registerAllCementLiquidBlock() {
private static Object2ObjectMap<Color, BlockEntry<LiquidBlock>> registerAllCementLiquidBlock() {
Object2ObjectMap<Color, BlockEntry<LiquidBlock>> map = new Object2ObjectLinkedOpenHashMap<>();
for (Color color : Color.values()) {
var entry = registerCementLiquidBlock(color);
Expand All @@ -3658,7 +3660,7 @@ public class ModBlocks {
return map;
}

private static @NotNull BlockEntry<LiquidBlock> registerCementLiquidBlock(Color color) {
private static BlockEntry<LiquidBlock> registerCementLiquidBlock(Color color) {
return REGISTRATE
.block("%s_cement".formatted(color), p -> new LiquidBlock(ModFluids.SOURCE_CEMENTS.get(color).get(), p))
.properties(it -> it
Expand Down

0 comments on commit 030d54a

Please sign in to comment.