From 4480d72344c2ddaf57ee8d3cae12e496181f3e46 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 13 Feb 2021 00:22:29 +0300 Subject: [PATCH] Cleanup & version change --- gradle.properties | 2 +- .../java/ru/betterend/blocks/AeterniumAnvil.java | 15 ++------------- .../betterend/mixin/common/AnvilBlockMixin.java | 3 +-- .../mixin/common/AnvilScreenHandlerMixin.java | 6 +++++- src/main/java/ru/betterend/registry/EndTags.java | 1 - 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7794c06d..d31d8a17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version=0.10.8 # Mod Properties - mod_version = 0.8.9-beta + mod_version = 0.9.0-pre maven_group = ru.betterend archives_base_name = better-end diff --git a/src/main/java/ru/betterend/blocks/AeterniumAnvil.java b/src/main/java/ru/betterend/blocks/AeterniumAnvil.java index c66b29eb..d997ce9d 100644 --- a/src/main/java/ru/betterend/blocks/AeterniumAnvil.java +++ b/src/main/java/ru/betterend/blocks/AeterniumAnvil.java @@ -1,23 +1,12 @@ package ru.betterend.blocks; -import java.io.Reader; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import com.google.common.collect.Maps; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.*; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.state.StateManager; import net.minecraft.state.property.IntProperty; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import ru.betterend.blocks.basis.EndAnvilBlock; import ru.betterend.item.material.EndToolMaterial; -import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndBlocks; diff --git a/src/main/java/ru/betterend/mixin/common/AnvilBlockMixin.java b/src/main/java/ru/betterend/mixin/common/AnvilBlockMixin.java index a422c461..130df457 100644 --- a/src/main/java/ru/betterend/mixin/common/AnvilBlockMixin.java +++ b/src/main/java/ru/betterend/mixin/common/AnvilBlockMixin.java @@ -1,6 +1,5 @@ package ru.betterend.mixin.common; -import net.minecraft.state.property.IntProperty; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -8,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.block.AnvilBlock; import net.minecraft.block.BlockState; -import ru.betterend.blocks.BlockProperties; +import net.minecraft.state.property.IntProperty; import ru.betterend.blocks.basis.EndAnvilBlock; @Mixin(AnvilBlock.class) diff --git a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java index f672562f..89da01cd 100644 --- a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java @@ -4,7 +4,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import net.minecraft.screen.*; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -19,6 +18,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeManager; +import net.minecraft.screen.AnvilScreenHandler; +import net.minecraft.screen.ForgingScreenHandler; +import net.minecraft.screen.Property; +import net.minecraft.screen.ScreenHandlerContext; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.tag.BlockTags; import ru.betterend.blocks.basis.EndAnvilBlock; import ru.betterend.interfaces.AnvilScreenHandlerExtended; diff --git a/src/main/java/ru/betterend/registry/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index 218b97ea..6cfa8e76 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -22,7 +22,6 @@ import net.minecraft.world.biome.Biome.Category; import net.minecraft.world.gen.surfacebuilder.SurfaceConfig; import ru.betterend.BetterEnd; import ru.betterend.blocks.EndTerrainBlock; -import ru.betterend.blocks.basis.EndAnvilBlock; import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.basis.SimpleLeavesBlock; import ru.betterend.blocks.basis.VineBlock;