-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
34 changed files
with
447 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
src/main/java/io/savagedev/buckets/handler/TimedBucketTickHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package io.savagedev.buckets.handler; | ||
|
|
||
| /* | ||
| * TimedBucketTickHandler.java | ||
| * Copyright (C) 2020 Savage - github.com/devsavage | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| import io.savagedev.buckets.api.IBucketItem; | ||
| import io.savagedev.buckets.items.ItemTimedBucket; | ||
| import io.savagedev.buckets.util.LogHelper; | ||
| import io.savagedev.buckets.util.ModNames; | ||
| import io.savagedev.buckets.util.NBTHelper; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.entity.player.PlayerInventory; | ||
| import net.minecraft.fluid.Fluids; | ||
| import net.minecraft.inventory.Inventory; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.Hand; | ||
| import net.minecraftforge.event.TickEvent; | ||
| import net.minecraftforge.eventbus.api.SubscribeEvent; | ||
| import net.minecraftforge.fml.LogicalSide; | ||
|
|
||
| public class TimedBucketTickHandler | ||
| { | ||
| public int tickTimer = 0; | ||
|
|
||
| @SubscribeEvent | ||
| public void onPlayerTick(TickEvent.PlayerTickEvent event) { | ||
| if(event.phase == TickEvent.Phase.START && event.player.world.getGameTime() % 20 == 0) { | ||
| PlayerEntity player = event.player; | ||
| PlayerInventory playerInv = player.inventory; | ||
| int invSize = playerInv.getSizeInventory(); | ||
|
|
||
| for(int i = 0; i < invSize; i++) { | ||
| ItemStack stackInSlot = playerInv.getStackInSlot(i); | ||
|
|
||
| if(stackInSlot.getItem() instanceof ItemTimedBucket) { | ||
| stackInSlot.damageItem(1, player, (playerEntity) -> { | ||
| playerEntity.sendBreakAnimation(Hand.MAIN_HAND); | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
src/main/java/io/savagedev/buckets/items/ItemTimedBucket.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| package io.savagedev.buckets.items; | ||
|
|
||
| /* | ||
| * ItemTimedBucket.java | ||
| * Copyright (C) 2020 Savage - github.com/devsavage | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| import io.savagedev.buckets.Buckets; | ||
| import io.savagedev.buckets.api.IBucketItem; | ||
| import io.savagedev.buckets.items.base.BaseItemDamageableBucket; | ||
| import io.savagedev.buckets.items.enums.ItemTimedBucketItem; | ||
| import io.savagedev.buckets.util.LogHelper; | ||
| import io.savagedev.buckets.util.ModNames; | ||
| import io.savagedev.buckets.util.ModReference; | ||
| import io.savagedev.buckets.util.NBTHelper; | ||
| import net.minecraft.client.util.ITooltipFlag; | ||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.fluid.Fluids; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.UseAction; | ||
| import net.minecraft.util.ResourceLocation; | ||
| import net.minecraft.util.text.ITextComponent; | ||
| import net.minecraft.util.text.StringTextComponent; | ||
| import net.minecraft.world.World; | ||
| import net.minecraftforge.registries.ForgeRegistries; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| public class ItemTimedBucket extends BaseItemDamageableBucket implements IBucketItem | ||
| { | ||
| public final ItemTimedBucketItem bucketItem; | ||
|
|
||
| public ItemTimedBucket(ItemTimedBucketItem bucketItem) { | ||
| super(p -> (p.group(Buckets.modGroup).maxStackSize(1).maxDamage(bucketItem.getBucketMaxTime())), bucketItem.getFluidType()); | ||
| this.bucketItem = bucketItem; | ||
| } | ||
|
|
||
| @Override | ||
| public Item getEmptyBucketItem() { | ||
| return Objects.requireNonNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation(ModReference.MOD_ID, this.bucketItem.getEmptyBucket()))).getItem(); | ||
| } | ||
|
|
||
| @Override | ||
| public Item getLavaBucketItem() { | ||
| return Objects.requireNonNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation(ModReference.MOD_ID, this.bucketItem.getLavaBucket()))).getItem(); | ||
| } | ||
|
|
||
| @Override | ||
| public Item getWaterBucketItem() { | ||
| return Objects.requireNonNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation(ModReference.MOD_ID, this.bucketItem.getWaterBucket()))).getItem(); | ||
| } | ||
|
|
||
| @Override | ||
| public void addInformation(ItemStack stack, @Nullable World worldIn, List<ITextComponent> tooltip, ITooltipFlag flagIn) { | ||
| tooltip.add(new StringTextComponent("Seconds Remaining: " + (this.bucketItem.getBucketMaxTime() - this.getDamage(stack)))); | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
.../io/savagedev/buckets/items/BaseItem.java → ...avagedev/buckets/items/base/BaseItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package io.savagedev.buckets.items; | ||
| package io.savagedev.buckets.items.base; | ||
|
|
||
| /* | ||
| * BaseItem.java | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...edev/buckets/items/ItemBigBucketItem.java → ...uckets/items/enums/ItemBigBucketItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package io.savagedev.buckets.items; | ||
| package io.savagedev.buckets.items.enums; | ||
|
|
||
| /* | ||
| * ItemBigBucketItem.java | ||
|
|
||
Oops, something went wrong.