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

Resolve conflicts

Browse source
This commit is contained in:
Aleksey 2021-04-30 13:28:40 +03:00
parent f34774c54c
commit 086657198e
2 changed files with 5 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/main/java/ru/betterend/blocks/basis/BlockBase.java
View file

@ -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; package ru.betterend.blocks.basis;
import java.io.Reader; import java.io.Reader;
@ -62,7 +18,7 @@ public class BlockBase extends Block implements BlockPatterned {
public BlockBase(Properties settings) { public BlockBase(Properties settings) {
super(settings); super(settings);
} }
@Override @Override
public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) { public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
return Collections.singletonList(new ItemStack(this)); return Collections.singletonList(new ItemStack(this));
@ -78,16 +34,15 @@ public class BlockBase extends Block implements BlockPatterned {
String block = Registry.BLOCK.getKey(this).getPath(); String block = Registry.BLOCK.getKey(this).getPath();
return Patterns.createJson(data, block, block); return Patterns.createJson(data, block, block);
} }
@Override @Override
public String getModelPattern(String block) { public String getModelPattern(String block) {
ResourceLocation blockId = Registry.BLOCK.getKey(this); ResourceLocation blockId = Registry.BLOCK.getKey(this);
return Patterns.createJson(Patterns.BLOCK_BASE, blockId.getPath(), block); return Patterns.createJson(Patterns.BLOCK_BASE, blockId.getPath(), block);
} }
@Override @Override
public ResourceLocation statePatternId() { public ResourceLocation statePatternId() {
return Patterns.STATE_SIMPLE; return Patterns.STATE_SIMPLE;
} }
} }
>>>>>>> Stashed changes

19
src/main/java/ru/betterend/patterns/BlockPatterned.java
View file

@ -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; package ru.betterend.patterns;
import java.io.Reader; import java.io.Reader;
@ -30,5 +14,4 @@ public interface BlockPatterned extends Patterned {
default ResourceLocation statePatternId() { default ResourceLocation statePatternId() {
return null; return null;
} }
} }
>>>>>>> Stashed changes