diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index 93ce03fa..ae5b8d5e 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -1,12 +1,8 @@ package ru.betterend; import net.fabricmc.api.ModInitializer; -import net.minecraft.block.Blocks; -import net.minecraft.item.Items; -import net.minecraft.tag.ItemTags; import ru.betterend.config.MainConfig; import ru.betterend.recipe.CraftingRecipes; -import ru.betterend.recipe.RecipeBuilder; import ru.betterend.registry.BiomeRegistry; import ru.betterend.registry.BlockRegistry; import ru.betterend.registry.FeatureRegistry; @@ -27,25 +23,5 @@ public class BetterEnd implements ModInitializer { BiomeRegistry.register(); BetterEndBiomeSource.register(); CraftingRecipes.register(); - - // TEST // - RecipeBuilder.make("test_block", Blocks.ANVIL) - .setShape(new String[] {"I#", "#I"}) - .addMaterial('I', Items.STRING) - .addMaterial('#', Items.APPLE) - .build(); - - RecipeBuilder.make("test_block_shaped", Blocks.STONE) - .setShape(new String[] {"I#", "#I"}) - .addMaterial('I', Items.STRING) - .addMaterial('#', ItemTags.LOGS) - .build(); - - RecipeBuilder.make("test_item_shapeless", Items.SUGAR) - .setList("I#Y") - .addMaterial('I', Items.STRING) - .addMaterial('#', ItemTags.LOGS) - .addMaterial('Y', ItemTags.ARROWS) - .build(); } } diff --git a/src/main/java/ru/betterend/blocks/BlockOre.java b/src/main/java/ru/betterend/blocks/BlockOre.java index f3050e47..28075413 100644 --- a/src/main/java/ru/betterend/blocks/BlockOre.java +++ b/src/main/java/ru/betterend/blocks/BlockOre.java @@ -34,12 +34,11 @@ public class BlockOre extends OreBlock { this.minCount = minCount; this.maxCount = maxCount; } - + @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { ItemStack tool = builder.get(LootContextParameters.TOOL); - if (tool.isEffectiveOn(state)) - { + if (tool != null && tool.isEffectiveOn(state)) { int fortune = EnchantmentHelper.getLevel(Enchantments.FORTUNE, tool); int min = MathHelper.clamp(minCount + fortune, 0, maxCount); if (min == maxCount) diff --git a/src/main/java/ru/betterend/blocks/TerminiteBlock.java b/src/main/java/ru/betterend/blocks/TerminiteBlock.java index 8ebeefc7..d8ed2352 100644 --- a/src/main/java/ru/betterend/blocks/TerminiteBlock.java +++ b/src/main/java/ru/betterend/blocks/TerminiteBlock.java @@ -6,7 +6,6 @@ import net.minecraft.block.MaterialColor; import net.minecraft.sound.BlockSoundGroup; public class TerminiteBlock extends BlockBase { - public TerminiteBlock() { super(FabricBlockSettings.of(Material.METAL, MaterialColor.field_25708) .hardness(7F) diff --git a/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java b/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java index 636211d5..19e0558d 100644 --- a/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java +++ b/src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java @@ -28,10 +28,10 @@ public class BackgroundRendererMixin { private static float fogEnd; private static float lerp; - private static final float SKY_RED = 21F / 255F; - private static final float SKY_GREEN = 16F / 255F; - private static final float SKY_BLUE = 20F / 255F; - //private static final float NORMAL = 0.12757292F; + //private static final float SKY_RED = 21F / 255F; + //private static final float SKY_GREEN = 16F / 255F; + //private static final float SKY_BLUE = 20F / 255F; + private static final float NORMAL = 1.5F/ 0.12757292F; // 0.12757292F is max value for red channel after all transformations @Shadow private static float red; @@ -47,10 +47,10 @@ public class BackgroundRendererMixin { FluidState fluidState = camera.getSubmergedFluidState(); if (fluidState.isEmpty() && world.getDimension().hasEnderDragonFight()) { - RenderSystem.clearColor(SKY_RED, SKY_GREEN, SKY_BLUE, 0); - //red /= NORMAL; - //green /= NORMAL; - //blue /= NORMAL; + //RenderSystem.clearColor(SKY_RED, SKY_GREEN, SKY_BLUE, 0); + red *= NORMAL; + green *= NORMAL; + blue *= NORMAL; } } diff --git a/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java b/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java index 15984160..065cec04 100644 --- a/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java +++ b/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java @@ -17,8 +17,7 @@ import ru.betterend.world.generator.BetterEndBiomeSource; public class DimensionTypeMixin { @Inject(method = "createEndGenerator", at = @At("HEAD"), cancellable = true) - private static void replaceGenerator(Registry biomeRegistry, Registry chunkGeneratorSettingsRegistry, long seed, CallbackInfoReturnable info) - { + private static void replaceGenerator(Registry biomeRegistry, Registry chunkGeneratorSettingsRegistry, long seed, CallbackInfoReturnable info) { info.setReturnValue(new NoiseChunkGenerator(new BetterEndBiomeSource(biomeRegistry, seed), seed, () -> { return (ChunkGeneratorSettings) chunkGeneratorSettingsRegistry.getOrThrow(ChunkGeneratorSettings.END); })); diff --git a/src/main/java/ru/betterend/mixin/common/RecipeManagerMixin.java b/src/main/java/ru/betterend/mixin/common/RecipeManagerMixin.java index 5575d246..a9b86254 100644 --- a/src/main/java/ru/betterend/mixin/common/RecipeManagerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/RecipeManagerMixin.java @@ -27,23 +27,22 @@ import net.minecraft.world.World; import ru.betterend.recipe.EndRecipeManager; @Mixin(RecipeManager.class) -public class RecipeManagerMixin -{ +public class RecipeManagerMixin { @Shadow private Map, Map>> recipes; - + @Inject(method = "apply", at = @At(value = "RETURN")) - private void setRecipes(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo info) - { + private void setRecipes(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo info) { recipes = EndRecipeManager.getMap(recipes); } - + @Shadow - private > Map> getAllOfType(RecipeType type) { return null; } - + private > Map> getAllOfType(RecipeType type) { + return null; + } + @Overwrite - public > Optional getFirstMatch(RecipeType type, C inventory, World world) - { + public > Optional getFirstMatch(RecipeType type, C inventory, World world) { Collection> values = getAllOfType(type).values(); List> list = new ArrayList>(values); list.sort((v1, v2) -> { @@ -51,9 +50,9 @@ public class RecipeManagerMixin boolean b2 = v2.getId().getNamespace().equals("minecraft"); return b1 ^ b2 ? (b1 ? 1 : -1) : 0; }); - + return list.stream().flatMap((recipe) -> { - return Util.stream(type.get(recipe, world, inventory)); - }).findFirst(); - } + return Util.stream(type.get(recipe, world, inventory)); + }).findFirst(); + } } \ No newline at end of file diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index 6f52a2d3..eefe84e0 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -21,13 +21,11 @@ public class CraftingRecipes { } } - protected static boolean itemExists(Item item) - { + protected static boolean itemExists(Item item) { return Registry.ITEM.getId(item) != Registry.ITEM.getDefaultId(); } - - protected static boolean blockExists(Block block) - { + + protected static boolean blockExists(Block block) { return Registry.BLOCK.getId(block) != Registry.BLOCK.getDefaultId(); } } diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index 5d159634..b51a8196 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -15,9 +15,14 @@ import ru.betterend.blocks.TerminiteBlock; import ru.betterend.tab.CreativeTab; public class BlockRegistry { + // Terrain // public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new BlockEndstoneDust()); public static final Block WET_MYCELIUM = registerBlock("wet_mycelium", new BlockWetMycelium()); + + // Ores // public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(ItemRegistry.ENDER_DUST, 1, 3)); + + // Materials // public static final Block TERMINITE_BLOCK = registerBlock("terminite_block", new TerminiteBlock()); public static final Block AETERNIUM_BLOCK = registerBlock("aeternium_block", new AeterniumBlock()); public static final Block ENDER_BLOCK = registerBlock("ender_block", new EnderBlock());