Update to support forge model changes, #releaseBuild

This commit is contained in:
modmuss50 2017-06-25 13:56:39 +01:00
parent 3a83b81100
commit a774b2bcb2
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
3 changed files with 7 additions and 6 deletions

View file

@ -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

View file

@ -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<ResourceLocation, TextureAtlasSprite> bakedTextureGetter) {
ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transformMap = IPerspectiveAwareModel.MapWrapper.getTransforms(state);
TRSRTransformation transform = state.apply(Optional.<IModelPart>absent()).or(TRSRTransformation.identity());
ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transformMap = PerspectiveMapWrapper.getTransforms(state);
TRSRTransformation transform = state.apply(Optional.empty()).orElse(TRSRTransformation.identity());
ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
builder.addAll(new ItemLayerModel(ImmutableList.of(baseTexture)).bake(transform, format, bakedTextureGetter).getQuads(null, null, 0L));

View file

@ -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";