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

Enabled Handheld filler recipe

Browse source 
Bumped for FC
This commit is contained in:
Flanks255 2024-03-14 17:03:44 -05:00
parent 39b20107c4
commit 87b0261720
7 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
# Actually Additions
mod_version=1.2.7
mod_version=1.2.8
# Forge
game_version=1.20.4

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

@ -1,4 +1,4 @@
// 1.20.4 2024-03-13T16:30:00.2078814 Item Recipes
// 1.20.4 2024-03-14T17:01:13.6665594 Item Recipes
d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json
f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json
d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json
@ -82,6 +82,7 @@ ffa7a52a39d9261b9c90c62709183a1f2d8f8352 data/actuallyadditions/recipes/drill_up
17d778888263c745217e8f1f7322b2245b99875d data/actuallyadditions/recipes/engineers_goggles_advanced.json
86ebb8d24b81682bf376f6cba628bcb13d62ed41 data/actuallyadditions/recipes/filter.json
811730c9a8496dd65e208a36d015b0671e86df1b data/actuallyadditions/recipes/gold_aiot.json
8b2ce2abfa8f78f7903c22347a54cdcf018d03eb data/actuallyadditions/recipes/handheld_filler.json
a4e0e3bb72d472302f2ab4e5d282cbc7fd6882a6 data/actuallyadditions/recipes/iron_aiot.json
5615f6ad2e28e9c105491acb965e763dfe8cacab data/actuallyadditions/recipes/laser_upgrade_invisibility.json
38f744e92f1a5ff6a64e37cdfbb646422f741b3c data/actuallyadditions/recipes/laser_upgrade_range.json

29
src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json Normal file
View file

@ -0,0 +1,29 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"B": {
"item": "actuallyadditions:triple_battery"
},
"C": {
"item": "actuallyadditions:advanced_coil"
},
"D": {
"item": "actuallyadditions:diamatine_crystal"
},
"I": {
"item": "actuallyadditions:empowered_enori_crystal"
},
"P": {
"item": "actuallyadditions:palis_crystal"
}
},
"pattern": [
"IPI",
"DCD",
" B "
],
"result": {
"item": "actuallyadditions:handheld_filler"
}
}

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

@ -88,7 +88,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput);
//Filling Wand
/* Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get())
Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get())
.pattern("IPI")
.pattern("DCD")
.pattern(" B ")
@ -96,7 +96,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('P', ActuallyItems.PALIS_CRYSTAL.get())
.define('C', ActuallyItems.ADVANCED_COIL.get())
.define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
.define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(recipeOutput);*/ //TODO not done yet
.define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(recipeOutput);
//Bag
Recipe.shaped(ActuallyItems.TRAVELERS_SACK.get())

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java
View file

@ -103,7 +103,7 @@ public final class ActuallyItems {
public static final DeferredItem<ItemEngineerGoggles> ENGINEERS_GOGGLES = ITEMS.register("engineers_goggles", () -> new ItemEngineerGoggles(false));
public static final DeferredItem<ItemLaserRelayUpgrade> LASER_UPGRADE_RANGE = ITEMS.register("laser_upgrade_range", ItemLaserRelayUpgrade::new);
public static final DeferredItem<ItemLaserRelayUpgrade> LASER_UPGRADE_INVISIBILITY = ITEMS.register("laser_upgrade_invisibility", ItemLaserRelayUpgrade::new);
public static final DeferredItem<ItemFillingWand> HANDHELD_FILLER = ITEMS.register("handheld_filler", ItemFillingWand::new);
public static final DeferredItem<Filler> HANDHELD_FILLER = ITEMS.register("handheld_filler", Filler::new);
public static final DeferredItem<Sack> TRAVELERS_SACK = ITEMS.register("travelers_sack", () -> new Sack(false));
public static final DeferredItem<Sack> VOID_SACK = ITEMS.register("void_sack", () -> new Sack(true));
public static final DeferredItem<Worm> WORM = ITEMS.register("worm", Worm::new);

6
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java → src/main/java/de/ellpeck/actuallyadditions/mod/items/Filler.java
View file

@ -40,9 +40,9 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.Optional;
public class ItemFillingWand extends ItemEnergy {
public class Filler extends ItemEnergy {
public ItemFillingWand() {
public Filler() {
super(500000, 1000);
}
@ -143,7 +143,7 @@ public class ItemFillingWand extends ItemEnergy {
if (isSelected) {
if (entity instanceof Player player && stack.hasTag()) {
boolean creative = player.isCreative();
boolean creative = player.isCreative();
CompoundTag compound = stack.getOrCreateTag();

2
src/main/resources/assets/actuallyadditions/lang/en_us.json
View file

@ -378,7 +378,7 @@
"item.actuallyadditions.empowered_canola_seed": "Empowered Canola Seed",
"item.actuallyadditions.lens_of_the_miner": "Lens of the Miner",
"item.actuallyadditions.lens_of_the_killer": "Lens of the Killer (wip)",
"item.actuallyadditions.handheld_filler": "Handheld Filler (wip)",
"item.actuallyadditions.handheld_filler": "Handheld Filler",
"item.actuallyadditions.laser_upgrade_invisibility": "Laser Relay Modifier: Invisibility (wip)",
"item.actuallyadditions.engineers_goggles": "Engineer's Goggles",
"item.actuallyadditions.engineers_goggles_advanced": "Engineer's Infrared Goggles",