Skip to content

Commit

Permalink
Merge branch '1.16' into release-1.16
Browse files Browse the repository at this point in the history
  • Loading branch information
Buuz135 committed Oct 7, 2023
2 parents 81f6739 + c14c74f commit 3ad7e24
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx8G
minecraftVersion=1.16.5
api_version=3.2.8.7
api_version=3.2.8.8
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,11 @@ public void handleButtonMessage(int id, PlayerEntity playerEntity, CompoundNBT c
if (fluidTankComponent.getName().equalsIgnoreCase(name))
playerEntity.inventory.getItemStack().getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(iFluidHandlerItem -> {
if (fill) {
int amount = Minecraft.getInstance().player.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
int amount = playerEntity.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
amount = fluidTankComponent.fill(iFluidHandlerItem.drain(amount, IFluidHandler.FluidAction.SIMULATE), IFluidHandler.FluidAction.EXECUTE);
iFluidHandlerItem.drain(amount, IFluidHandler.FluidAction.EXECUTE);
} else {
int amount = Minecraft.getInstance().player.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
int amount = playerEntity.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
amount = iFluidHandlerItem.fill(fluidTankComponent.drain(amount, IFluidHandler.FluidAction.SIMULATE), IFluidHandler.FluidAction.EXECUTE);
fluidTankComponent.drain(amount, IFluidHandler.FluidAction.EXECUTE);
}
Expand Down
47 changes: 47 additions & 0 deletions src/main/resources/assets/titanium/lang/pt_br.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"tooltip.titanium.facing_handler.direction": "Direção: ",
"tooltip.titanium.facing_handler.top": "Topo",
"tooltip.titanium.facing_handler.bottom": "Fundo",
"tooltip.titanium.facing_handler.left": "Esquerda",
"tooltip.titanium.facing_handler.right": "Direita",
"tooltip.titanium.facing_handler.front": "Frente",
"tooltip.titanium.facing_handler.back": "Atrás",
"tooltip.titanium.facing_handler.action": "Ação: ",
"tooltip.titanium.facing_handler.none": "Desabilitado",
"tooltip.titanium.facing_handler.pull": "Puxar",
"tooltip.titanium.facing_handler.push": "Empurre",
"tooltip.titanium.facing_handler.enabled": "Habilitado",
"tooltip.titanium.facing_handler.test": "Coisa de teste",
"tooltip.titanium.facing_handler.test2": "Este é um segundo teste",
"tooltip.titanium.facing_handler.inventory": "Entrada",
"tooltip.titanium.facing_handler.real_output": "Resultado",
"tooltip.titanium.facing_handler.fluid_input": "Inserção de fluido manual",
"tooltip.titanium.progressbar.progress": "Progresso: ",
"tooltip.titanium.tank.fluid": "Fluido: ",
"tooltip.titanium.tank.empty": "Vazio ",
"tooltip.titanium.tank.amount": "Quantia: ",
"tooltip.titanium.tank.can_fill_from_item": "Pode preencher a partir do item",
"tooltip.titanium.tank.action_fill": "<Clique com o botão esquerdo para preencher a partir do item>",
"tooltip.titanium.tank.can_drain_from_item": "Pode drenar do item",
"tooltip.titanium.tank.action_drain": "<Clique com o botão direito para drenar do item>",
"tooltip.titanium.tank.no_tank": "<Não pairando com um tanque>",
"tooltip.titanium.tank.no_action": "Não é possível encher ou drenar do item",
"titanium.rewards.remove_success": "Recompensa removida com sucesso",
"titanium.rewards.enabled_success": "Recompensa ativada com sucesso",
"titanium.rewards.granted_success": "Recompensa concedida ao servidor com sucesso",
"block.titanium.block_asset_test": "Teste de ativos",
"direction.titanium.east": "Leste",
"direction.titanium.west": "Oeste",
"direction.titanium.north": "Norte",
"direction.titanium.south": "Sul",
"direction.titanium.up": "Acima",
"direction.titanium.down": "Abaixo",
"itemGroup.resources": "Titanium: Recursos",
"tooltip.titanium.redstone.ignored": "Modo Redstone: Ignorado",
"tooltip.titanium.redstone.no_redstone": "Modo Redstone: Executar sem sinal de redstone",
"tooltip.titanium.redstone.redstone": "Modo Redstone: Executar com sinal redstone",
"tooltip.titanium.redstone.once": "Modo Redstone: Executar em Pulso",
"tooltip.titanium.unlocks": "Desbloqueios:",
"tooltip.titanium.locks": "Bloqueios:"
}

21 changes: 21 additions & 0 deletions src/main/resources/assets/titanium/lang/pt_br.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
itemGroup.titanium.resources=Titanium Resources

item.titanium.plate.name=%s Placa
item.titanium.ingot.name=%s Lingote
item.titanium.dust.name=%s Pó
item.titanium.smalldust.name=Pequeno %s Pó
item.titanium.nugget.name=%s Pepita
item.titanium.purified.name=Purificado %s Grindings
item.titanium.grindings.name=%s Grindings
item.titanium.pebbles.name=%s Pebbles
item.titanium.clump.name=%s Clump
item.titanium.chunk.name=%s Chunk
item.titanium.stone.name=%s Stone
item.titanium.crushed.name=Crushed %s
item.titanium.flakes.name=%s Flakes
item.titanium.rod.name=%s Haste
item.titanium.dense_rod.name=Denso %s Haste
item.titanium.gear.name=%s Gear
item.titanium.casing.name=%s Revestimento
item.titanium.reinforced_plate.name=Reforçado %s Placa
item.titanium.dense_plate.name=Denso %s Placa

0 comments on commit 3ad7e24

Please sign in to comment.