mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-08-01 08:42:52 +00:00
Bump to Forge 1.12.2
Nobody is still using 1.12, so we might as well update to the latest - it makes it easier to test mod compatibility at least.
This commit is contained in:
parent
043d5f00ca
commit
d758895578
@ -26,7 +26,7 @@ group = "org.squiddev"
|
|||||||
archivesBaseName = "cc-tweaked"
|
archivesBaseName = "cc-tweaked"
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.12-14.21.1.2387"
|
version = "1.12.2-14.23.2.2634"
|
||||||
runDir = "run"
|
runDir = "run"
|
||||||
replace '${version}', project.version
|
replace '${version}', project.version
|
||||||
|
|
||||||
@ -35,7 +35,7 @@ minecraft {
|
|||||||
// stable_# stables are built at the discretion of the MCP team.
|
// stable_# stables are built at the discretion of the MCP team.
|
||||||
// Use non-default mappings at your own risk. they may not allways work.
|
// Use non-default mappings at your own risk. they may not allways work.
|
||||||
// simply re-run your setup task after changing the mappings to update your workspace.
|
// simply re-run your setup task after changing the mappings to update your workspace.
|
||||||
mappings = "snapshot_20170629"
|
mappings = "snapshot_20180324"
|
||||||
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
|
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,8 +56,8 @@ configurations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
deobfProvided "mezz.jei:jei_1.12:4.7.5.86:api"
|
deobfProvided "mezz.jei:jei_1.12.2:4.8.5.159:api"
|
||||||
runtime "mezz.jei:jei_1.12:4.7.5.86"
|
runtime "mezz.jei:jei_1.12.2:4.8.5.159"
|
||||||
shade 'org.squiddev:Cobalt:0.3.1'
|
shade 'org.squiddev:Cobalt:0.3.1'
|
||||||
|
|
||||||
testCompile 'junit:junit:4.11'
|
testCompile 'junit:junit:4.11'
|
||||||
|
@ -210,7 +210,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
|
|||||||
private static class TurtleItemColour implements IItemColor
|
private static class TurtleItemColour implements IItemColor
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public int getColorFromItemstack( @Nonnull ItemStack stack, int tintIndex )
|
public int colorMultiplier( @Nonnull ItemStack stack, int tintIndex )
|
||||||
{
|
{
|
||||||
if( tintIndex == 0 )
|
if( tintIndex == 0 )
|
||||||
{
|
{
|
||||||
|
@ -569,7 +569,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getColorFromItemstack( @Nonnull ItemStack stack, int layer )
|
public int colorMultiplier( @Nonnull ItemStack stack, int layer )
|
||||||
{
|
{
|
||||||
return layer == 0 ? 0xFFFFFF : disk.getColour( stack );
|
return layer == 0 ? 0xFFFFFF : disk.getColour( stack );
|
||||||
}
|
}
|
||||||
|
@ -189,7 +189,7 @@ public final class ModelTransformer
|
|||||||
private BakedQuadBuilder( VertexFormat format )
|
private BakedQuadBuilder( VertexFormat format )
|
||||||
{
|
{
|
||||||
this.format = format;
|
this.format = format;
|
||||||
this.vertexData = new int[ format.getNextOffset() ];
|
this.vertexData = new int[ format.getSize() ];
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
|
@ -36,7 +36,7 @@ public abstract class BlockGeneric extends Block implements
|
|||||||
protected BlockGeneric( Material material )
|
protected BlockGeneric( Material material )
|
||||||
{
|
{
|
||||||
super( material );
|
super( material );
|
||||||
this.isBlockContainer = true;
|
this.hasTileEntity = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract IBlockState getDefaultBlockState( int damage, EnumFacing placedSide );
|
protected abstract IBlockState getDefaultBlockState( int damage, EnumFacing placedSide );
|
||||||
|
@ -86,7 +86,7 @@ public class ColourableRecipe extends IForgeRegistryEntry.Impl<IRecipe> implemen
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isHidden()
|
public boolean isDynamic()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ public class DiskRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRe
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isHidden()
|
public boolean isDynamic()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ public class PrintoutRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isHidden()
|
public boolean isDynamic()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,7 @@ public class PocketComputerUpgradeRecipe extends IForgeRegistryEntry.Impl<IRecip
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isHidden()
|
public boolean isDynamic()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ public class TurtleUpgradeRecipe extends IForgeRegistryEntry.Impl<IRecipe> imple
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isHidden()
|
public boolean isDynamic()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -126,22 +126,8 @@ public class WorldUtil
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Vec3d getRayEnd( EntityPlayer player) {
|
public static Vec3d getRayEnd( EntityPlayer player) {
|
||||||
double reach = 4.5;
|
double reach = player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).getAttributeValue();
|
||||||
if( player instanceof EntityPlayerMP )
|
|
||||||
{
|
|
||||||
reach = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance();
|
|
||||||
}
|
|
||||||
else if( player.getEntityWorld().isRemote )
|
|
||||||
{
|
|
||||||
reach = Minecraft.getMinecraft().playerController.getBlockReachDistance();
|
|
||||||
}
|
|
||||||
else if( player.capabilities.isCreativeMode )
|
|
||||||
{
|
|
||||||
reach = 5.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3d look = player.getLookVec();
|
Vec3d look = player.getLookVec();
|
||||||
|
|
||||||
return getRayStart( player ).addVector( look.x * reach, look.y * reach, look.z * reach );
|
return getRayStart( player ).addVector( look.x * reach, look.y * reach, look.z * reach );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user