diff --git a/build.gradle b/build.gradle index bc61d17a3..f24779039 100644 --- a/build.gradle +++ b/build.gradle @@ -89,7 +89,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.12-14.21.0.2359" + version = "1.12-14.21.0.2363" mappings = "snapshot_20170624" replace "@MODVERSION@", project.version useDepAts = true diff --git a/src/main/java/techreborn/client/render/ModelDynamicCell.java b/src/main/java/techreborn/client/render/ModelDynamicCell.java index 0196a203c..b96919ef5 100644 --- a/src/main/java/techreborn/client/render/ModelDynamicCell.java +++ b/src/main/java/techreborn/client/render/ModelDynamicCell.java @@ -24,8 +24,6 @@ package techreborn.client.render; -import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import net.minecraft.block.state.IBlockState; @@ -55,6 +53,8 @@ import java.awt.*; import java.util.Collection; import java.util.HashMap; import java.util.List; +import java.util.Optional; +import java.util.function.Function; @SideOnly(Side.CLIENT) public class ModelDynamicCell implements IModel { @@ -99,11 +99,12 @@ public class ModelDynamicCell implements IModel { return ImmutableList.of(baseTexture, emptyTexture); } + @Override public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { - ImmutableMap transformMap = IPerspectiveAwareModel.MapWrapper.getTransforms(state); - TRSRTransformation transform = state.apply(Optional.absent()).or(TRSRTransformation.identity()); + ImmutableMap transformMap = PerspectiveMapWrapper.getTransforms(state); + TRSRTransformation transform = state.apply(Optional.empty()).orElse(TRSRTransformation.identity()); ImmutableList.Builder builder = ImmutableList.builder(); builder.addAll(new ItemLayerModel(ImmutableList.of(baseTexture)).bake(transform, format, bakedTextureGetter).getQuads(null, null, 0L)); diff --git a/src/main/java/techreborn/lib/ModInfo.java b/src/main/java/techreborn/lib/ModInfo.java index 7e486126f..913f48879 100644 --- a/src/main/java/techreborn/lib/ModInfo.java +++ b/src/main/java/techreborn/lib/ModInfo.java @@ -30,7 +30,7 @@ public class ModInfo implements IModInfo { public static final String MOD_NAME = "Tech Reborn"; public static final String MOD_ID = "techreborn"; public static final String MOD_VERSION = "@MODVERSION@"; - public static final String MOD_DEPENDENCIES = "required-after:forge@[14.21.0.2359,);required-after:reborncore;after:jei@[4.7,);after:ic2"; + public static final String MOD_DEPENDENCIES = "required-after:forge@[14.21.0.2363,);required-after:reborncore;after:jei@[4.7,);after:ic2"; public static final String SERVER_PROXY_CLASS = "techreborn.proxies.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy"; public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory";