Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed recipe conflicts.

Browse source 
Fixed fluid placer wasting fluids.
This commit is contained in:
Flanks255 2024-03-10 13:19:11 -05:00
parent 50b5209e84
commit f524eccc01
6 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246
View file

@ -1,4 +1,4 @@
// 1.20.4 2024-03-08T17:07:43.7158398 Item Recipes // 1.20.4 2024-03-10T13:16:06.5711018 Item Recipes
d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json
f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json
d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json
@ -87,6 +87,8 @@ f6c73cb2e41a8a21e2fda888b28bf52672b33d2e data/actuallyadditions/recipes/rice_sli
764d4f63e1d978d02419d30d2ad845b914e594c0 data/actuallyadditions/recipes/ring_of_magnetizing.json 764d4f63e1d978d02419d30d2ad845b914e594c0 data/actuallyadditions/recipes/ring_of_magnetizing.json
fc0a5281fc77edde16f22165e164f73dd28d7fcd data/actuallyadditions/recipes/single_battery.json fc0a5281fc77edde16f22165e164f73dd28d7fcd data/actuallyadditions/recipes/single_battery.json
cb0454ccb8e918d506a1dd488187453678f82751 data/actuallyadditions/recipes/stone_aiot.json cb0454ccb8e918d506a1dd488187453678f82751 data/actuallyadditions/recipes/stone_aiot.json
c57c0ac561f1919f6085f052060ca285a67ac579 data/actuallyadditions/recipes/tagged_slime_block.json
be5e09790d225ca17dfef8089caece4095f3b6cf data/actuallyadditions/recipes/tagged_sticky_piston.json
b4aa29ef0d47b557f354a23cb6ee8ef60d273de3 data/actuallyadditions/recipes/teleport_staff.json b4aa29ef0d47b557f354a23cb6ee8ef60d273de3 data/actuallyadditions/recipes/teleport_staff.json
0ec48b429486a03aba107cb8b6dc9e03694ca68f data/actuallyadditions/recipes/tiny_to_charcoal.json 0ec48b429486a03aba107cb8b6dc9e03694ca68f data/actuallyadditions/recipes/tiny_to_charcoal.json
5745a05f877fce254a1990f1e89f80e91846e270 data/actuallyadditions/recipes/tiny_to_coal.json 5745a05f877fce254a1990f1e89f80e91846e270 data/actuallyadditions/recipes/tiny_to_coal.json
@ -94,5 +96,3 @@ b4aa29ef0d47b557f354a23cb6ee8ef60d273de3 data/actuallyadditions/recipes/teleport
89c9512eeb746befb1bdc31037baa9bd86220f74 data/actuallyadditions/recipes/triple_battery.json 89c9512eeb746befb1bdc31037baa9bd86220f74 data/actuallyadditions/recipes/triple_battery.json
0737014abee48f688982412297e04e994aa6f9a6 data/actuallyadditions/recipes/wings_of_the_bats.json 0737014abee48f688982412297e04e994aa6f9a6 data/actuallyadditions/recipes/wings_of_the_bats.json
c80073fcade3cdcb15f28c4a1cb12df4ae6cf4ec data/actuallyadditions/recipes/wooden_aiot.json c80073fcade3cdcb15f28c4a1cb12df4ae6cf4ec data/actuallyadditions/recipes/wooden_aiot.json
2bd8e4e4ed83a0d870e4509c0e722a9bbfd54a73 data/minecraft/recipes/slime_block.json
77fa026351592845c5fd6bbe430e6362e755eaaf data/minecraft/recipes/sticky_piston.json

2
src/generated/resources/data/minecraft/recipes/slime_block.json → src/generated/resources/data/actuallyadditions/recipes/tagged_slime_block.json
View file

@ -3,7 +3,7 @@
"category": "misc", "category": "misc",
"key": { "key": {
"R": { "R": {
"item": "actuallyadditions:rice_slimeball" "tag": "forge:slimeballs"
} }
}, },
"pattern": [ "pattern": [

2
src/generated/resources/data/minecraft/recipes/sticky_piston.json → src/generated/resources/data/actuallyadditions/recipes/tagged_sticky_piston.json
View file

@ -6,7 +6,7 @@
"item": "minecraft:piston" "item": "minecraft:piston"
}, },
"R": { "R": {
"item": "actuallyadditions:rice_slimeball" "tag": "forge:slimeballs"
} }
}, },
"pattern": [ "pattern": [

12
src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java
View file

@ -489,18 +489,18 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('I', Items.IRON_HELMET) .define('I', Items.IRON_HELMET)
.save(recipeOutput); .save(recipeOutput);
// Sticky Piston from rice slime // Sticky Piston from tagged slime balls
Recipe.shaped(Items.STICKY_PISTON) Recipe.shaped(Items.STICKY_PISTON)
.pattern("R", "P") .pattern("R", "P")
.define('R', ActuallyItems.RICE_SLIMEBALL.get()) .define('R', Tags.Items.SLIMEBALLS)
.define('P', Items.PISTON) .define('P', Items.PISTON)
.save(recipeOutput); .save(recipeOutput, new ResourceLocation(ActuallyAdditions.MODID, "tagged_sticky_piston"));
// Slime block from rice slime balls // Slime block from tagged balls
Recipe.shaped(Items.SLIME_BLOCK) Recipe.shaped(Items.SLIME_BLOCK)
.pattern("RRR", "RRR", "RRR") .pattern("RRR", "RRR", "RRR")
.define('R', ActuallyItems.RICE_SLIMEBALL.get()) .define('R', Tags.Items.SLIMEBALLS)
.save(recipeOutput); .save(recipeOutput, new ResourceLocation(ActuallyAdditions.MODID, "tagged_slime_block"));
//Shards //Shards
addShard(recipeOutput, ActuallyItems.VOID_CRYSTAL_SHARD, ActuallyItems.VOID_CRYSTAL); addShard(recipeOutput, ActuallyItems.VOID_CRYSTAL_SHARD, ActuallyItems.VOID_CRYSTAL);

2
src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java
View file

@ -17,7 +17,7 @@ import java.util.concurrent.CompletableFuture;
public class ItemTagsGenerator extends ItemTagsProvider { public class ItemTagsGenerator extends ItemTagsProvider {
public ItemTagsGenerator(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookupProvider, public ItemTagsGenerator(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookupProvider,
TagsProvider<Block> blockTagProvider, ExistingFileHelper existingFileHelper) { TagsProvider<Block> blockTagProvider, ExistingFileHelper existingFileHelper) {
super(packOutput, lookupProvider, blockTagProvider.contentsGetter(), ActuallyAdditions.MODID, existingFileHelper); super(packOutput, lookupProvider, blockTagProvider.contentsGetter(), ActuallyAdditions.MODID, existingFileHelper);
} }

3
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java
View file

@ -36,7 +36,6 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidStack;
import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.fluids.FluidType;
import net.neoforged.neoforge.fluids.IFluidBlock;
import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.IFluidHandler;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -116,7 +115,7 @@ public class TileEntityFluidCollector extends TileEntityBase implements ISharing
Block fluid = stack.getFluid().defaultFluidState().createLegacyBlock().getBlock(); Block fluid = stack.getFluid().defaultFluidState().createLegacyBlock().getBlock();
if (fluid != null) { if (fluid != null) {
BlockPos offsetPos = this.worldPosition.relative(sideToManipulate); BlockPos offsetPos = this.worldPosition.relative(sideToManipulate);
boolean placeable = !(blockToBreak instanceof IFluidBlock) && blockToBreak.defaultBlockState().canBeReplaced(); boolean placeable = !stateToBreak.getFluidState().isSource() && blockToBreak.defaultBlockState().canBeReplaced();
if (placeable) { if (placeable) {
this.tank.drainInternal(FluidType.BUCKET_VOLUME, IFluidHandler.FluidAction.EXECUTE); this.tank.drainInternal(FluidType.BUCKET_VOLUME, IFluidHandler.FluidAction.EXECUTE);
// TODO: [port] validate this check is still valid. // TODO: [port] validate this check is still valid.