Skip to content

Commit 1229c28

Browse files
rubensworksrubensworks
committed
Update to MC 26.2
1 parent 4db236b commit 1229c28

3 files changed

Lines changed: 32 additions & 31 deletions

File tree

‎gradle.properties‎

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

66
# Common
7-
minecraft_version=26.1.2
7+
minecraft_version=26.2
88
mod_name=CommonCapabilities
99
mod_author=rubensworks (aka kroeser)
1010
mod_id=commoncapabilities
@@ -19,7 +19,7 @@ curseforge_project_id=247007
1919
modrinth_project_id=oFXrCkDI
2020

2121
# NeoForge
22-
neoforge_version=26.1.2.22-beta
22+
neoforge_version=26.2.0.6-beta
2323
neoforge_loader_version_range=[4,)
2424
neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/common-capabilities.json
2525

@@ -29,7 +29,7 @@ org.gradle.daemon=false
2929
org.gradle.caching=true
3030

3131
# Dependencies
32-
cyclopscore_version=1.29.5-1012
32+
cyclopscore_version=1.30.0-1038
3333
rfapi_version=1.12-2.1.0.7
3434
enderio_version=3.0.0.40_alpha
3535
endercore_version=0.4.0.24-alpha
@@ -43,5 +43,5 @@ cofhcore_version=1.12.2-4.6.2.25
4343
thermalfoundation_version=1.12.2-2.6.2.26
4444
cofhworld_version=1.12.2-1.3.0.6
4545
codechickenlib_version=1.12.2-3.2.2.354
46-
visualworkbench_version=8004807
47-
puzzleslib_version=7999119
46+
visualworkbench_version=8272529
47+
puzzleslib_version=8269330

‎src/main/java/org/cyclops/commoncapabilities/gametest/GameTestsVanillaCapabilitiesEntityItemFrame.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.minecraft.core.BlockPos;
44
import net.minecraft.gametest.framework.GameTestHelper;
55
import net.minecraft.network.chat.Component;
6-
import net.minecraft.world.entity.EntityType;
6+
import net.minecraft.world.entity.EntityTypes;
77
import net.minecraft.world.entity.decoration.ItemFrame;
88
import net.minecraft.world.item.ItemStack;
99
import net.minecraft.world.item.Items;
@@ -24,7 +24,7 @@ public class GameTestsVanillaCapabilitiesEntityItemFrame {
2424
@GameTest(template = TEMPLATE_EMPTY)
2525
public void testEntityItemFrameAdd(GameTestHelper helper) {
2626
// Spawn item frame with shulker box
27-
ItemFrame entity = helper.spawn(EntityType.ITEM_FRAME, POS);
27+
ItemFrame entity = helper.spawn(EntityTypes.ITEM_FRAME, POS);
2828
entity.setItem(new ItemStack(Items.SHULKER_BOX));
2929

3030
// Add item to shulker box
@@ -44,7 +44,7 @@ public void testEntityItemFrameAdd(GameTestHelper helper) {
4444
@GameTest(template = TEMPLATE_EMPTY)
4545
public void testEntityItemFrameRemove(GameTestHelper helper) {
4646
// Spawn item frame with shulker box
47-
ItemFrame entity = helper.spawn(EntityType.ITEM_FRAME, POS);
47+
ItemFrame entity = helper.spawn(EntityTypes.ITEM_FRAME, POS);
4848
entity.setItem(new ItemStack(Items.SHULKER_BOX));
4949

5050
// Remove item from shulker box

‎src/main/java/org/cyclops/commoncapabilities/modcompat/vanilla/VanillaModCompat.java‎

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

33
import net.minecraft.core.Direction;
44
import net.minecraft.world.entity.EntityType;
5+
import net.minecraft.world.entity.EntityTypes;
56
import net.minecraft.world.entity.decoration.GlowItemFrame;
67
import net.minecraft.world.entity.decoration.ItemFrame;
78
import net.minecraft.world.entity.item.ItemEntity;
@@ -81,7 +82,7 @@ public ICompatInitializer createInitializer() {
8182
return (mod) -> {
8283
CapabilityConstructorRegistry registry = CommonCapabilities._instance.getCapabilityConstructorRegistry();
8384
// Worker
84-
registry.registerBlockEntity(() -> BlockEntityType.FURNACE,
85+
registry.registerBlockEntity(() -> BlockEntityTypes.FURNACE,
8586
new ICapabilityConstructor<FurnaceBlockEntity, Direction, IWorker, BlockEntityType<FurnaceBlockEntity>>() {
8687
@Override
8788
public BaseCapability<IWorker, Direction> getCapability() {
@@ -93,7 +94,7 @@ public ICapabilityProvider<FurnaceBlockEntity, Direction, IWorker> createProvide
9394
return (blockEntity, side) -> new VanillaAbstractFurnaceWorker(blockEntity);
9495
}
9596
});
96-
registry.registerBlockEntity(() -> BlockEntityType.BLAST_FURNACE,
97+
registry.registerBlockEntity(() -> BlockEntityTypes.BLAST_FURNACE,
9798
new ICapabilityConstructor<BlastFurnaceBlockEntity, Direction, IWorker, BlockEntityType<BlastFurnaceBlockEntity>>() {
9899
@Override
99100
public BaseCapability<IWorker, Direction> getCapability() {
@@ -105,7 +106,7 @@ public ICapabilityProvider<BlastFurnaceBlockEntity, Direction, IWorker> createPr
105106
return (blockEntity, side) -> new VanillaAbstractFurnaceWorker(blockEntity);
106107
}
107108
});
108-
registry.registerBlockEntity(() -> BlockEntityType.SMOKER,
109+
registry.registerBlockEntity(() -> BlockEntityTypes.SMOKER,
109110
new ICapabilityConstructor<SmokerBlockEntity, Direction, IWorker, BlockEntityType<SmokerBlockEntity>>() {
110111
@Override
111112
public BaseCapability<IWorker, Direction> getCapability() {
@@ -117,7 +118,7 @@ public ICapabilityProvider<SmokerBlockEntity, Direction, IWorker> createProvider
117118
return (blockEntity, side) -> new VanillaAbstractFurnaceWorker(blockEntity);
118119
}
119120
});
120-
registry.registerBlockEntity(() -> BlockEntityType.BREWING_STAND,
121+
registry.registerBlockEntity(() -> BlockEntityTypes.BREWING_STAND,
121122
new ICapabilityConstructor<BrewingStandBlockEntity, Direction, IWorker, BlockEntityType<BrewingStandBlockEntity>>() {
122123
@Override
123124
public BaseCapability<IWorker, Direction> getCapability() {
@@ -129,7 +130,7 @@ public ICapabilityProvider<BrewingStandBlockEntity, Direction, IWorker> createPr
129130
return (blockEntity, side) -> new VanillaBrewingStandWorker(blockEntity);
130131
}
131132
});
132-
registry.registerBlockEntity(() -> BlockEntityType.CAMPFIRE,
133+
registry.registerBlockEntity(() -> BlockEntityTypes.CAMPFIRE,
133134
new ICapabilityConstructor<CampfireBlockEntity, Direction, IWorker, BlockEntityType<CampfireBlockEntity>>() {
134135
@Override
135136
public BaseCapability<IWorker, Direction> getCapability() {
@@ -143,7 +144,7 @@ public ICapabilityProvider<CampfireBlockEntity, Direction, IWorker> createProvid
143144
});
144145

145146
// Temperature
146-
registry.registerBlockEntity(() -> BlockEntityType.FURNACE,
147+
registry.registerBlockEntity(() -> BlockEntityTypes.FURNACE,
147148
new ICapabilityConstructor<FurnaceBlockEntity, Direction, ITemperature, BlockEntityType<FurnaceBlockEntity>>() {
148149
@Override
149150
public BaseCapability<ITemperature, Direction> getCapability() {
@@ -155,7 +156,7 @@ public ICapabilityProvider<FurnaceBlockEntity, Direction, ITemperature> createPr
155156
return (blockEntity, side) -> new VanillaAbstractFurnaceTemperature(blockEntity);
156157
}
157158
});
158-
registry.registerBlockEntity(() -> BlockEntityType.BLAST_FURNACE,
159+
registry.registerBlockEntity(() -> BlockEntityTypes.BLAST_FURNACE,
159160
new ICapabilityConstructor<BlastFurnaceBlockEntity, Direction, ITemperature, BlockEntityType<BlastFurnaceBlockEntity>>() {
160161
@Override
161162
public BaseCapability<ITemperature, Direction> getCapability() {
@@ -167,7 +168,7 @@ public ICapabilityProvider<BlastFurnaceBlockEntity, Direction, ITemperature> cre
167168
return (blockEntity, side) -> new VanillaAbstractFurnaceTemperature(blockEntity);
168169
}
169170
});
170-
registry.registerBlockEntity(() -> BlockEntityType.SMOKER,
171+
registry.registerBlockEntity(() -> BlockEntityTypes.SMOKER,
171172
new ICapabilityConstructor<SmokerBlockEntity, Direction, ITemperature, BlockEntityType<SmokerBlockEntity>>() {
172173
@Override
173174
public BaseCapability<ITemperature, Direction> getCapability() {
@@ -179,7 +180,7 @@ public ICapabilityProvider<SmokerBlockEntity, Direction, ITemperature> createPro
179180
return (blockEntity, side) -> new VanillaAbstractFurnaceTemperature(blockEntity);
180181
}
181182
});
182-
registry.registerBlockEntity(() -> BlockEntityType.CAMPFIRE,
183+
registry.registerBlockEntity(() -> BlockEntityTypes.CAMPFIRE,
183184
new ICapabilityConstructor<CampfireBlockEntity, Direction, ITemperature, BlockEntityType<CampfireBlockEntity>>() {
184185
@Override
185186
public BaseCapability<ITemperature, Direction> getCapability() {
@@ -244,7 +245,7 @@ public ICapabilityProvider<ItemStack, ItemAccess, ResourceHandler<ItemResource>>
244245
return (itemStack, context) -> new VanillaItemBundleItemHandler(itemStack);
245246
}
246247
});
247-
registry.registerEntity(() -> EntityType.ITEM,
248+
registry.registerEntity(() -> EntityTypes.ITEM,
248249
new ICapabilityConstructor<ItemEntity, Void, ResourceHandler<ItemResource>, EntityType<ItemEntity>>() {
249250
@Override
250251
public BaseCapability<ResourceHandler<ItemResource>, Void> getCapability() {
@@ -261,7 +262,7 @@ public ICapabilityProvider<ItemEntity, Void, ResourceHandler<ItemResource>> crea
261262
};
262263
}
263264
});
264-
registry.registerEntity(() -> EntityType.ITEM_FRAME,
265+
registry.registerEntity(() -> EntityTypes.ITEM_FRAME,
265266
new ICapabilityConstructor<ItemFrame, Void, ResourceHandler<ItemResource>, EntityType<ItemFrame>>() {
266267
@Override
267268
public BaseCapability<ResourceHandler<ItemResource>, Void> getCapability() {
@@ -278,7 +279,7 @@ public ICapabilityProvider<ItemFrame, Void, ResourceHandler<ItemResource>> creat
278279
};
279280
}
280281
});
281-
registry.registerEntity(() -> EntityType.GLOW_ITEM_FRAME,
282+
registry.registerEntity(() -> EntityTypes.GLOW_ITEM_FRAME,
282283
new ICapabilityConstructor<GlowItemFrame, Void, ResourceHandler<ItemResource>, EntityType<GlowItemFrame>>() {
283284
@Override
284285
public BaseCapability<ResourceHandler<ItemResource>, Void> getCapability() {
@@ -297,7 +298,7 @@ public ICapabilityProvider<GlowItemFrame, Void, ResourceHandler<ItemResource>> c
297298
});
298299

299300
// FluidHandler
300-
registry.registerEntity(() -> EntityType.ITEM,
301+
registry.registerEntity(() -> EntityTypes.ITEM,
301302
new ICapabilityConstructor<ItemEntity, Direction, ResourceHandler<FluidResource>, EntityType<ItemEntity>>() {
302303
@Override
303304
public BaseCapability<ResourceHandler<FluidResource>, Direction> getCapability() {
@@ -314,7 +315,7 @@ public ICapabilityProvider<ItemEntity, Direction, ResourceHandler<FluidResource>
314315
};
315316
}
316317
});
317-
registry.registerEntity(() -> EntityType.ITEM_FRAME,
318+
registry.registerEntity(() -> EntityTypes.ITEM_FRAME,
318319
new ICapabilityConstructor<ItemFrame, Direction, ResourceHandler<FluidResource>, EntityType<ItemFrame>>() {
319320
@Override
320321
public BaseCapability<ResourceHandler<FluidResource>, Direction> getCapability() {
@@ -331,7 +332,7 @@ public ICapabilityProvider<ItemFrame, Direction, ResourceHandler<FluidResource>>
331332
};
332333
}
333334
});
334-
registry.registerEntity(() -> EntityType.GLOW_ITEM_FRAME,
335+
registry.registerEntity(() -> EntityTypes.GLOW_ITEM_FRAME,
335336
new ICapabilityConstructor<GlowItemFrame, Direction, ResourceHandler<FluidResource>, EntityType<GlowItemFrame>>() {
336337
@Override
337338
public BaseCapability<ResourceHandler<FluidResource>, Direction> getCapability() {
@@ -350,7 +351,7 @@ public ICapabilityProvider<GlowItemFrame, Direction, ResourceHandler<FluidResour
350351
});
351352

352353
// EnergyStorage
353-
registry.registerEntity(() -> EntityType.ITEM,
354+
registry.registerEntity(() -> EntityTypes.ITEM,
354355
new ICapabilityConstructor<ItemEntity, Direction, EnergyHandler, EntityType<ItemEntity>>() {
355356
@Override
356357
public BaseCapability<EnergyHandler, Direction> getCapability() {
@@ -367,7 +368,7 @@ public ICapabilityProvider<ItemEntity, Direction, EnergyHandler> createProvider(
367368
};
368369
}
369370
});
370-
registry.registerEntity(() -> EntityType.ITEM_FRAME,
371+
registry.registerEntity(() -> EntityTypes.ITEM_FRAME,
371372
new ICapabilityConstructor<ItemFrame, Direction, EnergyHandler, EntityType<ItemFrame>>() {
372373
@Override
373374
public BaseCapability<EnergyHandler, Direction> getCapability() {
@@ -384,7 +385,7 @@ public ICapabilityProvider<ItemFrame, Direction, EnergyHandler> createProvider(E
384385
};
385386
}
386387
});
387-
registry.registerEntity(() -> EntityType.GLOW_ITEM_FRAME,
388+
registry.registerEntity(() -> EntityTypes.GLOW_ITEM_FRAME,
388389
new ICapabilityConstructor<GlowItemFrame, Direction, EnergyHandler, EntityType<GlowItemFrame>>() {
389390
@Override
390391
public BaseCapability<EnergyHandler, Direction> getCapability() {
@@ -407,7 +408,7 @@ public ICapabilityProvider<GlowItemFrame, Direction, EnergyHandler> createProvid
407408
VanillaRecipeTypeRecipeHandler.CACHED_RECIPES.clear();
408409
TransformedRecipeHandlerAdapter.CACHED_RECIPES.clear();
409410
});
410-
registry.registerBlockEntity(() -> BlockEntityType.BREWING_STAND,
411+
registry.registerBlockEntity(() -> BlockEntityTypes.BREWING_STAND,
411412
new ICapabilityConstructor<BrewingStandBlockEntity, Direction, IRecipeHandler, BlockEntityType<BrewingStandBlockEntity>>() {
412413
@Override
413414
public BaseCapability<IRecipeHandler, Direction> getCapability() {
@@ -419,7 +420,7 @@ public ICapabilityProvider<BrewingStandBlockEntity, Direction, IRecipeHandler> c
419420
return (blockEntity, side) -> VanillaBrewingStandRecipeHandler.getInstance();
420421
}
421422
});
422-
registry.registerBlockEntity(() -> BlockEntityType.FURNACE,
423+
registry.registerBlockEntity(() -> BlockEntityTypes.FURNACE,
423424
new ICapabilityConstructor<FurnaceBlockEntity, Direction, IRecipeHandler, BlockEntityType<FurnaceBlockEntity>>() {
424425
@Override
425426
public BaseCapability<IRecipeHandler, Direction> getCapability() {
@@ -432,7 +433,7 @@ public ICapabilityProvider<FurnaceBlockEntity, Direction, IRecipeHandler> create
432433
RecipeType.SMELTING, (size) -> size == 1, (c) -> new SingleRecipeInput(c.getItem(0)), true, false);
433434
}
434435
});
435-
registry.registerBlockEntity(() -> BlockEntityType.BLAST_FURNACE,
436+
registry.registerBlockEntity(() -> BlockEntityTypes.BLAST_FURNACE,
436437
new ICapabilityConstructor<BlastFurnaceBlockEntity, Direction, IRecipeHandler, BlockEntityType<BlastFurnaceBlockEntity>>() {
437438
@Override
438439
public BaseCapability<IRecipeHandler, Direction> getCapability() {
@@ -445,7 +446,7 @@ public ICapabilityProvider<BlastFurnaceBlockEntity, Direction, IRecipeHandler> c
445446
RecipeType.BLASTING, (size) -> size == 1, (c) -> new SingleRecipeInput(c.getItem(0)), true, false);
446447
}
447448
});
448-
registry.registerBlockEntity(() -> BlockEntityType.SMOKER,
449+
registry.registerBlockEntity(() -> BlockEntityTypes.SMOKER,
449450
new ICapabilityConstructor<SmokerBlockEntity, Direction, IRecipeHandler, BlockEntityType<SmokerBlockEntity>>() {
450451
@Override
451452
public BaseCapability<IRecipeHandler, Direction> getCapability() {
@@ -458,7 +459,7 @@ public ICapabilityProvider<SmokerBlockEntity, Direction, IRecipeHandler> createP
458459
RecipeType.SMOKING, (size) -> size == 1, (c) -> new SingleRecipeInput(c.getItem(0)), true, false);
459460
}
460461
});
461-
registry.registerBlockEntity(() -> BlockEntityType.CAMPFIRE,
462+
registry.registerBlockEntity(() -> BlockEntityTypes.CAMPFIRE,
462463
new ICapabilityConstructor<CampfireBlockEntity, Direction, IRecipeHandler, BlockEntityType<CampfireBlockEntity>>() {
463464
@Override
464465
public BaseCapability<IRecipeHandler, Direction> getCapability() {

0 commit comments

Comments
 (0)