Skip to content

Commit af2537a

Browse files
rubensworksrubensworks
committed
Update to MC 1.21.11
1 parent b3499c3 commit af2537a

15 files changed

Lines changed: 84 additions & 79 deletions

‎build.gradle‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.neoforged.moddev' version '2.0.119'
2+
id 'net.neoforged.moddev' version '2.0.126'
33
id 'net.darkhax.curseforgegradle' version '1.1.28'
44
id 'com.github.kt3k.coveralls' version '2.12.0'
55
id 'com.diffplug.spotless' version '6.25.0'
@@ -148,8 +148,13 @@ dependencies {
148148
transitive = false
149149
}
150150
}
151-
152-
implementation "org.cyclops.integratedtunnels:integratedtunnels-${project.minecraft_version}-neoforge:${project.integratedtunnels_version}:deobf"
151+
/**/
152+
// Add something like 'integrateddynamics_version_local=0.1.0-DEV' to your gradle.properties if you want to use a custom local Integrated Tunnels Compat version.
153+
if(secrets.integratedtunnels_version_local) {
154+
implementation "org.cyclops.integratedtunnels:integratedtunnels-${project.minecraft_version}-neoforge:${secrets.integratedtunnels_version_local}:deobf"
155+
} else {
156+
implementation "org.cyclops.integratedtunnels:integratedtunnels-${project.minecraft_version}-neoforge:${project.integratedtunnels_version}:deobf"
157+
}
153158

154159
modLib "com.google.re2j:re2j:1.1"
155160
modLib ("io.netty:netty-codec-http:4.1.77.Final") {

‎gradle.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ group=org.cyclops.integratedcrafting
44
java_version=21
55

66
# Common
7-
minecraft_version=1.21.10
7+
minecraft_version=1.21.11
88
mod_name=IntegratedCrafting
99
mod_author=rubensworks (aka kroeser)
1010
mod_id=integratedcrafting
@@ -21,7 +21,7 @@ curseforge_project_id=287357
2121
modrinth_project_id=qwpACdla
2222

2323
# NeoForge
24-
neoforge_version=21.10.53-beta
24+
neoforge_version=21.11.10-beta
2525
neoforge_loader_version_range=[4,)
2626
neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/integrated-crafting.json
2727

@@ -31,7 +31,7 @@ org.gradle.daemon=false
3131
org.gradle.caching=true
3232

3333
# Dependencies
34-
cyclopscore_version=1.25.5-860
35-
integrateddynamics_version=1.24.1-1415
36-
commoncapabilities_version=2.9.7-299
37-
integratedtunnels_version=1.8.30-531
34+
cyclopscore_version=1.25.5-871
35+
integrateddynamics_version=1.24.1-1419
36+
commoncapabilities_version=2.9.7-303
37+
integratedtunnels_version=1.8.30-534

‎src/main/java/org/cyclops/integratedcrafting/Capabilities.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cyclops.integratedcrafting;
22

3-
import net.minecraft.resources.ResourceLocation;
3+
import net.minecraft.resources.Identifier;
44
import org.cyclops.integratedcrafting.api.crafting.ICraftingInterface;
55
import org.cyclops.integratedcrafting.api.network.ICraftingNetwork;
66
import org.cyclops.integrateddynamics.api.network.NetworkCapability;
@@ -12,9 +12,9 @@
1212
*/
1313
public class Capabilities {
1414
public static final class CraftingNetwork {
15-
public static final NetworkCapability<ICraftingNetwork> NETWORK = NetworkCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "crafting_network"), ICraftingNetwork.class);
15+
public static final NetworkCapability<ICraftingNetwork> NETWORK = NetworkCapability.create(Identifier.fromNamespaceAndPath(Reference.MOD_ID, "crafting_network"), ICraftingNetwork.class);
1616
}
1717
public static final class CraftingInterface {
18-
public static final PartCapability<ICraftingInterface> PART = PartCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "crafting_interface"), ICraftingInterface.class);
18+
public static final PartCapability<ICraftingInterface> PART = PartCapability.create(Identifier.fromNamespaceAndPath(Reference.MOD_ID, "crafting_interface"), ICraftingInterface.class);
1919
}
2020
}

‎src/main/java/org/cyclops/integratedcrafting/RegistryEntries.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.cyclops.integratedcrafting;
22

33
import net.minecraft.core.registries.Registries;
4-
import net.minecraft.resources.ResourceLocation;
4+
import net.minecraft.resources.Identifier;
55
import net.minecraft.world.inventory.MenuType;
66
import net.minecraft.world.item.Item;
77
import net.minecraft.world.item.crafting.RecipeSerializer;
@@ -17,12 +17,12 @@
1717
*/
1818
public class RegistryEntries {
1919

20-
public static final DeferredHolder<Item, Item> ITEM_PART_INTERFACE_CRAFTING = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integratedcrafting:part_interface_crafting"));
21-
public static final DeferredHolder<Item, ItemVariable> ITEM_VARIABLE = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integrateddynamics:variable"));
20+
public static final DeferredHolder<Item, Item> ITEM_PART_INTERFACE_CRAFTING = DeferredHolder.create(Registries.ITEM, Identifier.parse("integratedcrafting:part_interface_crafting"));
21+
public static final DeferredHolder<Item, ItemVariable> ITEM_VARIABLE = DeferredHolder.create(Registries.ITEM, Identifier.parse("integrateddynamics:variable"));
2222

23-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerPartInterfaceCrafting>> CONTAINER_INTERFACE_CRAFTING = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedcrafting:part_interface_crafting"));
24-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerPartInterfaceCraftingSettings>> CONTAINER_INTERFACE_CRAFTING_SETTINGS = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedcrafting:part_interface_crafting_settings"));
23+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerPartInterfaceCrafting>> CONTAINER_INTERFACE_CRAFTING = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedcrafting:part_interface_crafting"));
24+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerPartInterfaceCraftingSettings>> CONTAINER_INTERFACE_CRAFTING_SETTINGS = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedcrafting:part_interface_crafting_settings"));
2525

26-
public static final DeferredHolder<RecipeSerializer<?>, RecipeSerializer<RecipeDeadBush>> RECIPESERIALIZER_DEAD_BUSH = DeferredHolder.create(Registries.RECIPE_SERIALIZER, ResourceLocation.parse("integratedcrafting:crafting_special_dead_bush"));
26+
public static final DeferredHolder<RecipeSerializer<?>, RecipeSerializer<RecipeDeadBush>> RECIPESERIALIZER_DEAD_BUSH = DeferredHolder.create(Registries.RECIPE_SERIALIZER, Identifier.parse("integratedcrafting:crafting_special_dead_bush"));
2727

2828
}

‎src/main/java/org/cyclops/integratedcrafting/client/gui/ContainerScreenPartInterfaceCrafting.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.minecraft.client.gui.GuiGraphics;
44
import net.minecraft.network.chat.Component;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import net.minecraft.util.ARGB;
77
import net.minecraft.world.entity.player.Inventory;
88
import org.cyclops.cyclopscore.client.gui.component.button.ButtonImage;
@@ -37,8 +37,8 @@ public void init() {
3737
}
3838

3939
@Override
40-
protected ResourceLocation constructGuiTexture() {
41-
return ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/part_interface_crafting.png");
40+
protected Identifier constructGuiTexture() {
41+
return Identifier.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/part_interface_crafting.png");
4242
}
4343

4444
@Override

‎src/main/java/org/cyclops/integratedcrafting/client/gui/ContainerScreenPartInterfaceCraftingSettings.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import net.minecraft.core.Direction;
1010
import net.minecraft.nbt.CompoundTag;
1111
import net.minecraft.network.chat.Component;
12-
import net.minecraft.resources.ResourceLocation;
12+
import net.minecraft.resources.Identifier;
1313
import net.minecraft.util.ARGB;
1414
import net.minecraft.world.entity.player.Inventory;
1515
import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
@@ -47,8 +47,8 @@ public ContainerScreenPartInterfaceCraftingSettings(ContainerPartInterfaceCrafti
4747
}
4848

4949
@Override
50-
protected ResourceLocation constructGuiTexture() {
51-
return ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/part_interface_settings.png");
50+
protected Identifier constructGuiTexture() {
51+
return Identifier.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/part_interface_settings.png");
5252
}
5353

5454
@Override

‎src/main/java/org/cyclops/integratedcrafting/core/CraftingJobHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import it.unimi.dsi.fastutil.objects.Object2IntMap;
1010
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
1111
import net.minecraft.core.Direction;
12-
import net.minecraft.resources.ResourceLocation;
12+
import net.minecraft.resources.Identifier;
1313
import net.minecraft.util.ExtraCodecs;
1414
import net.minecraft.world.level.storage.ValueInput;
1515
import net.minecraft.world.level.storage.ValueOutput;
@@ -144,7 +144,7 @@ public void deserialize(ValueInput valueInput) {
144144
Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>> pendingIngredientInstances = Maps.newIdentityHashMap();
145145
for (ValueInput pendingIngredientTag : pendingIngredientsList) {
146146
String componentName = pendingIngredientTag.getString("ingredientComponent").orElseThrow();
147-
IngredientComponent<?, ?> ingredientComponent = IngredientComponent.REGISTRY.getValue(ResourceLocation.parse(componentName));
147+
IngredientComponent<?, ?> ingredientComponent = IngredientComponent.REGISTRY.getValue(Identifier.parse(componentName));
148148
if (ingredientComponent == null) {
149149
throw new IllegalArgumentException("Could not find the ingredient component type " + componentName);
150150
}
@@ -190,7 +190,7 @@ public void deserialize(ValueInput valueInput) {
190190

191191
this.ingredientComponentTargetOverrides.clear();
192192
for (ValueInput targetOverride : valueInput.childrenList("targetOverrides").orElseThrow()) {
193-
IngredientComponent<?, ?> component = IngredientComponent.REGISTRY.getValue(ResourceLocation.parse(targetOverride.getString("key").orElseThrow()));
193+
IngredientComponent<?, ?> component = IngredientComponent.REGISTRY.getValue(Identifier.parse(targetOverride.getString("key").orElseThrow()));
194194
this.ingredientComponentTargetOverrides.put(component, Direction.values()[targetOverride.getInt("value").orElseThrow()]);
195195
}
196196

‎src/main/java/org/cyclops/integratedcrafting/core/MissingIngredients.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.google.common.collect.Lists;
44
import com.google.common.collect.Maps;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import net.minecraft.world.level.storage.ValueInput;
77
import net.minecraft.world.level.storage.ValueOutput;
88
import org.cyclops.commoncapabilities.api.ingredient.IPrototypedIngredient;
@@ -77,7 +77,7 @@ public static void serialize(ValueOutput valueOutput, Map<IngredientComponent<?,
7777
ValueInput.ValueInputList missingIngredientsTagList = valueInput.childrenList("v").orElseThrow();
7878
for (ValueInput input : missingIngredientsTagList) {
7979
String componentName = input.getString("component").orElseThrow();
80-
IngredientComponent<?, ?> component = IngredientComponent.REGISTRY.getValue(ResourceLocation.parse(componentName));
80+
IngredientComponent<?, ?> component = IngredientComponent.REGISTRY.getValue(Identifier.parse(componentName));
8181
if (component == null) {
8282
throw new IllegalArgumentException("Could not find the ingredient component type " + componentName);
8383
}

‎src/main/java/org/cyclops/integratedcrafting/core/part/PartTypeInterfaceCraftingBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.google.common.collect.Lists;
44
import net.minecraft.core.Direction;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import net.minecraft.world.entity.player.Player;
77
import net.minecraft.world.item.ItemStack;
88
import net.minecraft.world.level.storage.ValueInput;
@@ -212,7 +212,7 @@ public void deserialize(ValueInput valueInput) {
212212
this.inventoryOutputBuffer.clear();
213213
for (ValueInput instanceTag : valueInput.childrenList("inventoryOutputBuffer").orElseThrow()) {
214214
String componentName = instanceTag.getString("component").orElseThrow();
215-
IngredientComponent<?, ?> component = IngredientComponent.REGISTRY.getValue(ResourceLocation.parse(componentName));
215+
IngredientComponent<?, ?> component = IngredientComponent.REGISTRY.getValue(Identifier.parse(componentName));
216216
this.inventoryOutputBuffer.add(new IngredientInstanceWrapper(component,
217217
component.getSerializer().deserializeInstance(instanceTag.child("instance").orElseThrow())));
218218
}

‎src/main/java/org/cyclops/integratedcrafting/gametest/GameTestHelpersIntegratedCrafting.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.minecraft.gametest.framework.GameTestHelper;
99
import net.minecraft.recipebook.PlaceRecipeHelper;
1010
import net.minecraft.resources.ResourceKey;
11-
import net.minecraft.resources.ResourceLocation;
11+
import net.minecraft.resources.Identifier;
1212
import net.minecraft.world.item.ItemStack;
1313
import net.minecraft.world.item.Items;
1414
import net.minecraft.world.item.crafting.*;
@@ -89,7 +89,7 @@ public static INetworkPositions<PartTypeInterfaceCrafting.State> createBasicNetw
8989
BlockPos posi = pos;
9090
List<PartPos> interfaces = Lists.newArrayList();
9191
List<T> interfaceStates = Lists.newArrayList();
92-
List<Consumer<Triple<Integer, RecipeType<?>, ResourceLocation>>> interfaceRecipeAdders = Lists.newArrayList();
92+
List<Consumer<Triple<Integer, RecipeType<?>, Identifier>>> interfaceRecipeAdders = Lists.newArrayList();
9393
for (Block crafter : crafters) {
9494
if (!pos.equals(posi)) {
9595
helper.setBlock(posi, RegistryEntries.BLOCK_CABLE.value());
@@ -135,7 +135,7 @@ public static INetworkPositions<PartTypeInterfaceCrafting.State> createBasicNetw
135135
return new NetworkPositions(pos.east(), PartPos.of(helper.getLevel(), helper.absolutePos(pos), Direction.NORTH), interfaces, interfaceStates, interfaceRecipeAdders);
136136
}
137137

138-
public static ItemStack createVariableForRecipe(Level level, RecipeType<?> recipeType, ResourceLocation recipeName) {
138+
public static ItemStack createVariableForRecipe(Level level, RecipeType<?> recipeType, Identifier recipeName) {
139139
RecipeHolder<?> recipeUnknown = null;
140140
RecipeDisplay recipeDisplay = null;
141141
try {
@@ -244,15 +244,15 @@ public static record NetworkPositions<T extends PartTypeInterfaceCraftingBase.St
244244
PartPos writer,
245245
List<PartPos> interfaces,
246246
List<T> interfaceStates,
247-
List<Consumer<Triple<Integer, RecipeType<?>, ResourceLocation>>> interfaceRecipeAdders
247+
List<Consumer<Triple<Integer, RecipeType<?>, Identifier>>> interfaceRecipeAdders
248248
) implements INetworkPositions<T> {}
249249

250250
public static interface INetworkPositions<T extends PartTypeInterfaceCraftingBase.State<?, ?>> {
251251
public BlockPos chest();
252252
public PartPos writer();
253253
public List<PartPos> interfaces();
254254
public List<T> interfaceStates();
255-
public List<Consumer<Triple<Integer, RecipeType<?>, ResourceLocation>>> interfaceRecipeAdders();
255+
public List<Consumer<Triple<Integer, RecipeType<?>, Identifier>>> interfaceRecipeAdders();
256256
}
257257

258258
}

0 commit comments

Comments
 (0)