mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-27 17:34:48 +00:00
Code Issues Releases Wiki Activity

Bump to 1.16.5

Browse Source 
I don't think anyone still uses 1.16.4, so no point worrying about it.

Closes #808
This commit is contained in:
Jonathan Coates 2021-06-05 12:32:27 +01:00
parent 8b9735d72e
commit 5eec7d9172
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -136,10 +136,10 @@ dependencies {
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
compileOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58:api")
compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.4:7.0.0.63")
compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104:api")
compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313")
runtimeOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58")
runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104")
shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
@ -458,9 +458,6 @@ curseforge {
relations {
incompatible "computercraft"
}
addGameVersion '1.16.4'
addGameVersion '1.16.5'
}
}

5
gradle.properties
View File

@ -2,5 +2,6 @@
mod_version=1.96.0
# Minecraft properties (update mods.toml when changing)
mc_version=1.16.4
forge_version=35.1.16
mc_version=1.16.5
forge_version=36.1.0
# NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING

20
src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java
View File

@ -22,7 +22,7 @@ import mezz.jei.api.IModPlugin;
import mezz.jei.api.JeiPlugin;
import mezz.jei.api.constants.VanillaRecipeCategoryUid;
import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.ingredients.subtypes.ISubtypeInterpreter;
import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
import mezz.jei.api.recipe.IRecipeManager;
import mezz.jei.api.recipe.category.IRecipeCategory;
import mezz.jei.api.registration.IAdvancedRegistration;
@ -90,13 +90,13 @@ public class JEIComputerCraft implements IModPlugin
runtime.getIngredientManager().addIngredientsAtRuntime( VanillaTypes.ITEM, upgradeItems );
// Hide all upgrade recipes
IRecipeCategory<?> category = (IRecipeCategory<?>) registry.getRecipeCategory( VanillaRecipeCategoryUid.CRAFTING );
IRecipeCategory<?> category = registry.getRecipeCategory( VanillaRecipeCategoryUid.CRAFTING );
if( category != null )
{
for( Object wrapper : registry.getRecipes( category ) )
{
if( !(wrapper instanceof IRecipe) ) continue;
ResourceLocation id = ((IRecipe) wrapper).getId();
ResourceLocation id = ((IRecipe<?>) wrapper).getId();
if( !id.getNamespace().equals( ComputerCraft.MOD_ID ) ) continue;
String path = id.getPath();
@ -112,9 +112,9 @@ public class JEIComputerCraft implements IModPlugin
/**
* Distinguishes turtles by upgrades and family.
*/
private static final ISubtypeInterpreter turtleSubtype = stack -> {
private static final IIngredientSubtypeInterpreter<ItemStack> turtleSubtype = ( stack, ctx ) -> {
Item item = stack.getItem();
if( !(item instanceof ITurtleItem) ) return ISubtypeInterpreter.NONE;
if( !(item instanceof ITurtleItem) ) return IIngredientSubtypeInterpreter.NONE;
ITurtleItem turtle = (ITurtleItem) item;
StringBuilder name = new StringBuilder( "turtle:" );
@ -132,9 +132,9 @@ public class JEIComputerCraft implements IModPlugin
/**
* Distinguishes pocket computers by upgrade and family.
*/
private static final ISubtypeInterpreter pocketSubtype = stack -> {
private static final IIngredientSubtypeInterpreter<ItemStack> pocketSubtype = ( stack, ctx ) -> {
Item item = stack.getItem();
if( !(item instanceof ItemPocketComputer) ) return ISubtypeInterpreter.NONE;
if( !(item instanceof ItemPocketComputer) ) return IIngredientSubtypeInterpreter.NONE;
StringBuilder name = new StringBuilder( "pocket:" );
@ -148,13 +148,13 @@ public class JEIComputerCraft implements IModPlugin
/**
* Distinguishes disks by colour.
*/
private static final ISubtypeInterpreter diskSubtype = stack -> {
private static final IIngredientSubtypeInterpreter<ItemStack> diskSubtype = ( stack, ctx ) -> {
Item item = stack.getItem();
if( !(item instanceof ItemDisk) ) return ISubtypeInterpreter.NONE;
if( !(item instanceof ItemDisk) ) return IIngredientSubtypeInterpreter.NONE;
ItemDisk disk = (ItemDisk) item;
int colour = disk.getColour( stack );
return colour == -1 ? ISubtypeInterpreter.NONE : String.format( "%06x", colour );
return colour == -1 ? IIngredientSubtypeInterpreter.NONE : String.format( "%06x", colour );
};
}

4
src/main/resources/META-INF/mods.toml
View File

@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[35,37)"
loaderVersion="[36,37)"
issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues"
displayURL="https://github.com/SquidDev-CC/CC-Tweaked"
@ -20,6 +20,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
[[dependencies.computercraft]]
modId="forge"
mandatory=true
versionRange="[35.1.16,37)"
versionRange="[36.1.0,37)"
ordering="NONE"
side="BOTH"