Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing chestplate vanishing when using piggy backpack #141

Open
wants to merge 3 commits into
base: 1.20.1
Choose a base branch
from
Open

Fixing chestplate vanishing when using piggy backpack #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9cb51c
Changed scorched lantern's capacity to 100mb in order to match tooltip
K0LALA Jul 6, 2024
90b9990
Merge remote-tracking branch 'origin/1.20.1' into 1.20.1
K0LALA Jul 18, 2024
55c2a2b
Fixed chestplate armor getting removed instead of gave back to the pl…
K0LALA Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/slimeknights/tconstruct/gadgets/item/PiggyBackPackItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player playerIn,
if (this.pickupEntity(playerIn, target)) {
// unequip old armor
if (chestArmor.getItem() != this) {
int piggyBackpackSlot = playerIn.getInventory().findSlotMatchingItem(stack);
playerIn.getInventory().add(piggyBackpackSlot, chestArmor);
playerIn.getInventory().add(chestArmor);
chestArmor = ItemStack.EMPTY;
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/slimeknights/tconstruct/library/recipe/FluidValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@ public final class FluidValues {

// tank capacities
/** Capacity of a seared or scorched lantern */
public static final int LANTERN_CAPACITY = 4050;
public static final int SEARED_LANTERN_CAPACITY = 4050;
public static final int SCORCHED_LANTERN_CAPACITY = 8100;
}
4 changes: 2 additions & 2 deletions src/main/java/slimeknights/tconstruct/smeltery/TinkerSmeltery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,14 @@ public final class TinkerSmeltery extends TinkerModule {

// seared
public static final EnumObject<TankType,SearedTankBlock> searedTank = BLOCKS.registerEnum("seared", SearedTankBlock.TankType.values(), type -> new SearedTankBlock(SEARED_NON_SOLID, type.getCapacity()), b -> new TankItem(b, SMELTERY_PROPS, true));
public static final ItemObject<SearedLanternBlock> searedLantern = BLOCKS.register("seared_lantern", () -> new SearedLanternBlock(SEARED_LANTERN, FluidValues.LANTERN_CAPACITY), b -> new TankItem(b, SMELTERY_PROPS, false));
public static final ItemObject<SearedLanternBlock> searedLantern = BLOCKS.register("seared_lantern", () -> new SearedLanternBlock(SEARED_LANTERN, FluidValues.SEARED_LANTERN_CAPACITY), b -> new TankItem(b, SMELTERY_PROPS, false));
public static final ItemObject<FaucetBlock> searedFaucet = BLOCKS.register("seared_faucet", () -> new FaucetBlock(SEARED_NON_SOLID), TOOLTIP_BLOCK_ITEM);
public static final ItemObject<ChannelBlock> searedChannel = BLOCKS.register("seared_channel", () -> new ChannelBlock(SEARED_NON_SOLID), TOOLTIP_BLOCK_ITEM);
public static final ItemObject<CastingBasinBlock> searedBasin = BLOCKS.register("seared_basin", () -> new CastingBasinBlock(SEARED_NON_SOLID, false), TOOLTIP_BLOCK_ITEM);
public static final ItemObject<CastingTableBlock> searedTable = BLOCKS.register("seared_table", () -> new CastingTableBlock(SEARED_NON_SOLID, false), TOOLTIP_BLOCK_ITEM);
// scorched
public static final EnumObject<TankType,SearedTankBlock> scorchedTank = BLOCKS.registerEnum("scorched", SearedTankBlock.TankType.values(), type -> new SearedTankBlock(SCORCHED_NON_SOLID, type.getCapacity()), b -> new TankItem(b, SMELTERY_PROPS, true));
public static final ItemObject<SearedLanternBlock> scorchedLantern = BLOCKS.register("scorched_lantern", () -> new SearedLanternBlock(SCORCHED_LANTERN, FluidValues.LANTERN_CAPACITY), b -> new TankItem(b, SMELTERY_PROPS, false));
public static final ItemObject<SearedLanternBlock> scorchedLantern = BLOCKS.register("scorched_lantern", () -> new SearedLanternBlock(SCORCHED_LANTERN, FluidValues.SCORCHED_LANTERN_CAPACITY), b -> new TankItem(b, SMELTERY_PROPS, false));
public static final ItemObject<FaucetBlock> scorchedFaucet = BLOCKS.register("scorched_faucet", () -> new FaucetBlock(SCORCHED_NON_SOLID), TOOLTIP_BLOCK_ITEM);
public static final ItemObject<ChannelBlock> scorchedChannel = BLOCKS.register("scorched_channel", () -> new ChannelBlock(SCORCHED_NON_SOLID), TOOLTIP_BLOCK_ITEM);
public static final ItemObject<CastingBasinBlock> scorchedBasin = BLOCKS.register("scorched_basin", () -> new CastingBasinBlock(SCORCHED_NON_SOLID, true), TOOLTIP_BLOCK_ITEM);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/slimeknights/tconstruct/smeltery/data/SmelteryRecipeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ private void addCastingRecipes(Consumer<FinishedRecipe> consumer) {
.save(consumer, modResource(folder + "filling/seared_fuel_gauge"));
ContainerFillingRecipeBuilder.tableRecipe(TinkerSmeltery.searedLantern, FluidValues.NUGGET)
.save(consumer, modResource(folder + "filling/seared_lantern_pixel"));
ContainerFillingRecipeBuilder.basinRecipe(TinkerSmeltery.searedLantern, FluidValues.LANTERN_CAPACITY)
ContainerFillingRecipeBuilder.basinRecipe(TinkerSmeltery.searedLantern, FluidValues.SEARED_LANTERN_CAPACITY)
.save(consumer, modResource(folder + "filling/seared_lantern_full"));
// tank filling - scorched
ContainerFillingRecipeBuilder.basinRecipe(TinkerSmeltery.scorchedTank.get(TankType.INGOT_TANK), FluidValues.INGOT)
Expand All @@ -868,7 +868,7 @@ private void addCastingRecipes(Consumer<FinishedRecipe> consumer) {
.save(consumer, modResource(folder + "filling/scorched_fuel_gauge"));
ContainerFillingRecipeBuilder.tableRecipe(TinkerSmeltery.scorchedLantern, FluidValues.NUGGET)
.save(consumer, modResource(folder + "filling/scorched_lantern_pixel"));
ContainerFillingRecipeBuilder.basinRecipe(TinkerSmeltery.scorchedLantern, FluidValues.LANTERN_CAPACITY)
ContainerFillingRecipeBuilder.basinRecipe(TinkerSmeltery.scorchedLantern, FluidValues.SCORCHED_LANTERN_CAPACITY)
.save(consumer, modResource(folder + "filling/scorched_lantern_full"));

// Slime
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/slimeknights/tconstruct/world/WorldEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static void onLootTableLoad(ResourceManager resourceManager, LootDataManager man
int weight = Config.COMMON.barterBlazingBlood.get();
if (weight > 0) {
injectInto(manager.getLootTable(name), "main", LootItem.lootTableItem(TinkerSmeltery.scorchedLantern).setWeight(weight)
.apply(SetFluidLootFunction.builder(new FluidStack(TinkerFluids.blazingBlood.get(), FluidValues.LANTERN_CAPACITY)))
.apply(SetFluidLootFunction.builder(new FluidStack(TinkerFluids.blazingBlood.get(), FluidValues.SCORCHED_LANTERN_CAPACITY)))
.apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 4)))
.build());
}
Expand Down
Loading