Update to MC 1.15

Author: rubensworks

build.properties

@@ -1,9 +1,9 @@
 mod_version=0.2.2
-minecraft_version=1.14.4
-forge_version=28.1.1
+minecraft_version=1.15.2
+forge_version=31.1.37
 mcp_mappings_channel=snapshot
-mcp_mappings_version=20190719-1.14.3
-cyclopscore_version=1.6.0-1017
+mcp_mappings_version=20200225-1.15.1
+cyclopscore_version=1.6.1-1055
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 

src/api/java/org/cyclops/commoncapabilities/api

@@ -9,6 +9,7 @@
 import net.minecraft.state.DirectionProperty;
 import net.minecraft.state.StateContainer;
 import net.minecraft.state.properties.BlockStateProperties;
+import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
@@ -47,11 +48,12 @@ public BlockState getStateForPlacement(BlockItemUseContext context) {
     }
 
     @Override
-    public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand hand,
-                                    BlockRayTraceResult hit) {
+    public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand hand,
+                                             BlockRayTraceResult hit) {
         ItemStack heldItem = player.getHeldItem(hand);
         if(player != null && !heldItem.isEmpty() && heldItem.getItem() == Items.STICK) {
             worldIn.setBlockState(pos, state.with(FACING, hit.getFace().getOpposite()));
+            return ActionResultType.SUCCESS;
         }
         return super.onBlockActivated(state, worldIn, pos, player, hand, hit);
     }

src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java

@@ -1,96 +1,31 @@
 package org.cyclops.structuredcrafting.craft;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.UncheckedExecutionException;
 import lombok.ToString;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.dimension.DimensionType;
-import net.minecraft.world.server.ServerWorld;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.fml.server.ServerLifecycleHooks;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.Level;
+import org.cyclops.cyclopscore.helper.CraftingHelpers;
 import org.cyclops.structuredcrafting.StructuredCrafting;
 import org.cyclops.structuredcrafting.block.BlockStructuredCrafter;
 import org.cyclops.structuredcrafting.craft.provider.IItemStackProvider;
 import org.cyclops.structuredcrafting.craft.provider.IItemStackProviderRegistry;
 
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 /**
  * A crafting matrix represented with blockstates.
  * @author rubensworks
  */
 public class WorldCraftingMatrix {
 
-    private static final LoadingCache<Pair<WorldInventoryCrafting, DimensionType>, IRecipe> CACHE_RECIPES = CacheBuilder.newBuilder()
-            .expireAfterWrite(1, TimeUnit.MINUTES).build(new CacheLoader<Pair<WorldInventoryCrafting, DimensionType>, IRecipe>() {
-                @Override
-                public IRecipe load(Pair<WorldInventoryCrafting, DimensionType> key) throws Exception {
-                    ServerWorld world = DimensionManager.getWorld(ServerLifecycleHooks.getCurrentServer(), key.getRight(), false, false);
-                    IRecipe recipe = world.getRecipeManager().getRecipe(IRecipeType.CRAFTING, key.getLeft(), world).orElse(null);
-
-                    if (recipe == null) {
-                        recipe = NULL_RECIPE;
-                    }
-                    return recipe;
-                }
-            });
-    // A dummy recipe that represents null, because guava's cache doesn't allow null entries.
-    private static final IRecipe NULL_RECIPE = new IRecipe() {
-
-        @Override
-        public boolean matches(IInventory inv, World worldIn) {
-            return false;
-        }
-
-        @Override
-        public ItemStack getCraftingResult(IInventory inv) {
-            return null;
-        }
-
-        @Override
-        public boolean canFit(int width, int height) {
-            return false;
-        }
-
-        @Override
-        public ItemStack getRecipeOutput() {
-            return null;
-        }
-
-        @Override
-        public ResourceLocation getId() {
-            return null;
-        }
-
-        @Override
-        public IRecipeSerializer<?> getSerializer() {
-            return null;
-        }
-
-        @Override
-        public IRecipeType<?> getType() {
-            return null;
-        }
-    };
-
     private final World world;
     private final BlockPos centerPos;
     private final Direction.Axis axis;
@@ -254,15 +189,7 @@ public void setPosition(int i, int j, int rotation, BlockPos pos, IItemStackProv
         }
 
         protected IRecipe getRecipe(World world) {
-            try {
-                IRecipe recipe = CACHE_RECIPES.get(Pair.of(inventoryCrafting, world.getDimension().getType()));
-                if (recipe == NULL_RECIPE) {
-                    recipe = null;
-                }
-                return recipe;
-            } catch (ExecutionException | UncheckedExecutionException e) {
-                return null;
-            }
+            return CraftingHelpers.findRecipeCached(IRecipeType.CRAFTING, inventoryCrafting, world, true).orElse(null);
         }
 
         public ItemStack getOutput(World world) {

src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java

@@ -14,18 +14,18 @@ Craft stuff in your world, automatically.
 [[dependencies.structuredcrafting]]
     modId="cyclopscore"
     mandatory=true
-    versionRange="[1.6.0,)"
+    versionRange="[1.6.1,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.structuredcrafting]]
     modId="forge"
     mandatory=true
-    versionRange="[28.1,)"
+    versionRange="[31.1,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.structuredcrafting]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.14.4]"
+    versionRange="[1.15.2]"
     ordering="NONE"
     side="BOTH"