From 086657198ebef6e3069d732695407d44f52b7de4 Mon Sep 17 00:00:00 2001
From: Aleksey <bulldog.seregin@gmail.com>
Date: Fri, 30 Apr 2021 13:28:40 +0300
Subject: [PATCH] Resolve conflicts

---
 .../ru/betterend/blocks/basis/BlockBase.java  | 53 ++-----------------
 .../ru/betterend/patterns/BlockPatterned.java | 19 +------
 2 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBase.java b/src/main/java/ru/betterend/blocks/basis/BlockBase.java
index 0e88b49e..3f2b09e7 100644
--- a/src/main/java/ru/betterend/blocks/basis/BlockBase.java
+++ b/src/main/java/ru/betterend/blocks/basis/BlockBase.java
@@ -1,47 +1,3 @@
-<<<<<<< Updated upstream
-package ru.betterend.blocks.basis;
-
-import java.io.Reader;
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
-import ru.betterend.patterns.BlockPatterned;
-import ru.betterend.patterns.Patterns;
-
-public class BlockBase extends Block implements BlockPatterned {
-	public BlockBase(Properties settings) {
-		super(settings);
-	}
-	
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
-	@Override
-	public String getStatesPattern(Reader data) {
-		String block = Registry.BLOCK.getKey(this).getPath();
-		return Patterns.createJson(data, block, block);
-	}
-	
-	@Override
-	public String getModelPattern(String block) {
-		ResourceLocation blockId = Registry.BLOCK.getKey(this);
-		return Patterns.createJson(Patterns.BLOCK_BASE, blockId.getPath(), block);
-	}
-	
-	@Override
-	public ResourceLocation statePatternId() {
-		return Patterns.STATE_SIMPLE;
-	}
-}
-=======
 package ru.betterend.blocks.basis;
 
 import java.io.Reader;
@@ -62,7 +18,7 @@ public class BlockBase extends Block implements BlockPatterned {
 	public BlockBase(Properties settings) {
 		super(settings);
 	}
-	
+
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
@@ -78,16 +34,15 @@ public class BlockBase extends Block implements BlockPatterned {
 		String block = Registry.BLOCK.getKey(this).getPath();
 		return Patterns.createJson(data, block, block);
 	}
-	
+
 	@Override
 	public String getModelPattern(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		return Patterns.createJson(Patterns.BLOCK_BASE, blockId.getPath(), block);
 	}
-	
+
 	@Override
 	public ResourceLocation statePatternId() {
 		return Patterns.STATE_SIMPLE;
 	}
-}
->>>>>>> Stashed changes
+}
\ No newline at end of file
diff --git a/src/main/java/ru/betterend/patterns/BlockPatterned.java b/src/main/java/ru/betterend/patterns/BlockPatterned.java
index 3d02ca5f..e8908f4f 100644
--- a/src/main/java/ru/betterend/patterns/BlockPatterned.java
+++ b/src/main/java/ru/betterend/patterns/BlockPatterned.java
@@ -1,19 +1,3 @@
-<<<<<<< Updated upstream
-package ru.betterend.patterns;
-
-import java.io.Reader;
-
-import net.minecraft.resources.ResourceLocation;
-
-public interface BlockPatterned extends Patterned {
-	default String getStatesPattern(Reader data) {
-		return null;
-	}
-	default ResourceLocation statePatternId() {
-		return null;
-	}
-}
-=======
 package ru.betterend.patterns;
 
 import java.io.Reader;
@@ -30,5 +14,4 @@ public interface BlockPatterned extends Patterned {
 	default ResourceLocation statePatternId() {
 		return null;
 	}
-}
->>>>>>> Stashed changes
+}
\ No newline at end of file